diff --git a/composer.json b/composer.json index 6642eb3b3..03ce78c7e 100755 --- a/composer.json +++ b/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" }, diff --git a/src/Console/ExportSeedCommand.php b/src/Console/ExportSeedCommand.php index 5658801cc..c94a54a3d 100755 --- a/src/Console/ExportSeedCommand.php +++ b/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'); diff --git a/src/Repositories/EloquentRepository.php b/src/Repositories/EloquentRepository.php index cea721ced..53a47ddfa 100755 --- a/src/Repositories/EloquentRepository.php +++ b/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(); } diff --git a/src/Scaffold/ModelCreator.php b/src/Scaffold/ModelCreator.php index 0d5f138ae..b708700bf 100755 --- a/src/Scaffold/ModelCreator.php +++ b/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); diff --git a/src/Support/Translator.php b/src/Support/Translator.php index 29b2a7ec7..68298df16 100644 --- a/src/Support/Translator.php +++ b/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;