Drop support of "symfony/*:<7.0.0", "illuminate/*:<11.0.0", "orchestr…

…a/testbench:<9.0.0".
LastDragon-ru · Nov 28, 2024 · 2626761 · 2626761
1 parent 8e0299e
commit 2626761
Show file tree

Hide file tree

Showing 18 changed files with 140 additions and 157 deletions.
diff --git a/composer.json b/composer.json
@@ -45,22 +45,22 @@
     "doctrine/sql-formatter": "^1.1",
     "guzzlehttp/psr7": "^2.4.5",
     "http-interop/http-factory-guzzle": "^1.0.0",
-    "illuminate/collections": "^10.34.0|^11.0.0",
-    "illuminate/conditionable": "^10.34.0|^11.0.0",
-    "illuminate/console": "^10.34.0|^11.0.0",
-    "illuminate/container": "^10.34.0|^11.0.0",
-    "illuminate/contracts": "^10.34.0|^11.0.0",
-    "illuminate/database": "^10.34.0|^11.0.0",
-    "illuminate/filesystem": "^10.34.0|^11.0.0",
-    "illuminate/http": "^10.34.0|^11.0.0",
-    "illuminate/macroable": "^10.34.0|^11.0.0",
-    "illuminate/pagination": "^10.34.0|^11.0.0",
-    "illuminate/process": "^10.34.0|^11.0.0",
-    "illuminate/routing": "^10.34.0|^11.0.0",
-    "illuminate/support": "^10.34.0|^11.0.0",
-    "illuminate/testing": "^10.34.0|^11.0.0",
-    "illuminate/translation": "^10.34.0|^11.0.0",
-    "illuminate/validation": "^10.34.0|^11.0.0",
+    "illuminate/collections": "^11.0.0",
+    "illuminate/conditionable": "^11.0.0",
+    "illuminate/console": "^11.0.0",
+    "illuminate/container": "^11.0.0",
+    "illuminate/contracts": "^11.0.0",
+    "illuminate/database": "^11.0.0",
+    "illuminate/filesystem": "^11.0.0",
+    "illuminate/http": "^11.0.0",
+    "illuminate/macroable": "^11.0.0",
+    "illuminate/pagination": "^11.0.0",
+    "illuminate/process": "^11.0.0",
+    "illuminate/routing": "^11.0.0",
+    "illuminate/support": "^11.0.0",
+    "illuminate/testing": "^11.0.0",
+    "illuminate/translation": "^11.0.0",
+    "illuminate/validation": "^11.0.0",
     "larastan/larastan": "^2.8.1",
     "league/commonmark": "^2.5.1",
     "league/config": "^1.1.1",
@@ -76,30 +76,30 @@
     "psr/http-message": "^1.0.0|^2.0.0",
     "sebastian/comparator": "^5.0|^6.0.0",
     "sebastian/exporter": "^5.0|^6.0.0",
-    "symfony/console": "^6.3.0|^7.0.0",
+    "symfony/console": "^7.0.0",
     "symfony/deprecation-contracts": "^3.0.0",
-    "symfony/filesystem": "^6.3.0|^7.0.0",
-    "symfony/finder": "^6.3.0|^7.0.0",
-    "symfony/http-foundation": "^6.3.0|^7.0.0",
-    "symfony/http-kernel": "^6.3.0|^7.0.0",
-    "symfony/mime": "^6.3.0|^7.0.0",
+    "symfony/filesystem": "^7.0.0",
+    "symfony/finder": "^7.0.0",
+    "symfony/http-foundation": "^7.0.0",
+    "symfony/http-kernel": "^7.0.0",
+    "symfony/mime": "^7.0.0",
     "symfony/polyfill-php83": "^1.28",
