diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b8ba05..2a58cf2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,16 +17,9 @@ jobs: strategy: fail-fast: false matrix: - php: ["8.1", "8.2", "8.3"] - symfony: ["^5.4", "^6.4", "^7.0"] - dbal: ["^2.0", "^3.0"] - exclude: - - - php: "8.1" - symfony: "^7.0" - - - symfony: "^7.0" - dbal: "^2.0" + php: ["8.2", "8.3", "8.4", "8.5"] + symfony: ["^6.4", "^7.4"] + dbal: ["^3.0"] steps: - diff --git a/composer.json b/composer.json index b9200a0..3b3e88a 100644 --- a/composer.json +++ b/composer.json @@ -24,27 +24,28 @@ } ], "require": { - "php": "^8.1", - "doctrine/data-fixtures": "^1.2", + "php": "^8.2", + "doctrine/data-fixtures": "^1.2 || ^2.0", "monolog/monolog": "^1.25 || ^2.1 || ^3", - "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", - "symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0", + "symfony/framework-bundle": "^6.4 || ^7.4", + "symfony/monolog-bridge": "^6.4 || ^7.4", "webmozart/assert": "^1.9" }, "require-dev": { - "doctrine/doctrine-bundle": "^2.1", + "doctrine/doctrine-bundle": "^2.1 || ^3.0", + "doctrine/dbal": "^3.0 || ^4.0", "doctrine/orm": "^2.7 || ^3.0", - "matthiasnoback/symfony-config-test": "^4.2 || ^5.0", - "matthiasnoback/symfony-dependency-injection-test": "^4.2 || ^5.0", - "phpspec/phpspec": "^7.0", - "phpunit/phpunit": "^9.4", + "matthiasnoback/symfony-config-test": "^4.2 || ^5.0 || ^6.0", + "matthiasnoback/symfony-dependency-injection-test": "^4.2 || ^5.0 || ^6.0", + "phpspec/phpspec": "^7.0 || ^8.0", + "phpunit/phpunit": "^9.4 || ^10.0 || ^11.0", "sylius-labs/coding-standard": "^4.0", - "rector/rector": "^1.2.3", - "phpstan/phpstan": "^1.10", - "phpstan/phpstan-doctrine": "^1.3", - "phpstan/phpstan-webmozart-assert": "^1.2", - "phpstan/phpstan-symfony": "^1.3", - "phpstan/phpstan-phpunit": "^1.3" + "rector/rector": "^2.0", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-doctrine": "^2.0", + "phpstan/phpstan-webmozart-assert": "^2.0", + "phpstan/phpstan-symfony": "^2.0", + "phpstan/phpstan-phpunit": "^2.0" }, "extra": { "branch-alias": { diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 7e62a7a..71a9663 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -24,3 +24,7 @@ parameters: - '/Static property .*\:\:\$container \(.*\\Test\\TestContainer\) does not accept Symfony\\Component\\DependencyInjection\\ContainerInterface\./' - '/PHPDoc tag \@var for variable \$manager contains unknown class Doctrine\\ODM\\MongoDB\\DocumentManager\./' - '/PHPDoc tag \@var for variable \$manager contains unknown class Doctrine\\ODM\\PHPCR\\DocumentManagerInterface\./' + - '/PHPDoc tag \@var with type Doctrine\\ODM\\MongoDB\\DocumentManager is not subtype of native type/' + - '/PHPDoc tag \@var with type Doctrine\\ODM\\PHPCR\\DocumentManagerInterface is not subtype of native type/' + - '/Call to static method Webmozart\\Assert\\Assert::\w+\(\) .* will always evaluate to true\./' + - '/PHPDoc tag \@var with type .* is not subtype of native type .*MockObject\./' diff --git a/src/Suite/LazySuiteRegistry.php b/src/Suite/LazySuiteRegistry.php index 75cf25a..c525512 100644 --- a/src/Suite/LazySuiteRegistry.php +++ b/src/Suite/LazySuiteRegistry.php @@ -18,7 +18,7 @@ final class LazySuiteRegistry implements SuiteRegistryInterface /** @var array> */ private array $suiteDefinitions = []; - /** @var array> */ + /** @var array */ private array $suites = []; public function __construct(private SuiteFactoryInterface $suiteFactory)