diff --git a/README.md b/README.md index 0cc35301..578457c3 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,9 @@ The set provides best practices to make development more fun and classes/service | | `^8.0.0` | `1.1.2 ⋯ 0.12.0` | | | `>=8.0.0` | `0.11.0 ⋯ 0.4.0` | | | `>=7.4.0` | `0.3.0 ⋯ 0.1.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 2.1.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` | diff --git a/composer.json b/composer.json index 23fe7bc1..3fffdbb7 100644 --- a/composer.json +++ b/composer.json @@ -45,50 +45,50 @@ "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.8", + "illuminate/conditionable": "^11.0.8", + "illuminate/console": "^11.0.8", + "illuminate/container": "^11.0.8", + "illuminate/contracts": "^11.0.8", + "illuminate/database": "^11.0.8", + "illuminate/filesystem": "^11.0.8", + "illuminate/http": "^11.0.8", + "illuminate/macroable": "^11.0.8", + "illuminate/pagination": "^11.0.8", + "illuminate/process": "^11.0.8", + "illuminate/routing": "^11.0.8", + "illuminate/support": "^11.0.8", + "illuminate/testing": "^11.0.8", + "illuminate/translation": "^11.0.8", + "illuminate/validation": "^11.0.8", "larastan/larastan": "^2.8.1", "league/commonmark": "^2.5.1", "league/config": "^1.1.1", "mockery/mockery": "^1.6.5", "nette/neon": "^3.4", "nikic/php-parser": "^5.0", - "nuwave/lighthouse": "^6.5.0", + "nuwave/lighthouse": "^6.36.0", "opis/json-schema": "^2.3.0", "phpdocumentor/type-resolver": "^1.7", "phpstan/phpdoc-parser": "^1.25", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.1.0|^11.0.0", + "phpunit/phpunit": "^10.5.0|^11.0.0", "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": { @@ -96,10 +96,10 @@ "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", - "laravel/scout": "^9.8.0|^10.0.0", - "orchestra/testbench": "^8.0.0|^9.0.0", + "illuminate/cache": "^11.0.8", + "illuminate/config": "^11.0.8", + "laravel/scout": "^10.8.0", + "orchestra/testbench": "^9.0.0", "phpstan/phpstan": "1.12.11", "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-phpunit": "^1.3", diff --git a/docs/Shared/Upgrade/FromV7.md b/docs/Shared/Upgrade/FromV7.md new file mode 100644 index 00000000..d7196cdd --- /dev/null +++ b/docs/Shared/Upgrade/FromV7.md @@ -0,0 +1 @@ +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. diff --git a/metadata.json b/metadata.json index 7018ff4f..b7d72064 100644 --- a/metadata.json +++ b/metadata.json @@ -5,8 +5,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", diff --git a/packages/core/README.md b/packages/core/README.md index ebda83a9..657bcb03 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -17,8 +17,9 @@ This package contains useful utilities and classes. | | `^8.0.0` | `1.1.2 ⋯ 0.12.0` | | | `>=8.0.0` | `0.11.0 ⋯ 0.4.0` | | | `>=7.4.0` | `0.3.0 ⋯ 0.1.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 2.1.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` | diff --git a/packages/core/UPGRADE.md b/packages/core/UPGRADE.md index e87b94d3..33b38b37 100644 --- a/packages/core/UPGRADE.md +++ b/packages/core/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/core/composer.json b/packages/core/composer.json index 5fe57fd3..476b0601 100644 --- 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.8", + "illuminate/container": "^11.0.8", + "illuminate/contracts": "^11.0.8", + "illuminate/support": "^11.0.8", "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", + "phpunit/phpunit": "^10.5.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/core/metadata.json b/packages/core/metadata.json index c78fa185..a35cd1c8 100644 --- a/packages/core/metadata.json +++ b/packages/core/metadata.json @@ -5,8 +5,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", diff --git a/packages/dev/UPGRADE.md b/packages/dev/UPGRADE.md index 63967121..2f2fcfbf 100644 --- a/packages/dev/UPGRADE.md +++ b/packages/dev/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/dev/composer.json b/packages/dev/composer.json index c606b320..f4b7aadd 100644 --- a/packages/dev/composer.json +++ b/packages/dev/composer.json @@ -19,18 +19,18 @@ }, "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.8", + "illuminate/support": "^11.0.8", "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" + "phpunit/phpunit": "^10.5.0|^11.0.0" }, "autoload": { "psr-4": { diff --git a/packages/documentator/README.md b/packages/documentator/README.md index f61d37aa..ba15517f 100644 --- a/packages/documentator/README.md +++ b/packages/documentator/README.md @@ -13,8 +13,9 @@ This package provides various utilities for documentation generation such as Mar | PHP | `^8.3` | `HEAD ⋯ 5.0.0` | | | `^8.2` | `HEAD ⋯ 5.0.0-beta.1` | | | `^8.1` | `6.4.2 ⋯ 5.0.0-beta.1` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 5.0.0-beta.1` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | diff --git a/packages/documentator/UPGRADE.md b/packages/documentator/UPGRADE.md index 7f71a93f..b6003917 100644 --- a/packages/documentator/UPGRADE.md +++ b/packages/documentator/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/documentator/composer.json b/packages/documentator/composer.json index 4c3d9ec2..8961020a 100644 --- 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.8", + "illuminate/console": "^11.0.8", + "illuminate/process": "^11.0.8", + "illuminate/support": "^11.0.8", "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,8 +45,8 @@ "require-dev": { "lastdragon-ru/lara-asp-testing": "self.version", "mockery/mockery": "^1.6.5", - "orchestra/testbench": "^8.0.0|^9.0.0", - "phpunit/phpunit": "^10.1.0|^11.0.0", + "orchestra/testbench": "^9.0.0", + "phpunit/phpunit": "^10.5.0|^11.0.0", "webonyx/graphql-php": "^15.4.0" }, "autoload": { diff --git a/packages/documentator/metadata.json b/packages/documentator/metadata.json index 210ef8e9..4654c435 100644 --- a/packages/documentator/metadata.json +++ b/packages/documentator/metadata.json @@ -5,8 +5,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", diff --git a/packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeArtisan/InstructionTest.php b/packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeArtisan/InstructionTest.php index 07a376d2..16c560fc 100644 --- a/packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeArtisan/InstructionTest.php +++ b/packages/documentator/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 index 449b9af9..040b519d 100644 --- 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/README.md b/packages/eloquent/README.md index b686a1a7..308deed6 100644 --- a/packages/eloquent/README.md +++ b/packages/eloquent/README.md @@ -17,8 +17,9 @@ This package contains useful extensions and mixins for [Eloquent](https://larave | | `^8.0.0` | `1.1.2 ⋯ 0.12.0` | | | `>=8.0.0` | `0.11.0 ⋯ 0.4.0` | | | `>=7.4.0` | `0.3.0 ⋯ 0.1.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 2.1.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` | diff --git a/packages/eloquent/UPGRADE.md b/packages/eloquent/UPGRADE.md index 38396683..727d9c10 100644 --- a/packages/eloquent/UPGRADE.md +++ b/packages/eloquent/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/eloquent/composer.json b/packages/eloquent/composer.json index cb0cc7e1..07f6752f 100644 --- a/packages/eloquent/composer.json +++ b/packages/eloquent/composer.json @@ -18,19 +18,19 @@ }, "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.8", + "illuminate/database": "^11.0.8", + "illuminate/support": "^11.0.8", "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.8", "lastdragon-ru/lara-asp-testing": "self.version", "mockery/mockery": "^1.6.5", - "orchestra/testbench": "^8.0.0|^9.0.0", - "phpunit/phpunit": "^10.1.0|^11.0.0" + "orchestra/testbench": "^9.0.0", + "phpunit/phpunit": "^10.5.0|^11.0.0" }, "autoload": { "files": [ diff --git a/packages/eloquent/metadata.json b/packages/eloquent/metadata.json index 7018ff4f..b7d72064 100644 --- a/packages/eloquent/metadata.json +++ b/packages/eloquent/metadata.json @@ -5,8 +5,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", diff --git a/packages/formatter/README.md b/packages/formatter/README.md index 78b0f5fe..2e0b45fc 100644 --- a/packages/formatter/README.md +++ b/packages/formatter/README.md @@ -17,8 +17,9 @@ This package provides a customizable wrapper around [Intl](https://www.php.net/m | | `^8.0.0` | `1.1.2 ⋯ 0.12.0` | | | `>=8.0.0` | `0.11.0 ⋯ 0.4.0` | | | `>=7.4.0` | `0.3.0 ⋯ 0.1.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 2.1.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` | diff --git a/packages/formatter/UPGRADE.md b/packages/formatter/UPGRADE.md index eae7e7c2..1d581b82 100644 --- a/packages/formatter/UPGRADE.md +++ b/packages/formatter/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 This version is the deep refactoring of the [`Formatter`][code-links/9fbde97537a14196] class to make it simple and allow adding new formats easily. All built-in formats are now instances of [`Format`][code-links/f729e209367a8080] interface. Also, the config now is the [`Config`][code-links/d45c59bc79a55ae4] instance instead of an array, and locale-specific settings were moved into format itself. Please check the updated documentation for more details. diff --git a/packages/formatter/composer.json b/packages/formatter/composer.json index 8981339a..9f001c3d 100644 --- a/packages/formatter/composer.json +++ b/packages/formatter/composer.json @@ -22,16 +22,16 @@ "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.8", + "illuminate/support": "^11.0.8", "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.8", "lastdragon-ru/lara-asp-testing": "self.version", - "orchestra/testbench": "^8.0.0|^9.0.0", - "phpunit/phpunit": "^10.1.0|^11.0.0" + "orchestra/testbench": "^9.0.0", + "phpunit/phpunit": "^10.5.0|^11.0.0" }, "autoload": { "psr-4": { diff --git a/packages/formatter/metadata.json b/packages/formatter/metadata.json index 7018ff4f..b7d72064 100644 --- a/packages/formatter/metadata.json +++ b/packages/formatter/metadata.json @@ -5,8 +5,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", diff --git a/packages/graphql-printer/UPGRADE.md b/packages/graphql-printer/UPGRADE.md index ea21ca14..3b54f6c8 100644 --- a/packages/graphql-printer/UPGRADE.md +++ b/packages/graphql-printer/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/graphql-printer/composer.json b/packages/graphql-printer/composer.json index b63e92ec..981b0b6f 100644 --- a/packages/graphql-printer/composer.json +++ b/packages/graphql-printer/composer.json @@ -24,7 +24,7 @@ }, "require-dev": { "composer/class-map-generator": "^1.0", - "phpunit/phpunit": "^10.1.0|^11.0.0", + "phpunit/phpunit": "^10.5.0|^11.0.0", "lastdragon-ru/lara-asp-testing": "self.version", "mockery/mockery": "^1.6.5" }, diff --git a/packages/graphql/README.md b/packages/graphql/README.md index 4dd3713d..55ad8adc 100644 --- a/packages/graphql/README.md +++ b/packages/graphql/README.md @@ -16,13 +16,15 @@ This package provides highly powerful [`@searchBy`](docs/Directives/@searchBy.md | | `^8.0` | `4.6.0 ⋯ 2.0.0` | | | `^8.0.0` | `1.1.2 ⋯ 0.12.0` | | | `>=8.0.0` | `0.11.0 ⋯ 0.5.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 2.1.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` | | | `^8.22.1` | `3.0.0 ⋯ 0.5.0` | -| Lighthouse | `^6.5.0` | `HEAD ⋯ 5.0.0-beta.0` | +| Lighthouse | `^6.36.0` | `HEAD` | +| | `^6.5.0` | `7.0.1 ⋯ 5.0.0-beta.0` | | | `^6.0.0` | `4.6.0 ⋯ 4.0.0` | | | `^5.68.0` | `3.0.0 ⋯ 2.0.0` | | | `^5.8.0` | `1.1.2 ⋯ 0.13.0` | diff --git a/packages/graphql/UPGRADE.md b/packages/graphql/UPGRADE.md index 50745122..68ab13d1 100644 --- a/packages/graphql/UPGRADE.md +++ b/packages/graphql/UPGRADE.md @@ -33,6 +33,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) > > Maybe a good idea to add test (at least) with [`GraphQLAssertions::assertGraphQLSchemaEquals()`][code-links/c84a35ff75f6a95e] assertion before the upgrade 🤗 +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 ## General diff --git a/packages/graphql/composer.json b/packages/graphql/composer.json index b1552a3e..fb236896 100644 --- a/packages/graphql/composer.json +++ b/packages/graphql/composer.json @@ -22,11 +22,11 @@ "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", - "nuwave/lighthouse": "^6.5.0", + "illuminate/collections": "^11.0.8", + "illuminate/contracts": "^11.0.8", + "illuminate/database": "^11.0.8", + "illuminate/support": "^11.0.8", + "nuwave/lighthouse": "^6.36.0", "lastdragon-ru/lara-asp-core": "self.version", "lastdragon-ru/lara-asp-eloquent": "self.version", "lastdragon-ru/lara-asp-graphql-printer": "self.version", @@ -37,12 +37,12 @@ }, "require-dev": { "ext-pdo_sqlite": "*", - "illuminate/cache": "^10.34.0|^11.0.0", - "laravel/scout": "^9.8.0|^10.0.0", + "illuminate/cache": "^11.0.8", + "laravel/scout": "^10.8.0", "mockery/mockery": "^1.6.5", - "phpunit/phpunit": "^10.1.0|^11.0.0", + "phpunit/phpunit": "^10.5.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/graphql/metadata.json b/packages/graphql/metadata.json index 6250c0fb..c9095e37 100644 --- a/packages/graphql/metadata.json +++ b/packages/graphql/metadata.json @@ -9,11 +9,10 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "nuwave/lighthouse": [ - "^6.5.0" + "^6.36.0" ], "php": [ "^8.3", diff --git a/packages/graphql/src/Builder/Directives/SchemaDirective.php b/packages/graphql/src/Builder/Directives/SchemaDirective.php index 531da71a..29ab6bd7 100644 --- a/packages/graphql/src/Builder/Directives/SchemaDirective.php +++ b/packages/graphql/src/Builder/Directives/SchemaDirective.php @@ -76,10 +76,6 @@ public function __invoke(BuildSchemaString $event): string { #[Override] public function manipulateTypeDefinition(DocumentAST &$documentAST, TypeDefinitionNode &$typeDefinition): void { - // todo(graphql): Lighthouse since v6.34.0 merges directives from - // extension nodes except standard types. So the implementation can - // be simplified. - // Apply `extend scalar`. $manipulator = $this->manipulatorFactory->create($documentAST); @@ -92,9 +88,18 @@ public function manipulateTypeDefinition(DocumentAST &$documentAST, TypeDefiniti continue; } - // Extend + // Create node + // (it is required because Lighthouse cannot load custom scalars without `@scalar` directive) + // (Failed to find class XXX extends GraphQL\Type\Definition\ScalarType in namespaces [] for the scalar XXX.) $targetNode = $manipulator->addTypeDefinition($this->getScalarDefinitionNode($targetType)); + // Standard? + // (custom scalars will be handled by Lighthouse itself) + if (!$manipulator->isStandard($type)) { + continue; + } + + // Extend foreach ($extensions as $key => $extension) { // Valid? if (!($extension instanceof ScalarTypeExtensionNode)) { @@ -102,22 +107,18 @@ public function manipulateTypeDefinition(DocumentAST &$documentAST, TypeDefiniti } // Directives - if ($targetType === $type) { - $targetNode->directives = $targetNode->directives->merge($extension->directives); - } else { - // Only known directives will be copied for alias - foreach ($extension->directives as $index => $directive) { - if ($this->isDirective($directive->name->value)) { - $targetNode->directives[] = $directive; - - unset($extension->directives[$index]); - } - } + // (only known directives will be copied for alias) + foreach ($extension->directives as $index => $directive) { + if ($this->isDirective($directive->name->value)) { + $targetNode->directives[] = $directive; - $extension->directives->reindex(); + unset($extension->directives[$index]); + } } - // Remove to avoid conflicts with future Lighthouse version + $extension->directives->reindex(); + + // Remove to avoid conflicts with the future Lighthouse version unset($documentAST->typeExtensions[$type][$key]); if (count($documentAST->typeExtensions[$type]) === 0) { diff --git a/packages/graphql/src/Builder/Directives/SchemaDirectiveTest.php b/packages/graphql/src/Builder/Directives/SchemaDirectiveTest.php index 3b9cc246..07691e50 100644 --- a/packages/graphql/src/Builder/Directives/SchemaDirectiveTest.php +++ b/packages/graphql/src/Builder/Directives/SchemaDirectiveTest.php @@ -10,7 +10,6 @@ use GraphQL\Type\Definition\Type; use GraphQL\Utils\AST; use LastDragon_ru\LaraASP\Core\Utils\Cast; -use LastDragon_ru\LaraASP\GraphQL\Builder\Exceptions\TypeDefinitionIsNotScalarExtension; use LastDragon_ru\LaraASP\GraphQL\Builder\ManipulatorFactory; use LastDragon_ru\LaraASP\GraphQL\Builder\Scalars\Internal; use LastDragon_ru\LaraASP\GraphQL\Exceptions\TypeDefinitionAlreadyDefined; @@ -120,14 +119,13 @@ public static function dataProviderManipulateTypeDefinition(): array { @scalar( class: {$default} ) - @test - @a GRAPHQL, <<<'GRAPHQL' type Query { test: String! @mock } + # Should be ignored because handled by Lighthouse. extend scalar TestScalar @test @@ -136,18 +134,6 @@ class: {$default} GRAPHQL, 'TestScalar', ], - 'Not a scalar extension' => [ - new TypeDefinitionIsNotScalarExtension('TestScalar', 'extend enum TestScalar'), - <<<'GRAPHQL' - type Query { - test: String! @mock - } - - extend enum TestScalar - @test - GRAPHQL, - 'TestScalar', - ], 'Unsupported' => [ <<<'GRAPHQL' union MyUnion = diff --git a/packages/graphql/src/SortBy/Directives/DirectiveTest/ScalarOperators.schema.graphql b/packages/graphql/src/SortBy/Directives/DirectiveTest/ScalarOperators.schema.graphql index f50e0f08..bfdd8072 100644 --- a/packages/graphql/src/SortBy/Directives/DirectiveTest/ScalarOperators.schema.graphql +++ b/packages/graphql/src/SortBy/Directives/DirectiveTest/ScalarOperators.schema.graphql @@ -9,6 +9,9 @@ type Query { input A { a: Int! } + extend scalar SortByOperatorsExtra @sortByExtendOperators + +extend scalar SortByOperatorsExtra @sortByOperatorRandom diff --git a/packages/migrator/README.md b/packages/migrator/README.md index 244f91db..d6e03fd9 100644 --- a/packages/migrator/README.md +++ b/packages/migrator/README.md @@ -21,8 +21,9 @@ This package improves standard Laravel migrations to add support for raw SQL fil | | `^8.0.0` | `1.1.2 ⋯ 0.12.0` | | | `>=8.0.0` | `0.11.0 ⋯ 0.4.0` | | | `>=7.4.0` | `0.3.0 ⋯ 0.1.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 2.1.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` | diff --git a/packages/migrator/UPGRADE.md b/packages/migrator/UPGRADE.md index 172e65c7..adfae83a 100644 --- a/packages/migrator/UPGRADE.md +++ b/packages/migrator/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/migrator/composer.json b/packages/migrator/composer.json index 3c862b45..0f592174 100644 --- a/packages/migrator/composer.json +++ b/packages/migrator/composer.json @@ -23,25 +23,25 @@ "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.8", + "illuminate/console": "^11.0.8", + "illuminate/container": "^11.0.8", + "illuminate/contracts": "^11.0.8", + "illuminate/database": "^11.0.8", + "illuminate/filesystem": "^11.0.8", + "illuminate/support": "^11.0.8", "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.8", "lastdragon-ru/lara-asp-testing": "self.version", "mockery/mockery": "^1.6.5", - "orchestra/testbench": "^8.0.0|^9.0.0", - "phpunit/phpunit": "^10.1.0|^11.0.0" + "orchestra/testbench": "^9.0.0", + "phpunit/phpunit": "^10.5.0|^11.0.0" }, "autoload": { "psr-4": { diff --git a/packages/migrator/docs/Commands/sql-migration.md b/packages/migrator/docs/Commands/sql-migration.md index fba54c18..2d95df9c 100644 --- a/packages/migrator/docs/Commands/sql-migration.md +++ b/packages/migrator/docs/Commands/sql-migration.md @@ -7,6 +7,7 @@ Create a new SQL Migration file. ## Usages * `artisan lara-asp-migrator:sql-migration [--path [PATH]] [--] ` +* `artisan make:sql-migration` ## Arguments diff --git a/packages/migrator/docs/Commands/sql-seeder.md b/packages/migrator/docs/Commands/sql-seeder.md index ebc023d1..73b4c208 100644 --- a/packages/migrator/docs/Commands/sql-seeder.md +++ b/packages/migrator/docs/Commands/sql-seeder.md @@ -7,6 +7,7 @@ Create a new SQL Seeder class ## Usages * `artisan lara-asp-migrator:sql-seeder ` +* `artisan make:sql-seeder` ## Arguments diff --git a/packages/migrator/metadata.json b/packages/migrator/metadata.json index 7018ff4f..b7d72064 100644 --- a/packages/migrator/metadata.json +++ b/packages/migrator/metadata.json @@ -5,8 +5,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", diff --git a/packages/migrator/src/Commands/SqlMigration.php b/packages/migrator/src/Commands/SqlMigration.php index 02a65846..55677238 100644 --- a/packages/migrator/src/Commands/SqlMigration.php +++ b/packages/migrator/src/Commands/SqlMigration.php @@ -19,6 +19,9 @@ #[AsCommand( name : Package::Name.':sql-migration', description: 'Create a new SQL Migration file.', + aliases : [ + 'make:sql-migration', + ], )] class SqlMigration extends BaseCommand { #[Override] diff --git a/packages/migrator/src/Commands/SqlMigrationTest.php b/packages/migrator/src/Commands/SqlMigrationTest.php index 22173d22..5cd85689 100644 --- a/packages/migrator/src/Commands/SqlMigrationTest.php +++ b/packages/migrator/src/Commands/SqlMigrationTest.php @@ -5,6 +5,7 @@ use LastDragon_ru\LaraASP\Migrator\Package; use LastDragon_ru\LaraASP\Migrator\Testing\Package\TestCase; use PHPUnit\Framework\Attributes\CoversClass; +use PHPUnit\Framework\Attributes\DataProvider; use Symfony\Component\Finder\Finder; use function array_slice; @@ -16,16 +17,18 @@ */ #[CoversClass(SqlMigration::class)] final class SqlMigrationTest extends TestCase { - public function testHandle(): void { + // + // ========================================================================= + #[DataProvider('dataProviderHandle')] + public function testHandle(string $command): void { // Pre test - $pkg = Package::Name; $path = self::getTempDirectory(); $finder = Finder::create()->in($path); self::assertCount(0, $finder->files()); // Call - $this->artisan("{$pkg}:sql-migration", [ + $this->artisan($command, [ 'name' => 'SqlMigration', '--path' => $path, ]); @@ -44,4 +47,18 @@ public function testHandle(): void { self::assertEquals($expected, $actual); } + // + + // + // ========================================================================= + /** + * @return array + */ + public static function dataProviderHandle(): array { + return [ + 'name' => [Package::Name.':sql-migration'], + 'alias' => ['make:sql-migration'], + ]; + } + // } diff --git a/packages/migrator/src/Commands/SqlSeeder.php b/packages/migrator/src/Commands/SqlSeeder.php index d2b07523..3c7ebea7 100644 --- a/packages/migrator/src/Commands/SqlSeeder.php +++ b/packages/migrator/src/Commands/SqlSeeder.php @@ -14,6 +14,9 @@ #[AsCommand( name : Package::Name.':sql-seeder', description: 'Create a new SQL Seeder class', + aliases : [ + 'make:sql-seeder', + ], )] class SqlSeeder extends GeneratorCommand { /** diff --git a/packages/migrator/src/Commands/SqlSeederTest.php b/packages/migrator/src/Commands/SqlSeederTest.php index 8c61ce7c..ab8138c7 100644 --- a/packages/migrator/src/Commands/SqlSeederTest.php +++ b/packages/migrator/src/Commands/SqlSeederTest.php @@ -5,6 +5,7 @@ use LastDragon_ru\LaraASP\Migrator\Package; use LastDragon_ru\LaraASP\Migrator\Testing\Package\TestCase; use PHPUnit\Framework\Attributes\CoversClass; +use PHPUnit\Framework\Attributes\DataProvider; use Symfony\Component\Finder\Finder; /** @@ -12,9 +13,11 @@ */ #[CoversClass(SqlSeeder::class)] final class SqlSeederTest extends TestCase { - public function testHandle(): void { + // + // ========================================================================= + #[DataProvider('dataProviderHandle')] + public function testHandle(string $command): void { // Pre test - $pkg = Package::Name; $path = self::getTempDirectory(); $finder = Finder::create()->in($path); @@ -26,7 +29,7 @@ public function testHandle(): void { $this->app->useDatabasePath($path); // Call - $this->artisan("{$pkg}:sql-seeder", [ + $this->artisan($command, [ 'name' => 'SqlSeeder', ]); @@ -43,4 +46,18 @@ public function testHandle(): void { self::assertEquals($expected, $actual); } + // + + // + // ========================================================================= + /** + * @return array + */ + public static function dataProviderHandle(): array { + return [ + 'name' => [Package::Name.':sql-seeder'], + 'alias' => ['make:sql-seeder'], + ]; + } + // } diff --git a/packages/migrator/src/Seeders/SeederService.php b/packages/migrator/src/Seeders/SeederService.php index a32f3d19..b3da3a61 100644 --- 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; diff --git a/packages/serializer/README.md b/packages/serializer/README.md index 5510b54a..b7a97022 100644 --- a/packages/serializer/README.md +++ b/packages/serializer/README.md @@ -13,8 +13,9 @@ This package provides a customizable wrapper around the [Symfony Serializer Comp | PHP | `^8.3` | `HEAD ⋯ 5.0.0` | | | `^8.2` | `HEAD ⋯ 5.0.0-beta.0` | | | `^8.1` | `6.4.2 ⋯ 5.0.0-beta.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 5.0.0-beta.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0` | diff --git a/packages/serializer/UPGRADE.md b/packages/serializer/UPGRADE.md index c0cec69d..deb058ed 100644 --- a/packages/serializer/UPGRADE.md +++ b/packages/serializer/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/serializer/composer.json b/packages/serializer/composer.json index dbe3662f..0ca23fae 100644 --- a/packages/serializer/composer.json +++ b/packages/serializer/composer.json @@ -18,24 +18,24 @@ }, "require": { "php": "^8.2|^8.3", - "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/support": "^10.34.0|^11.0.0", + "illuminate/container": "^11.0.8", + "illuminate/contracts": "^11.0.8", + "illuminate/database": "^11.0.8", + "illuminate/support": "^11.0.8", "lastdragon-ru/lara-asp-core": "self.version", "phpdocumentor/type-resolver": "^1.7", "phpstan/phpdoc-parser": "^1.25", "symfony/deprecation-contracts": "^3.0.0", - "symfony/property-access": "^6.3.0|^7.0.0", - "symfony/property-info": "^6.3.9|^7.0.0", - "symfony/serializer": "^6.4.0|^7.0.0", + "symfony/property-access": "^7.0.0", + "symfony/property-info": "^7.0.0", + "symfony/serializer": "^7.0.0", "symfony/polyfill-php83": "^1.28" }, "require-dev": { "lastdragon-ru/lara-asp-testing": "self.version", "mockery/mockery": "^1.6.5", - "orchestra/testbench": "^8.0.0|^9.0.0", - "phpunit/phpunit": "^10.1.0|^11.0.0" + "orchestra/testbench": "^9.0.0", + "phpunit/phpunit": "^10.5.0|^11.0.0" }, "autoload": { "psr-4": { diff --git a/packages/serializer/metadata.json b/packages/serializer/metadata.json index 86711ddd..d1cd3935 100644 --- a/packages/serializer/metadata.json +++ b/packages/serializer/metadata.json @@ -5,8 +5,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", diff --git a/packages/serializer/src/Normalizers/DateTimeNormalizer.php b/packages/serializer/src/Normalizers/DateTimeNormalizer.php index 271e0c98..3dbc5069 100644 --- a/packages/serializer/src/Normalizers/DateTimeNormalizer.php +++ b/packages/serializer/src/Normalizers/DateTimeNormalizer.php @@ -55,6 +55,7 @@ public function __construct(array $defaultContext = []) { /** * @return array */ + #[Override] public function getSupportedTypes(?string $format): array { return [ DateTimeInterface::class => self::class === static::class, diff --git a/packages/serializer/src/Normalizers/SerializableNormalizer.php b/packages/serializer/src/Normalizers/SerializableNormalizer.php index 7b0a26be..bbcf3511 100644 --- a/packages/serializer/src/Normalizers/SerializableNormalizer.php +++ b/packages/serializer/src/Normalizers/SerializableNormalizer.php @@ -74,6 +74,7 @@ classMetadataFactory : $metadata, /** * @return array */ + #[Override] public function getSupportedTypes(?string $format): array { return [ Serializable::class => self::class === static::class, diff --git a/packages/serializer/src/Normalizers/UnitEnumNormalizer.php b/packages/serializer/src/Normalizers/UnitEnumNormalizer.php index 8eb06999..1acd82bc 100644 --- a/packages/serializer/src/Normalizers/UnitEnumNormalizer.php +++ b/packages/serializer/src/Normalizers/UnitEnumNormalizer.php @@ -41,6 +41,7 @@ public function __construct(array $defaultContext = []) { /** * @return array */ + #[Override] public function getSupportedTypes(?string $format): array { return [ UnitEnum::class => self::class === static::class, diff --git a/packages/spa/README.md b/packages/spa/README.md index 1280280c..df89fe4f 100644 --- a/packages/spa/README.md +++ b/packages/spa/README.md @@ -14,8 +14,9 @@ | | `^8.0` | `4.6.0 ⋯ 2.0.0` | | | `^8.0.0` | `1.1.2 ⋯ 0.12.0` | | | `>=8.0.0` | `0.11.0 ⋯ 0.4.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 2.1.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` | diff --git a/packages/spa/UPGRADE.md b/packages/spa/UPGRADE.md index be7c90dd..c643589e 100644 --- a/packages/spa/UPGRADE.md +++ b/packages/spa/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/spa/composer.json b/packages/spa/composer.json index e513c2bf..a4b14082 100644 --- a/packages/spa/composer.json +++ b/packages/spa/composer.json @@ -20,25 +20,25 @@ "require": { "php": "^8.2|^8.3", "ext-mbstring": "*", - "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/http": "^10.34.0|^11.0.0", - "illuminate/pagination": "^10.34.0|^11.0.0", - "illuminate/routing": "^10.34.0|^11.0.0", - "illuminate/support": "^10.34.0|^11.0.0", - "illuminate/validation": "^10.34.0|^11.0.0", + "illuminate/collections": "^11.0.8", + "illuminate/contracts": "^11.0.8", + "illuminate/database": "^11.0.8", + "illuminate/http": "^11.0.8", + "illuminate/pagination": "^11.0.8", + "illuminate/routing": "^11.0.8", + "illuminate/support": "^11.0.8", + "illuminate/validation": "^11.0.8", "guzzlehttp/psr7": "^2.4.5", "lastdragon-ru/lara-asp-core": "self.version", "symfony/deprecation-contracts": "^3.0.0", - "symfony/http-kernel": "^6.3.0|^7.0.0", + "symfony/http-kernel": "^7.0.0", "symfony/polyfill-php83": "^1.28" }, "require-dev": { - "phpunit/phpunit": "^10.1.0|^11.0.0", + "phpunit/phpunit": "^10.5.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/spa/metadata.json b/packages/spa/metadata.json index 4d5beac8..5dddce9a 100644 --- a/packages/spa/metadata.json +++ b/packages/spa/metadata.json @@ -5,8 +5,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", diff --git a/packages/testing/README.md b/packages/testing/README.md index a1ada7c8..68ba89cf 100644 --- a/packages/testing/README.md +++ b/packages/testing/README.md @@ -17,15 +17,17 @@ This package provides various useful asserts for [PHPUnit](https://phpunit.de/) | | `^8.0.0` | `1.1.2 ⋯ 0.12.0` | | | `>=8.0.0` | `0.11.0 ⋯ 0.4.0` | | | `>=7.4.0` | `0.3.0 ⋯ 0.1.0` | -| Laravel | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.34.0` | `HEAD ⋯ 6.2.0` | +| Laravel | `^11.0.8` | `HEAD` | +| | `^11.0.0` | `7.0.1 ⋯ 6.2.0` | +| | `^10.34.0` | `7.0.1 ⋯ 6.2.0` | | | `^10.0.0` | `6.1.0 ⋯ 2.1.0` | | | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` | | | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` | | | `^8.22.1` | `3.0.0 ⋯ 0.2.0` | | | `^8.0` | `0.1.0` | | PHPUnit | `^11.0.0` | `HEAD ⋯ 6.2.0` | -| | `^10.1.0` | `HEAD ⋯ 6.0.0` | +| | `^10.5.0` | `HEAD` | +| | `^10.1.0` | `7.0.1 ⋯ 6.0.0` | [//]: # (end: preprocess/78cfc4c7c7c55577) diff --git a/packages/testing/UPGRADE.md b/packages/testing/UPGRADE.md index 0b5344d2..86f400ee 100644 --- a/packages/testing/UPGRADE.md +++ b/packages/testing/UPGRADE.md @@ -27,6 +27,16 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases) [//]: # (end: preprocess/aa9fc458898c7c1c) +# Upgrade from v7 + +[include:file]: ../../docs/Shared/Upgrade/FromV7.md +[//]: # (start: preprocess/c45228918cc92f69) +[//]: # (warning: Generated automatically. Do not edit.) + +* [ ] Laravel v10 is not supported anymore. Migrate to the newer version. + +[//]: # (end: preprocess/c45228918cc92f69) + # Upgrade from v6 [include:file]: ../../docs/Shared/Upgrade/FromV6.md diff --git a/packages/testing/composer.json b/packages/testing/composer.json index 6027cf20..4c3bb9d9 100644 --- a/packages/testing/composer.json +++ b/packages/testing/composer.json @@ -28,33 +28,33 @@ "composer/semver": "^3.2", "doctrine/sql-formatter": "^1.1", "http-interop/http-factory-guzzle": "^1.0.0", - "illuminate/collections": "^10.34.0|^11.0.0", - "illuminate/console": "^10.34.0|^11.0.0", - "illuminate/contracts": "^10.34.0|^11.0.0", - "illuminate/database": "^10.34.0|^11.0.0", - "illuminate/testing": "^10.34.0|^11.0.0", - "illuminate/translation": "^10.34.0|^11.0.0", + "illuminate/collections": "^11.0.8", + "illuminate/console": "^11.0.8", + "illuminate/contracts": "^11.0.8", + "illuminate/database": "^11.0.8", + "illuminate/testing": "^11.0.8", + "illuminate/translation": "^11.0.8", "mockery/mockery": "^1.6.5", "opis/json-schema": "^2.3.0", - "phpunit/phpunit": "^10.1.0|^11.0.0", + "phpunit/phpunit": "^10.5.0|^11.0.0", "psr/http-message": "^1.0.0|^2.0.0", "sebastian/comparator": "^5.0|^6.0.0", "sebastian/exporter": "^5.0|^6.0.0", "symfony/deprecation-contracts": "^3.0.0", - "symfony/filesystem": "^6.3.0|^7.0.0", - "symfony/http-foundation": "^6.3.0|^7.0.0", - "symfony/mime": "^6.3.0|^7.0.0", - "symfony/psr-http-message-bridge": "^2.0.0|^6.4.0|^7.0.0", + "symfony/filesystem": "^7.0.0", + "symfony/http-foundation": "^7.0.0", + "symfony/mime": "^7.0.0", + "symfony/psr-http-message-bridge": "^7.0.0", "symfony/polyfill-php83": "^1.28" }, "require-dev": { "fakerphp/faker": "^1.21.0", "guzzlehttp/psr7": "^2.4.5", - "illuminate/http": "^10.34.0|^11.0.0", - "laravel/scout": "^9.8.0|^10.0.0", - "orchestra/testbench": "^8.0.0|^9.0.0", - "symfony/console": "^6.3.0|^7.0.0", - "symfony/http-kernel": "^6.3.0|^7.0.0" + "illuminate/http": "^11.0.8", + "laravel/scout": "^10.8.0", + "orchestra/testbench": "^9.0.0", + "symfony/console": "^7.0.0", + "symfony/http-kernel": "^7.0.0" }, "autoload": { "files": [ diff --git a/packages/testing/metadata.json b/packages/testing/metadata.json index 586e9fea..353b4b79 100644 --- a/packages/testing/metadata.json +++ b/packages/testing/metadata.json @@ -9,8 +9,7 @@ "requirements": { "HEAD": { "laravel/framework": [ - "^11.0.0", - "^10.34.0" + "^11.0.8" ], "php": [ "^8.3", @@ -18,7 +17,7 @@ ], "phpunit/phpunit": [ "^11.0.0", - "^10.1.0" + "^10.5.0" ] }, "7.0.1": { diff --git a/phpstan-baseline-well-known.neon b/phpstan-baseline-well-known.neon index 128244f0..486b229c 100644 --- a/phpstan-baseline-well-known.neon +++ b/phpstan-baseline-well-known.neon @@ -84,14 +84,6 @@ parameters: paths: - packages/dev/src/PhpStan/ClassMustBeInternal/RuleTest.php - # Symfony v6 compatibility - - - message: "#^[^:]+::getSupportedTypes\\(\\) overrides method [^:]+::getSupportedTypes\\(\\) but is missing the \\#\\[\\\\Override\\] attribute\\.$#" - paths: - - packages/serializer/src/Normalizers/DateTimeNormalizer.php - - packages/serializer/src/Normalizers/SerializableNormalizer.php - - packages/serializer/src/Normalizers/UnitEnumNormalizer.php - # Not supported yet (`class-string-map`) # https://github.com/phpstan/phpstan/discussions/11736 # https://github.com/phpstan/phpstan/issues/9521 (?)