[Maintenance] Allow installing Symfony 7

.github/workflows/build.yml

@@ -17,13 +17,26 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.0", "8.1"]
-                symfony: ["^5.4", "^6.0"]
+                php: ["8.0", "8.1", "8.2"]
+                symfony: ["^5.4", "^6.4", "^7.0"]
                 dbal: ["^2.0", "^3.0"]
+                exclude:
+                    -
+                        php: "8.0"
+                        symfony: "^6.4"
+                    -
+                        php: "8.0"
+                        symfony: "^7.0"
+                    -
+                        php: "8.1"
+                        symfony: "^7.0"
+                    -
+                        symfony: "^7.0"
+                        dbal: "^2.0"
 
         steps:
             -
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -
                 name: Setup PHP
@@ -37,7 +50,7 @@ jobs:
                 if: matrix.symfony != ''
                 run: |
                     composer global config --no-plugins allow-plugins.symfony/flex true
-                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
+                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.17 || ^2.0"
                     composer config extra.symfony.require "${{ matrix.symfony }}"
 
             -

composer.json

@@ -26,21 +26,25 @@
     "require": {
         "php": "^8.0",
         "doctrine/data-fixtures": "^1.2",
-        "monolog/monolog": "^1.25 || ^2.1",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/monolog-bridge": "^5.4 || ^6.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",
         "webmozart/assert": "^1.9"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.1",
-        "doctrine/orm": "^2.7",
-        "matthiasnoback/symfony-config-test": "^4.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.2",
+        "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",
         "sylius-labs/coding-standard": "^4.0",
-        "vimeo/psalm": "^4.23",
-        "rector/rector": "^0.14.5"
+        "rector/rector": "^0.14.5",
+        "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"
     },
     "extra": {
         "branch-alias": {
@@ -61,8 +65,8 @@
     "scripts": {
         "analyse": [
             "@composer validate --strict",
-            "vendor/bin/ecs check spec src tests",
-            "vendor/bin/psalm"
+            "vendor/bin/ecs check",
+            "vendor/bin/phpstan analyse"
         ],
         "fix": [
             "vendor/bin/ecs check spec src tests --fix"

ecs.php

@@ -2,29 +2,34 @@
 
 use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
 use PhpCsFixer\Fixer\Comment\HeaderCommentFixer;
-use PhpCsFixer\Fixer\Phpdoc\PhpdocTagTypeFixer;
 use SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\EasyCodingStandard\ValueObject\Option;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void
-{
-    $containerConfigurator->import('vendor/sylius-labs/coding-standard/ecs.php');
+return static function (ECSConfig $config): void {
+    $config->import('vendor/sylius-labs/coding-standard/ecs.php');
 
-    $containerConfigurator->services()->set(HeaderCommentFixer::class)->call('configure', [[
-        'location' => 'after_open',
-        'header' =>
-            'This file is part of the Sylius package.
+    $config->parallel();
+    $config->paths(['src', 'spec', 'tests']);
 
-(c) Paweł Jędrzejewski
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.',
-    ]]);
-
-    $containerConfigurator->parameters()->set(Option::SKIP, [
+    $config->skip([
         InlineDocCommentDeclarationSniff::class . '.MissingVariable',
         VisibilityRequiredFixer::class => ['*Spec.php'],
         '**/var/*',
     ]);
+
+    $config->ruleWithConfiguration(
+        HeaderCommentFixer::class,
+        [
+            'location' => 'after_open',
+            'comment_type' => HeaderCommentFixer::HEADER_COMMENT,
+            'header' => <<<TEXT
+This file is part of the Sylius package.
+
+(c) Paweł Jędrzejewski
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+TEXT
+        ]
+    );
 };

phpstan.neon.dist

@@ -0,0 +1,26 @@
+includes:
+    - vendor/phpstan/phpstan-doctrine/extension.neon
+    - vendor/phpstan/phpstan-doctrine/rules.neon
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-phpunit/rules.neon
+    - vendor/phpstan/phpstan-symfony/extension.neon
+    - vendor/phpstan/phpstan-symfony/rules.neon
+    - vendor/phpstan/phpstan-webmozart-assert/extension.neon
+
+parameters:
+    level: 6
+
+    reportUnmatchedIgnoredErrors: false
+
+    paths:
+        - 'src/'
+        - 'tests/'
+
+    excludePaths:
+        - 'tests/Application/**.php'
+
+    ignoreErrors:
+        - '/Property .*\:\:\$container has no type specified\./'
+        - '/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\./'

src/DependencyInjection/SyliusFixturesExtension.php

@@ -26,11 +26,13 @@
 
 final class SyliusFixturesExtension extends Extension implements PrependExtensionInterface
 {
+    /** @param array<mixed> $config */
     public function getConfiguration(array $config, ContainerBuilder $container): ConfigurationInterface
     {
         return new Configuration();
     }
 
+    /** @param array<array<mixed>> $configs */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
@@ -69,6 +71,7 @@ public function prepend(ContainerBuilder $container): void
         }
     }
 
+    /** @param array{suites: array<string, array<mixed>>} $config */
     private function registerSuites(array $config, ContainerBuilder $container): void
     {
         $suiteRegistry = $container->findDefinition('sylius_fixtures.suite_registry');

src/Fixture/FixtureInterface.php

@@ -17,6 +17,7 @@
 
 interface FixtureInterface extends ConfigurationInterface
 {
+    /** @param array<mixed> $options */
     public function load(array $options): void;
 
     public function getName(): string;

src/Fixture/FixtureRegistry.php

@@ -17,8 +17,8 @@
 
 final class FixtureRegistry implements FixtureRegistryInterface
 {
-    /** @var array */
-    private $fixtures = [];
+    /** @var array<string, FixtureInterface> */
+    private array $fixtures = [];
 
     public function addFixture(FixtureInterface $fixture): void
     {

src/Listener/AfterFixtureListenerInterface.php

@@ -15,5 +15,6 @@
 
 interface AfterFixtureListenerInterface extends ListenerInterface
 {
+    /** @param array<mixed> $options */
     public function afterFixture(FixtureEvent $fixtureEvent, array $options): void;
 }

src/Listener/AfterSuiteListenerInterface.php

@@ -15,5 +15,6 @@
 
 interface AfterSuiteListenerInterface extends ListenerInterface
 {
+    /** @param array<mixed> $options */
     public function afterSuite(SuiteEvent $suiteEvent, array $options): void;
 }

src/Listener/BeforeFixtureListenerInterface.php

@@ -15,5 +15,6 @@
 
 interface BeforeFixtureListenerInterface extends ListenerInterface
 {
+    /** @param array<mixed> $options */
     public function beforeFixture(FixtureEvent $fixtureEvent, array $options): void;
 }

src/Listener/BeforeSuiteListenerInterface.php

@@ -15,5 +15,6 @@
 
 interface BeforeSuiteListenerInterface extends ListenerInterface
 {
+    /** @param array<mixed> $options */
     public function beforeSuite(SuiteEvent $suiteEvent, array $options): void;
 }

src/Listener/FixtureEvent.php

@@ -22,9 +22,10 @@ final class FixtureEvent
 
     private FixtureInterface $fixture;
 
-    /** @var array */
-    private $fixtureOptions;
+    /** @var array<mixed> */
+    private array $fixtureOptions;
 
+    /** @param array<mixed> $fixtureOptions */
     public function __construct(SuiteInterface $suite, FixtureInterface $fixture, array $fixtureOptions)
     {
         $this->suite = $suite;
@@ -42,6 +43,7 @@ public function fixture(): FixtureInterface
         return $this->fixture;
     }
 
+    /** @return array<mixed> */
     public function fixtureOptions(): array
     {
         return $this->fixtureOptions;

src/Listener/ListenerRegistry.php

@@ -17,8 +17,8 @@
 
 final class ListenerRegistry implements ListenerRegistryInterface
 {
-    /** @var array */
-    private $listeners = [];
+    /** @var array<string, ListenerInterface> */
+    private array $listeners = [];
 
     public function addListener(ListenerInterface $listener): void
     {

src/Listener/ListenerRegistryInterface.php

@@ -21,7 +21,7 @@ interface ListenerRegistryInterface
     public function getListener(string $name): ListenerInterface;
 
     /**
-     * @return array|ListenerInterface[] Name indexed
+     * @return array<string, ListenerInterface> Name indexed
      */
     public function getListeners(): array;
 }

src/Listener/LoggerListener.php

@@ -24,11 +24,13 @@ public function __construct(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
+    /** @param array<mixed> $options */
     public function beforeSuite(SuiteEvent $suiteEvent, array $options): void
     {
         $this->logger->notice(sprintf('Running suite "%s"...', $suiteEvent->suite()->getName()));
     }
 
+    /** @param array<mixed> $options */
     public function beforeFixture(FixtureEvent $fixtureEvent, array $options): void
     {
         $this->logger->notice(sprintf('Running fixture "%s"...', $fixtureEvent->fixture()->getName()));

src/Listener/MongoDBPurgerListener.php

@@ -14,20 +14,20 @@
 namespace Sylius\Bundle\FixturesBundle\Listener;
 
 use Doctrine\Common\DataFixtures\Purger\MongoDBPurger;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
 final class MongoDBPurgerListener extends AbstractListener implements BeforeSuiteListenerInterface
 {
-    /** @var ManagerRegistry */
-    private $managerRegistry;
+    private ManagerRegistry $managerRegistry;
 
     public function __construct(ManagerRegistry $managerRegistry)
     {
         $this->managerRegistry = $managerRegistry;
     }
 
+    /** @param array{managers: string[]} $options */
     public function beforeSuite(SuiteEvent $suiteEvent, array $options): void
     {
         foreach ($options['managers'] as $managerName) {

src/Listener/ORMPurgerListener.php

@@ -22,6 +22,7 @@ final class ORMPurgerListener extends AbstractListener implements BeforeSuiteLis
 {
     private ManagerRegistry $managerRegistry;
 
+    /** @var array<string, int> */
     private static array $purgeModes = [
         'delete' => ORMPurger::PURGE_MODE_DELETE,
         'truncate' => ORMPurger::PURGE_MODE_TRUNCATE,
@@ -32,14 +33,15 @@ public function __construct(ManagerRegistry $managerRegistry)
         $this->managerRegistry = $managerRegistry;
     }
 
+    /** @param array{managers: string[], exclude: array<int|string>, mode: string} $options */
     public function beforeSuite(SuiteEvent $suiteEvent, array $options): void
     {
         foreach ($options['managers'] as $managerName) {
             /** @var EntityManagerInterface $manager */
             $manager = $this->managerRegistry->getManager($managerName);
 
             $purger = new ORMPurger($manager, $options['exclude']);
-            $purger->setPurgeMode(static::$purgeModes[$options['mode']]);
+            $purger->setPurgeMode(self::$purgeModes[$options['mode']]);
             $purger->purge();
         }
     }

src/Listener/PHPCRPurgerListener.php

@@ -14,20 +14,20 @@
 namespace Sylius\Bundle\FixturesBundle\Listener;
 
 use Doctrine\Common\DataFixtures\Purger\PHPCRPurger;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManagerInterface;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
 final class PHPCRPurgerListener extends AbstractListener implements BeforeSuiteListenerInterface
 {
-    /** @var ManagerRegistry */
-    private $managerRegistry;
+    private ManagerRegistry $managerRegistry;
 
     public function __construct(ManagerRegistry $managerRegistry)
     {
         $this->managerRegistry = $managerRegistry;
     }
 
+    /** @param array{managers: string[]} $options */
     public function beforeSuite(SuiteEvent $suiteEvent, array $options): void
     {
         foreach ($options['managers'] as $managerName) {