Merge pull request #9008 from greg0ire/2.10.x

Merge 2.9.x up into 2.10.x

tests/Doctrine/Tests/ORM/Query/QueryTest.php

@@ -6,6 +6,7 @@
 
 use DateTime;
 use DateTimeImmutable;
+use Doctrine\Common\Cache\Cache;
 use Doctrine\Common\Cache\Psr6\CacheAdapter;
 use Doctrine\Common\Cache\Psr6\DoctrineProvider;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -550,4 +551,25 @@ public function testGetParameterColonNormalize(): void
         self::assertSame('Benjamin', $query->getParameter(':name')->getValue());
         self::assertSame('Benjamin', $query->getParameter('name')->getValue());
     }
+
+    public function testGetQueryCacheDriverWithDefaults(): void
+    {
+        $cache = $this->createMock(Cache::class);
+
+        $this->entityManager->getConfiguration()->setQueryCacheImpl($cache);
+        $query = $this->entityManager->createQuery('select u from ' . CmsUser::class . ' u');
+
+        self::assertSame($cache, $query->getQueryCacheDriver());
+    }
+
+    public function testGetQueryCacheDriverWithCacheExplicitlySet(): void
+    {
+        $cache = $this->createMock(Cache::class);
+
+        $query = $this->entityManager
+            ->createQuery('select u from ' . CmsUser::class . ' u')
+            ->setQueryCacheDriver($cache);
+
+        self::assertSame($cache, $query->getQueryCacheDriver());
+    }
 }