Merge pull request #2143 from mcn-fredw/QueryCheckerDetectCompositeKeyFix

QueryChecker fix

Author: soyuka

src/Bridge/Doctrine/Orm/Util/QueryChecker.php

@@ -64,7 +64,7 @@ private static function hasRootEntityWithIdentifier(QueryBuilder $queryBuilder,
                 ->getManagerForClass($rootEntity)
                 ->getClassMetadata($rootEntity);
 
-            if ($rootMetadata instanceof ClassMetadata && ($isForeign ? $rootMetadata->isIdentifierComposite : $rootMetadata->containsForeignIdentifier)) {
+            if ($rootMetadata instanceof ClassMetadata && ($isForeign ? $rootMetadata->containsForeignIdentifier : $rootMetadata->isIdentifierComposite)) {
                 return true;
             }
         }

tests/Bridge/Doctrine/Orm/Util/QueryCheckerTest.php

@@ -59,7 +59,8 @@ public function testHasRootEntityWithCompositeIdentifier()
         $queryBuilder->getRootEntities()->willReturn(['Dummy']);
         $queryBuilder->getRootAliases()->willReturn(['d']);
         $classMetadata = new ClassMetadata('Dummy');
-        $classMetadata->containsForeignIdentifier = true;
+        $classMetadata->isIdentifierComposite = true;
+        $classMetadata->containsForeignIdentifier = false;
         $objectManager = $this->prophesize(ObjectManager::class);
         $objectManager->getClassMetadata('Dummy')->willReturn($classMetadata);
         $managerRegistry = $this->prophesize(ManagerRegistry::class);
@@ -73,7 +74,8 @@ public function testHasRootEntityWithNoCompositeIdentifier()
         $queryBuilder->getRootEntities()->willReturn(['Dummy']);
         $queryBuilder->getRootAliases()->willReturn(['d']);
         $classMetadata = new ClassMetadata('Dummy');
-        $classMetadata->containsForeignIdentifier = false;
+        $classMetadata->isIdentifierComposite = false;
+        $classMetadata->containsForeignIdentifier = true;
         $objectManager = $this->prophesize(ObjectManager::class);
         $objectManager->getClassMetadata('Dummy')->willReturn($classMetadata);
         $managerRegistry = $this->prophesize(ManagerRegistry::class);
@@ -88,6 +90,8 @@ public function testHasRootEntityWithForeignKeyIdentifier()
         $queryBuilder->getRootAliases()->willReturn(['d']);
         $classMetadata = new ClassMetadata('Dummy');
         $classMetadata->setIdentifier(['id', 'name']);
+        $classMetadata->isIdentifierComposite = false;
+        $classMetadata->containsForeignIdentifier = true;
         $objectManager = $this->prophesize(ObjectManager::class);
         $objectManager->getClassMetadata('Dummy')->willReturn($classMetadata);
         $managerRegistry = $this->prophesize(ManagerRegistry::class);
@@ -101,6 +105,8 @@ public function testHasRootEntityWithNoForeignKeyIdentifier()
         $queryBuilder->getRootEntities()->willReturn(['Dummy']);
         $queryBuilder->getRootAliases()->willReturn(['d']);
         $classMetadata = new ClassMetadata('Dummy');
+        $classMetadata->isIdentifierComposite = true;
+        $classMetadata->containsForeignIdentifier = false;
         $objectManager = $this->prophesize(ObjectManager::class);
         $objectManager->getClassMetadata('Dummy')->willReturn($classMetadata);
         $managerRegistry = $this->prophesize(ManagerRegistry::class);