Resolve conflict after upmerging tests for PHP 8.1

Sylius · Mar 15, 2022 · 0269c3f · 0269c3f
2 parents 2949002 + 898ca96
commit 0269c3f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,6 +29,17 @@ jobs:
                         php: 8.0
                         symfony: ^5.4
                         twig: ^3.0
+                    -
+                        php: 8.1
+                        symfony: ^4.4
+                    -
+                        php: 8.1
+                        symfony: ^5.4
+                        twig: ^2.12
+                    -
+                        php: 8.1
+                        symfony: ^5.4
+                        twig: ^3.0
 
         steps:
             -

diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.2.1",
         "pagerfanta/pagerfanta": "^3.0",
         "pamil/phpspec-skip-example-extension": "^4.2",
-        "phpspec/phpspec": "^7.0",
+        "phpspec/phpspec": "^7.2",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/phpstan": "0.12.99",
         "phpstan/phpstan-phpunit": "0.12.22",

diff --git a/src/Bundle/EventListener/ORMRepositoryClassSubscriber.php b/src/Bundle/EventListener/ORMRepositoryClassSubscriber.php
@@ -13,6 +13,7 @@
 
 namespace Sylius\Bundle\ResourceBundle\EventListener;
 
+use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -40,7 +41,7 @@ private function setCustomRepositoryClass(ClassMetadata $metadata): void
         }
 
         if ($resourceMetadata->hasClass('repository')) {
-            /** @psalm-var class-string $repository */
+            /** @psalm-var class-string<EntityRepository>|null $repository */
             $repository = $resourceMetadata->getClass('repository');
             $metadata->setCustomRepositoryClass($repository);
         }

diff --git a/src/Component/composer.json b/src/Component/composer.json
@@ -38,7 +38,7 @@
     },
     "require-dev": {
         "behat/transliterator": "^1.3",
-        "phpspec/phpspec": "^7.0",
+        "phpspec/phpspec": "^7.2",
         "phpunit/phpunit": "^9.5"
     },
     "extra": {