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

tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php

@@ -105,16 +105,16 @@ class QueryCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $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);
 
-        $users = $query->getResult();
+        $cache
+            ->expects(self::once())
+            ->method('save')
+            ->with(self::isType('string'), self::isInstanceOf('Doctrine\ORM\Query\ParserResult'));
 
-        $data = $this->cacheDataReflection->getValue($cache);
-        $this->assertEquals(1, count($data));
-
-        $this->assertInstanceOf('Doctrine\ORM\Query\ParserResult', array_pop($data));
+        $query->getResult();
     }
 
     public function testQueryCache_HitDoesNotSaveParserResult()

tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php

@@ -49,7 +49,7 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
     {
         $this->setExpectedException(
             '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(