pint

Team-Nifty-GmbH · Jul 26, 2024 · b95ec04 · b95ec04
1 parent 25c7777
commit b95ec04
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/database/migrations/2022_10_26_133015_create_datatable_user_settings_table.php b/database/migrations/2022_10_26_133015_create_datatable_user_settings_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
+return new class() extends Migration
 {
     public function up(): void
     {

diff --git a/database/migrations/2023_10_26_133015_add_is_layout_to_datatable_user_settings_table.php b/database/migrations/2023_10_26_133015_add_is_layout_to_datatable_user_settings_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
+return new class() extends Migration
 {
     /**
      * Run the migrations.

diff --git a/database/migrations/2023_11_01_082552_add_cache_key_to_datatable_user_settings_table.php b/database/migrations/2023_11_01_082552_add_cache_key_to_datatable_user_settings_table.php
@@ -5,7 +5,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
+return new class() extends Migration
 {
     /**
      * Run the migrations.

diff --git a/src/Controllers/SearchController.php b/src/Controllers/SearchController.php
@@ -24,7 +24,7 @@ public function __invoke(Request $request, $model)
         /** @var Builder $query */
         if ($request->has('selected')) {
             $selected = $request->get('selected');
-            $optionValue = $request->get('option-value') ?: (new $model)->getKeyName();
+            $optionValue = $request->get('option-value') ?: app($model)->getKeyName();
 
             $query = $model::query();
             is_array($selected)

diff --git a/src/DataTable.php b/src/DataTable.php
@@ -319,7 +319,7 @@ public function getFormatters(): array
         foreach ($this->getIncludedRelations() as $loadedRelation) {
             $relationFormatters = method_exists($loadedRelation['model'], 'typeScriptAttributes')
                 ? $loadedRelation['model']::typeScriptAttributes()
-                : (new $loadedRelation['model'])->getCasts();
+                : app($loadedRelation['model'])->getCasts();
 
             foreach ($loadedRelation['loaded_columns'] as $loadedColumn) {
                 $formatters[$loadedColumn['loaded_as']] = $relationFormatters[$loadedColumn['column']] ?? null;

diff --git a/src/Helpers/ModelInfo.php b/src/Helpers/ModelInfo.php
@@ -36,7 +36,7 @@ public static function forModel(string|Model|ReflectionClass $model): BaseModelI
         }
 
         if (is_string($model)) {
-            $model = new $model;
+            $model = app($model);
         }
 
         try {

diff --git a/src/Helpers/RelationFinder.php b/src/Helpers/RelationFinder.php
@@ -14,7 +14,7 @@ class RelationFinder extends BaseRelationFinder
     public static function forModel(string|Model $model): Collection
     {
         if (is_string($model)) {
-            $model = new $model;
+            $model = app($model);
         }
 
         return (new static())->relations($model);

diff --git a/src/Traits/DataTables/SupportsRelations.php b/src/Traits/DataTables/SupportsRelations.php
@@ -254,7 +254,7 @@ protected function constructWith(): array
 
     protected function getModelRelations($modelInfo): array
     {
-        $modelQuery = new $modelInfo->class;
+        $modelQuery = app($modelInfo->class);
         $modelRelations = [];
         foreach ($modelInfo->relations as $relation) {
             try {

diff --git a/tests/database/migrations/2023_11_06_194424_create_data_table.php b/tests/database/migrations/2023_11_06_194424_create_data_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
+return new class() extends Migration
 {
     /**
      * Run the migrations.