-    "symfony/property-access": "^6.3.0|^7.0.0",
-    "symfony/property-info": "^6.3.9|^7.0.0",
-    "symfony/psr-http-message-bridge": "^2.0.0|^6.4.0|^7.0.0",
-    "symfony/serializer": "^6.4.0|^7.0.0",
-    "symfony/var-dumper": "^6.3.0|^7.0.0",
+    "symfony/property-access": "^7.0.0",
+    "symfony/property-info": "^7.0.0",
+    "symfony/psr-http-message-bridge": "^7.0.0",
+    "symfony/serializer": "^7.0.0",
+    "symfony/var-dumper": "^7.0.0",
     "webonyx/graphql-php": "^15.4.0"
   },
   "require-dev": {
     "ext-pdo_sqlite": "*",
     "bamarni/composer-bin-plugin": "^1.8",
     "composer/class-map-generator": "^1.0",
     "fakerphp/faker": "^1.21.0",
-    "illuminate/cache": "^10.34.0|^11.0.0",
-    "illuminate/config": "^10.34.0|^11.0.0",
+    "illuminate/cache": "^11.0.0",
+    "illuminate/config": "^11.0.0",
     "laravel/scout": "^9.8.0|^10.0.0",
-    "orchestra/testbench": "^8.0.0|^9.0.0",
+    "orchestra/testbench": "^9.0.0",
     "phpstan/phpstan": "1.12.11",
     "phpstan/phpstan-mockery": "^1.1",
     "phpstan/phpstan-phpunit": "^1.3",

diff --git a/packages/core/composer.json b/packages/core/composer.json
@@ -19,19 +19,19 @@
   },
   "require": {
     "php": "^8.2|^8.3",
-    "illuminate/console": "^10.34.0|^11.0.0",
-    "illuminate/container": "^10.34.0|^11.0.0",
-    "illuminate/contracts": "^10.34.0|^11.0.0",
-    "illuminate/support": "^10.34.0|^11.0.0",
+    "illuminate/console": "^11.0.0",
+    "illuminate/container": "^11.0.0",
+    "illuminate/contracts": "^11.0.0",
+    "illuminate/support": "^11.0.0",
     "symfony/deprecation-contracts": "^3.0.0",
-    "symfony/filesystem": "^6.3.0|^7.0.0",
+    "symfony/filesystem": "^7.0.0",
     "symfony/polyfill-php83": "^1.28"
   },
   "require-dev": {
     "phpunit/phpunit": "^10.1.0|^11.0.0",
     "lastdragon-ru/lara-asp-testing": "self.version",
     "mockery/mockery": "^1.6.5",
-    "orchestra/testbench": "^8.0.0|^9.0.0"
+    "orchestra/testbench": "^9.0.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/packages/dev/composer.json b/packages/dev/composer.json
@@ -19,15 +19,15 @@
   },
   "require": {
     "php": "^8.2|^8.3",
-    "illuminate/contracts": "^10.34.0|^11.0.0",
-    "illuminate/support": "^10.34.0|^11.0.0",
+    "illuminate/contracts": "^11.0.0",
+    "illuminate/support": "^11.0.0",
     "larastan/larastan": "^2.8.1",
     "lastdragon-ru/lara-asp-core": "self.version",
     "lastdragon-ru/lara-asp-documentator": "self.version",
     "nikic/php-parser": "^5.0",
     "nette/neon": "^3.4",
     "phpstan/phpstan": "^1.10",
-    "symfony/var-dumper": "^6.3.0|^7.0.0"
+    "symfony/var-dumper": "^7.0.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^10.1.0|^11.0.0"

diff --git a/packages/documentator/composer.json b/packages/documentator/composer.json
@@ -23,20 +23,20 @@
     "ext-intl": "*",
     "ext-mbstring": "*",
     "composer/semver": "^3.2",
-    "illuminate/contracts": "^10.34.0|^11.0.0",
-    "illuminate/console": "^10.34.0|^11.0.0",
-    "illuminate/process": "^10.34.0|^11.0.0",
-    "illuminate/support": "^10.34.0|^11.0.0",
+    "illuminate/contracts": "^11.0.0",
+    "illuminate/console": "^11.0.0",
+    "illuminate/process": "^11.0.0",
+    "illuminate/support": "^11.0.0",
     "league/commonmark": "^2.5.1",
     "league/config": "^1.1.1",
     "nikic/php-parser": "^5.0",
     "phpstan/phpdoc-parser": "^1.25",
-    "symfony/console": "^6.3.0|^7.0.0",
+    "symfony/console": "^7.0.0",
     "symfony/deprecation-contracts": "^3.0.0",
-    "symfony/filesystem": "^6.3.0|^7.0.0",
-    "symfony/finder": "^6.3.0|^7.0.0",
+    "symfony/filesystem": "^7.0.0",
+    "symfony/finder": "^7.0.0",
     "symfony/polyfill-php83": "^1.28",
-    "symfony/serializer": "^6.4.0|^7.0.0",
+    "symfony/serializer": "^7.0.0",
     "lastdragon-ru/lara-asp-core": "self.version",
     "lastdragon-ru/lara-asp-formatter": "self.version",
     "lastdragon-ru/lara-asp-graphql-printer": "self.version",
@@ -45,7 +45,7 @@
   "require-dev": {
     "lastdragon-ru/lara-asp-testing": "self.version",
     "mockery/mockery": "^1.6.5",
-    "orchestra/testbench": "^8.0.0|^9.0.0",
+    "orchestra/testbench": "^9.0.0",
     "phpunit/phpunit": "^10.1.0|^11.0.0",
     "webonyx/graphql-php": "^15.4.0"
   },

diff --git a/...cumentator/src/Processor/Tasks/Preprocess/Instructions/IncludeArtisan/InstructionTest.php b/...cumentator/src/Processor/Tasks/Preprocess/Instructions/IncludeArtisan/InstructionTest.php
@@ -2,8 +2,6 @@
 
 namespace LastDragon_ru\LaraASP\Documentator\Processor\Tasks\Preprocess\Instructions\IncludeArtisan;
 
-use Composer\InstalledVersions;
-use Composer\Semver\VersionParser;
 use Illuminate\Contracts\Console\Kernel;
 use LastDragon_ru\LaraASP\Core\Application\ApplicationResolver;
 use LastDragon_ru\LaraASP\Core\Path\DirectoryPath;
@@ -42,25 +40,21 @@ public function testInvoke(): void {
         $instance = $this->app()->make(Instruction::class);
 
         $this->override(Kernel::class, static function (MockInterface $mock) use ($command, $expected): void {
-            if (InstalledVersions::satisfies(new VersionParser(), 'illuminate/contracts', '^11.0.0')) {
-                // todo(documentator): Remove after https://github.com/LastDragon-ru/lara-asp/issues/143
-                $mock
-                    ->shouldReceive('addCommands')
-                    ->atLeast()
-                    ->once()
-                    ->andReturns();
-                $mock
-                    ->shouldReceive('addCommandPaths')
-                    ->atLeast()
-                    ->once()
-                    ->andReturns();
-                $mock
-                    ->shouldReceive('addCommandRoutePaths')
-                    ->atLeast()
-                    ->once()
-                    ->andReturns();
-            }
-
+            $mock
+                ->shouldReceive('addCommands')
+                ->atLeast()
+                ->once()
+                ->andReturns();
+            $mock
+                ->shouldReceive('addCommandPaths')
+                ->atLeast()
+                ->once()
+                ->andReturns();
+            $mock
+                ->shouldReceive('addCommandRoutePaths')
+                ->atLeast()
+                ->once()
+                ->andReturns();
             $mock
                 ->shouldReceive('handle')
                 ->withArgs(
@@ -96,25 +90,21 @@ public function getDestination(): string {
         $instance = $this->app()->make(Instruction::class);
 
         $this->override(Kernel::class, static function (MockInterface $mock) use ($command): void {
-            // todo(documentator): Remove after https://github.com/LastDragon-ru/lara-asp/issues/143
-            if (InstalledVersions::satisfies(new VersionParser(), 'illuminate/contracts', '^11.0.0')) {
-                $mock
-                    ->shouldReceive('addCommands')
-                    ->atLeast()
-                    ->once()
-                    ->andReturns();
-                $mock
-                    ->shouldReceive('addCommandPaths')
-                    ->atLeast()
-                    ->once()
-                    ->andReturns();
-                $mock
-                    ->shouldReceive('addCommandRoutePaths')
-                    ->atLeast()
-                    ->once()
-                    ->andReturns();
-            }
-
+            $mock
+                ->shouldReceive('addCommands')
+                ->atLeast()
+                ->once()
+                ->andReturns();
+            $mock
+                ->shouldReceive('addCommandPaths')
+                ->atLeast()
+                ->once()
+                ->andReturns();
+            $mock
+                ->shouldReceive('addCommandRoutePaths')
+                ->atLeast()
+                ->once()
+                ->andReturns();
             $mock
                 ->shouldReceive('handle')
                 ->withArgs(

diff --git a/packages/documentator/src/Utils/ArtisanSerializer.php b/packages/documentator/src/Utils/ArtisanSerializer.php
@@ -59,7 +59,7 @@ public function getOptionSignature(InputOption $option): string {
         }
 
         if ($option->isNegatable()) {
-            // todo(documentator): Not yet supported by Laravel :( Check in v11
+            // todo(documentator): Not yet supported by Laravel :( Check in v12
         }
 
         if ($option->isArray()) {

diff --git a/packages/eloquent/composer.json b/packages/eloquent/composer.json
@@ -18,18 +18,18 @@
   },
   "require": {
     "php": "^8.2|^8.3",
-    "illuminate/collections": "^10.34.0|^11.0.0",
-    "illuminate/database": "^10.34.0|^11.0.0",
-    "illuminate/support": "^10.34.0|^11.0.0",
+    "illuminate/collections": "^11.0.0",
+    "illuminate/database": "^11.0.0",
+    "illuminate/support": "^11.0.0",
     "lastdragon-ru/lara-asp-core": "self.version",
     "symfony/polyfill-php83": "^1.28"
   },
   "require-dev": {
     "ext-pdo_sqlite": "*",
-    "illuminate/contracts": "^10.34.0|^11.0.0",
+    "illuminate/contracts": "^11.0.0",
     "lastdragon-ru/lara-asp-testing": "self.version",
     "mockery/mockery": "^1.6.5",
-    "orchestra/testbench": "^8.0.0|^9.0.0",
+    "orchestra/testbench": "^9.0.0",
     "phpunit/phpunit": "^10.1.0|^11.0.0"
   },
   "autoload": {

diff --git a/packages/formatter/composer.json b/packages/formatter/composer.json
@@ -22,15 +22,15 @@
     "ext-bcmath": "*",
     "ext-intl": "*",
     "ext-mbstring": "*",
-    "illuminate/macroable": "^10.34.0|^11.0.0",
-    "illuminate/support": "^10.34.0|^11.0.0",
+    "illuminate/macroable": "^11.0.0",
+    "illuminate/support": "^11.0.0",
     "lastdragon-ru/lara-asp-core": "self.version",
     "symfony/polyfill-php83": "^1.28"
   },
   "require-dev": {
-    "illuminate/contracts": "^10.34.0|^11.0.0",
+    "illuminate/contracts": "^11.0.0",
     "lastdragon-ru/lara-asp-testing": "self.version",
-    "orchestra/testbench": "^8.0.0|^9.0.0",
+    "orchestra/testbench": "^9.0.0",
     "phpunit/phpunit": "^10.1.0|^11.0.0"
   },
   "autoload": {

diff --git a/packages/graphql/composer.json b/packages/graphql/composer.json
@@ -22,10 +22,10 @@
     "ext-filter": "*",
     "ext-mbstring": "*",
     "composer/semver": "^3.2",
-    "illuminate/collections": "^10.34.0|^11.0.0",
-    "illuminate/contracts": "^10.34.0|^11.0.0",
-    "illuminate/database": "^10.34.0|^11.0.0",
-    "illuminate/support": "^10.34.0|^11.0.0",
+    "illuminate/collections": "^11.0.0",
+    "illuminate/contracts": "^11.0.0",
+    "illuminate/database": "^11.0.0",
+    "illuminate/support": "^11.0.0",
     "nuwave/lighthouse": "^6.5.0",
     "lastdragon-ru/lara-asp-core": "self.version",
     "lastdragon-ru/lara-asp-eloquent": "self.version",
@@ -37,12 +37,12 @@
   },
   "require-dev": {
     "ext-pdo_sqlite": "*",
-    "illuminate/cache": "^10.34.0|^11.0.0",
+    "illuminate/cache": "^11.0.0",
     "laravel/scout": "^9.8.0|^10.0.0",
     "mockery/mockery": "^1.6.5",
     "phpunit/phpunit": "^10.1.0|^11.0.0",
     "lastdragon-ru/lara-asp-testing": "self.version",
-    "orchestra/testbench": "^8.0.0|^9.0.0"
+    "orchestra/testbench": "^9.0.0"
   },
   "suggest": {
     "laravel/scout": "Can be used by @searchBy/@sortBy/etc directives to work with Scout Builder."

diff --git a/packages/migrator/composer.json b/packages/migrator/composer.json
@@ -23,24 +23,24 @@
     "php": "^8.2|^8.3",
     "ext-json": "*",
     "ext-mbstring": "*",
-    "illuminate/conditionable": "^10.34.0|^11.0.0",
-    "illuminate/console": "^10.34.0|^11.0.0",
-    "illuminate/container": "^10.34.0|^11.0.0",
-    "illuminate/contracts": "^10.34.0|^11.0.0",
-    "illuminate/database": "^10.34.0|^11.0.0",
-    "illuminate/filesystem": "^10.34.0|^11.0.0",
-    "illuminate/support": "^10.34.0|^11.0.0",
+    "illuminate/conditionable": "^11.0.0",
+    "illuminate/console": "^11.0.0",
+    "illuminate/container": "^11.0.0",
+    "illuminate/contracts": "^11.0.0",
+    "illuminate/database": "^11.0.0",
+    "illuminate/filesystem": "^11.0.0",
+    "illuminate/support": "^11.0.0",
     "lastdragon-ru/lara-asp-core": "self.version",
-    "symfony/console": "^6.3.0|^7.0.0",
-    "symfony/finder": "^6.3.0|^7.0.0",
+    "symfony/console": "^7.0.0",
+    "symfony/finder": "^7.0.0",
     "symfony/polyfill-php83": "^1.28"
   },
   "require-dev": {
     "ext-pdo_sqlite": "*",
-    "illuminate/config": "^10.34.0|^11.0.0",
+    "illuminate/config": "^11.0.0",
     "lastdragon-ru/lara-asp-testing": "self.version",
     "mockery/mockery": "^1.6.5",
-    "orchestra/testbench": "^8.0.0|^9.0.0",
+    "orchestra/testbench": "^9.0.0",
     "phpunit/phpunit": "^10.1.0|^11.0.0"
   },
   "autoload": {

diff --git a/packages/migrator/src/Seeders/SeederService.php b/packages/migrator/src/Seeders/SeederService.php
@@ -68,8 +68,6 @@ public function getConnection(Connection|string|null $connection = null): Connec
     }
 
     protected function getMigrationsTable(): string {
-        // todo(migrator): The string is used only in Laravel v10
-        //      https://github.com/LastDragon-ru/lara-asp/issues/143
         $default = 'migrations';
         $table   = $this->config->getInstance()->get('database.migrations', $default);
         $table   = is_array($table) ? ($table['table'] ?? $default) : $table;