Merge pull request #1476 from greg0ire/2.6.x

Merge 2.5.x up into 2.6.x
doctrine · Feb 12, 2022 · 543ec0f · 543ec0f
2 parents 2f308bb + 236b2ca
commit 543ec0f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -13,3 +13,5 @@ jobs:
   coding-standards:
     name: "Coding Standards"
     uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      composer-options: "--prefer-dist --prefer-stable"
diff --git a/Mapping/ClassMetadataFactory.php b/Mapping/ClassMetadataFactory.php
@@ -5,7 +5,6 @@
 use Doctrine\ORM\Id\AbstractIdGenerator;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataFactory as BaseClassMetadataFactory;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 use function assert;
 
@@ -18,10 +17,6 @@ protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonS
     {
         parent::doLoadMetadata($class, $parent, $rootEntityFound, $nonSuperclassParents);
 
-        if (! $class instanceof ClassMetadataInfo) {
-            return;
-        }
-
         $customGeneratorDefinition = $class->customGeneratorDefinition;
 
         if (! isset($customGeneratorDefinition['instance'])) {

diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -779,12 +779,11 @@ public function testAnnotationsBundleMappingDetection(): void
         ]);
     }
 
+    /**
+     * @requires PHP 8
+     */
     public function testAttributesBundleMappingDetection(): void
     {
-        if (PHP_VERSION_ID < 70400) {
-            self::markTestSkipped('This test requires PHP 7.4.');
-        }
-
         $container = $this->getContainer(['AttributesBundle']);
         $extension = new DoctrineExtension();
 

diff --git a/Tests/Repository/ContainerRepositoryFactoryTest.php b/Tests/Repository/ContainerRepositoryFactoryTest.php
@@ -210,7 +210,7 @@ public function findOneBy(array $criteria)
 
     public function getClassName(): string
     {
-        return '';
+        return stdClass::class;
     }
 }
 

diff --git a/composer.json b/composer.json
@@ -66,7 +66,7 @@
         }
     },
     "conflict": {
-        "doctrine/orm": "<2.10",
+        "doctrine/orm": "<2.10|>=3.0",
         "twig/twig": "<1.34|>=2.0,<2.4"
     },
     "suggest": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -210,7 +210,7 @@ public function findOneBy(array $criteria) @@
         public function getClassName(): string
         {
-            return '';
+            return stdClass::class;
         }
     }
@@ Expand Down @@