Merge 2.x into 3.x

sonata-project · Jul 7, 2022 · cba8954 · cba8954
2 parents 08cb803 + 2907a56
commit cba8954
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -80,7 +80,9 @@ jobs:
 
             - name: Globally install symfony/flex
               if: matrix.symfony-require != ''
-              run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
+              run: |
+                  composer global config --no-plugins allow-plugins.symfony/flex true
+                  composer global require --no-progress --no-scripts --no-plugins symfony/flex
 
             - name: Install variant
               if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')

diff --git a/tests/Source/DoctrineORMQuerySourceIteratorTest.php b/tests/Source/DoctrineORMQuerySourceIteratorTest.php
@@ -98,6 +98,6 @@ private function createConfiguration(): Configuration
 
     private function createMetadataDriverImplementation(): MappingDriver
     {
-        return new AnnotationDriver(new AnnotationReader()); // @phpstan-ignore-line
+        return new AnnotationDriver(new AnnotationReader());
     }
 }