diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 393347884..8c7867d83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,16 +18,16 @@ jobs: fail-fast: false matrix: php: ["8.0", "8.1"] - symfony: ["^5.4", "~6.0.0", "~6.1.0", "~6.2.0"] + symfony: ["^5.4", "~6.0.0", "~6.4.0"] twig: ["^2.12", "^3.0"] persistence: ["^2.0", "^3.0"] exclude: - php: "8.0" - symfony: "~6.1.0" + symfony: "~6.4.0" - - php: "8.0" - symfony: "~6.2.0" + persistence: "^2.0" + symfony: "~6.4.0" steps: - diff --git a/composer.json b/composer.json index 37344055f..86e09d775 100644 --- a/composer.json +++ b/composer.json @@ -71,6 +71,7 @@ "sylius/grid-bundle": "^1.7 || v1.12.0-ALPHA.1", "symfony/dependency-injection": "^5.4 || ^6.0", "symfony/dotenv": "^5.4 || ^6.0", + "symfony/stopwatch": "^5.4 || ^6.0", "symfony/workflow": "^5.4 || ^6.0", "twig/twig": "^2.12 || ^3.0", "vimeo/psalm": "^4.22", diff --git a/psalm.xml b/psalm.xml index c1e196eaa..bfed0e2d0 100644 --- a/psalm.xml +++ b/psalm.xml @@ -44,6 +44,12 @@ + + + + + + diff --git a/src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php b/src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php index 1dcd58390..0ae9f2eb3 100644 --- a/src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php +++ b/src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php @@ -47,6 +47,7 @@ public function process(ContainerBuilder $container): void $resolveTargetEntityListener->addMethodCall('addResolveTargetEntity', [$interface, $model, []]); } + /** @var object|string $resolveTargetEntityListenerClass */ $resolveTargetEntityListenerClass = $container->getParameterBag()->resolveValue($resolveTargetEntityListener->getClass()); if (is_a($resolveTargetEntityListenerClass, EventSubscriber::class, true)) { if (!$resolveTargetEntityListener->hasTag('doctrine.event_subscriber')) {