Merge branch 'php8' into section

2026-04-23 19:37:23 +08:00 · 2022-10-25 19:16:56 +08:00
parent c9c16bc5bd b738fca498
commit 0053d14183
168 changed files with 3072 additions and 621 deletions
@@ -2,12 +2,23 @@

 namespace App\Models;

+<<<<<<< HEAD
+=======
+use Nexus\Database\NexusDB;
+>>>>>>> php8

 class TorrentCustomFieldValue extends NexusModel
 {
    protected $table = 'torrents_custom_field_values';

+<<<<<<< HEAD
    protected $fillable = [
        'torrent_id', 'custom_field_id', 'custom_field_value',
    ];
+=======
+    public $timestamps = true;
+
+    protected $fillable = ['torrent_id', 'custom_field_id', 'custom_field_value', ];
+
+>>>>>>> php8
 }