RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-01 12:26:11 +03:00
Code Issues Projects Releases Wiki Activity

DDC-3078 - cache instantiator is used in the ORM instead of callables

Browse source
This commit is contained in:
Marco Pivetta 2014-04-10 04:18:18 +02:00 • committed by fabios
parent 4b388b2ce8
commit df6a411365
3 changed files with 9 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/Doctrine/ORM/Cache/CacheConfiguration.php
View file

@ -53,7 +53,7 @@ class CacheConfiguration
private $queryValidator;
/**
* @var callable|null
* @var CacheInstantiator|null
*/
private $cacheInstantiator;
@ -132,31 +132,18 @@ class CacheConfiguration
}
/**
* @param callable $instantiator responsible of retrieving an {@see \Doctrine\ORM\Cache} instance given
* a {@see \Doctrine\ORM\EntityManagerInterface} instance
*
* @throws ORMException if the given instantiator is not a valid callable
* @param CacheInstantiator
*/
public function setCacheInstantiator($instantiator)
public function setCacheInstantiator(CacheInstantiator $cacheInstantiator)
{
if ( ! is_callable($instantiator)) {
throw ORMException::invalidSecondLevelCacheInstantiator($instantiator);
}
$this->cacheInstantiator = $instantiator;
$this->cacheInstantiator = $cacheInstantiator;
}
/**
* @return callable that
* @return CacheInstantiator
*/
public function getCacheInstantiator()
{
if ( ! $this->cacheInstantiator) {
$this->cacheInstantiator = function (EntityManagerInterface $entityManager) {
return new DefaultCache($entityManager);
};
}
return $this->cacheInstantiator;
return $this->cacheInstantiator ?: $this->cacheInstantiator = new DefaultCacheInstantiator();
}
}

3
lib/Doctrine/ORM/EntityManager.php
View file

@ -166,8 +166,7 @@ use Doctrine\Common\Util\ClassUtils;
);
if ($config->isSecondLevelCacheEnabled()) {
$cacheInstantiator = $config->getSecondLevelCacheConfiguration()->getCacheInstantiator();
$this->cache = $cacheInstantiator($this);
$this->cache = $config->getSecondLevelCacheConfiguration()->getCacheInstantiator()->getCache($this);
}
}

19
tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php
View file

@ -32,18 +32,7 @@ class CacheConfigTest extends DoctrineTestCase
*/
public function testGetDefaultCacheIstantiator()
{
$entityManager = $this->getMock('Doctrine\ORM\EntityManagerInterface');
$config = $this->getMock('Doctrine\ORM\Configuration');
$entityManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($config));
$config
->expects($this->any())
->method('getSecondLevelCacheConfiguration')
->will($this->returnValue($this->config));
$defaultIstantiator = $this->config->getCacheInstantiator();
$this->assertInstanceOf('Doctrine\ORM\Cache\DefaultCache', $defaultIstantiator($entityManager));
$this->assertInstanceOf('Doctrine\ORM\Cache\DefaultInstantiator', $this->config->getCacheInstantiator());
}
/**
@ -51,14 +40,10 @@ class CacheConfigTest extends DoctrineTestCase
*/
public function testSetGetCacheIstantiator()
{
$istantiator = function () {};
$istantiator = $this->getMock('Doctrine\ORM\Cache\CacheInstantiator');
$this->config->setCacheInstantiator($istantiator);
$this->assertSame($istantiator, $this->config->getCacheInstantiator());
$this->setExpectedException('Doctrine\ORM\ORMException');
$this->config->setCacheInstantiator(null);
}
public function testSetGetRegionLifetime()