Fixed strange test case with CmsUser and second-level cache

goetas · Jan 17, 2015 · e5ee538 · e5ee538
1 parent c131e32
commit e5ee538
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php b/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php
@@ -184,13 +184,13 @@ public function buildCollectionHydrator(EntityManagerInterface $em, array $mappi
         if ($mapping['cache']) {
             $targetPersister = $em->getUnitOfWork()->getEntityPersister($mapping['targetEntity']);
 
-            if ($targetPersister instanceof CachedPersister) {
-
-                $targetRegion = $targetPersister->getCacheRegion();
+            if (! ($targetPersister instanceof CachedPersister)) {
+                throw CacheException::nonCacheableEntity($mapping['targetEntity']);
+            }
+            $targetRegion = $targetPersister->getCacheRegion();
 
-                if ($targetRegion instanceof MultiGetRegion) {
-                    return new MultiGetCollectionHydrator($em, $targetRegion);
-                }
+            if ($targetRegion instanceof MultiGetRegion) {
+                return new MultiGetCollectionHydrator($em, $targetRegion);
             }
         }
 

diff --git a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
@@ -39,6 +39,10 @@ public function setUp()
         $class->associationMappings['phonenumbers']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY;
         $class->associationMappings['phonenumbers']['indexBy'] = 'phonenumber';
 
+        unset($class->associationMappings['phonenumbers']['cache']);
+        unset($class->associationMappings['articles']['cache']);
+        unset($class->associationMappings['users']['cache']);
+
         $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup');
         $class->associationMappings['users']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY;
         $class->associationMappings['users']['indexBy'] = 'username';