Merge pull request #21 from PrintNow/feat/laravel-13-compatibility

feat: 兼容 Laravel 13

Author: PrintNow

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "printnow/laravel-admin",
-    "description": "Dcat admin 永久分叉版 / 支持 Laravel 12, PHP 版本限制 >= 8.1（支持 PHP 8.4）",
+    "description": "Dcat admin 永久分叉版 / 支持 Laravel 10-13, PHP 版本限制 >= 8.1（支持 PHP 8.5）",
     "type": "library",
     "keywords": [
         "dcat",
@@ -25,9 +25,8 @@
     ],
     "require": {
         "php": ">=8.1",
-        "laravel/framework": "~10.0|~11.0|~12.0",
-        "spatie/eloquent-sortable": "4.*",
-        "doctrine/dbal": "~3.0|~4.0",
+        "laravel/framework": "~10.0|~11.0|~12.0|~13.0",
+        "spatie/eloquent-sortable": "^4.0|^5.0",
         "ext-dom": "*",
         "ext-fileinfo": "*",
         "ext-zip": "*",
@@ -36,7 +35,7 @@
     "require-dev": {
         "laravel/dusk": "^8.3",
         "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
+        "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0 || ^13.0",
         "fakerphp/faker": "^1.24",
         "mockery/mockery": "^1.6"
     },

src/Console/ExportSeedCommand.php

@@ -32,7 +32,7 @@ public function handle()
         $exceptFields = [];
         $exportUsers = $this->option('users');
 
-        $namespace = version_compare(app()->version(), '8.0.0', '<') ? 'seeds' : 'seeders';
+        $namespace = 'seeders';
 
         $seedFile = $this->laravel->databasePath().'/'.$namespace.'/'.$name.'.php';
         $contents = $this->getStub('AdminTablesSeeder');

src/Repositories/EloquentRepository.php

@@ -324,11 +324,9 @@ protected function joinParameters(Relation $relation)
         $relatedTable = $relation->getRelated()->getTable();
 
         if ($relation instanceof BelongsTo) {
-            $foreignKeyMethod = version_compare(app()->version(), '5.8.0', '<') ? 'getForeignKey' : 'getForeignKeyName';
-
             return [
                 $relatedTable,
-                $relation->{$foreignKeyMethod}(),
+                $relation->getForeignKeyName(),
                 '=',
                 $relatedTable.'.'.$relation->getRelated()->getKeyName(),
             ];
@@ -872,9 +870,8 @@ protected function updateRelation(Form $form, EloquentModel $model, array $relat
                     $parent->save();
 
                     // When in creating, associate two models
-                    $foreignKeyMethod = version_compare(app()->version(), '5.8.0', '<') ? 'getForeignKey' : 'getForeignKeyName';
-                    if (! $model->{$relation->{$foreignKeyMethod}()}) {
-                        $model->{$relation->{$foreignKeyMethod}()} = $parent->getKey();
+                    if (! $model->{$relation->getForeignKeyName()}) {
+                        $model->{$relation->getForeignKeyName()} = $parent->getKey();
 
                         $model->save();
                     }

src/Scaffold/ModelCreator.php

@@ -171,12 +171,8 @@ protected function replaceSoftDeletes(&$stub, $softDeletes)
      */
     protected function replaceDatetimeFormatter(&$stub)
     {
-        $import = $use = '';
-
-        if (version_compare(app()->version(), '7.0.0') >= 0) {
-            $import = 'use Dcat\\Admin\\Traits\\HasDateTimeFormatter;';
-            $use = 'use HasDateTimeFormatter;';
-        }
+        $import = 'use Dcat\\Admin\\Traits\\HasDateTimeFormatter;';
+        $use = 'use HasDateTimeFormatter;';
 
         $stub = str_replace(['DummyImportDateTimeFormatterTrait', 'DummyUseDateTimeFormatterTrait'], [$import, $use], $stub);
 

src/Support/Translator.php

@@ -110,7 +110,7 @@ public function trans($key, array $replace = [], $locale = null)
     protected function getTranslateMethod()
     {
         if (static::$method === null) {
-            static::$method = version_compare(app()->version(), '6.0', '>=') ? 'get' : 'trans';
+            static::$method = 'get';
         }
 
         return static::$method;