RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/common-2.6-upgrade-compat-2.5' into 2.5

Browse Source
This commit is contained in:
Marco Pivetta 2015-12-25 15:26:15 +01:00
commit 8b8a1cbe81
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php
View File

@ -105,16 +105,16 @@ class QueryCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
$query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux'); $query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux');
$cache = new \Doctrine\Common\Cache\ArrayCache(); $cache = $this->getMock('Doctrine\Common\Cache\Cache');
$query->setQueryCacheDriver($cache); $query->setQueryCacheDriver($cache);
$users = $query->getResult(); $cache
->expects(self::once())
->method('save')
->with(self::isType('string'), self::isInstanceOf('Doctrine\ORM\Query\ParserResult'));
$data = $this->cacheDataReflection->getValue($cache); $query->getResult();
$this->assertEquals(1, count($data));
$this->assertInstanceOf('Doctrine\ORM\Query\ParserResult', array_pop($data));
} }
public function testQueryCache_HitDoesNotSaveParserResult() public function testQueryCache_HitDoesNotSaveParserResult()

2
tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php
View File

@ -49,7 +49,7 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
{ {
$this->setExpectedException( $this->setExpectedException(
'Doctrine\Common\Persistence\Mapping\MappingException', 'Doctrine\Common\Persistence\Mapping\MappingException',
"No mapping file found named '".$this->dir."/Foo".$this->getFileExtension()."' for class 'MyNamespace\MySubnamespace\Entity\Foo'." "No mapping file found named"
); );
$driver = $this->getDriver(array( $driver = $this->getDriver(array(