Merge branch 'master' of https://github.com/l3pp4rd/DoctrineExtensions

bin/vendors.php

@@ -34,16 +34,16 @@ $deps22x = array(
     array('Symfony/Component/Yaml', 'http://github.com/symfony/Yaml.git', 'v2.0.7'),
 );
 $deps23x = array(
-    array('doctrine-orm', 'http://github.com/doctrine/doctrine2.git', '35fc3c0671'),
-    array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', 'ef6c86fef3'),
-    array('doctrine-common', 'http://github.com/doctrine/common.git', '38c854c37d'),
-    array('doctrine-mongodb', 'http://github.com/doctrine/mongodb.git', '01babdde34'),
-    array('doctrine-mongodb-odm', 'http://github.com/doctrine/mongodb-odm.git', 'fb2447c01c'),
-
-    array('Symfony/Component/ClassLoader', 'http://github.com/symfony/ClassLoader.git', 'v2.0.9'),
-    array('Symfony/Component/Console', 'http://github.com/symfony/Console.git', 'v2.0.9'),
-    array('Symfony/Component/Finder', 'http://github.com/symfony/Finder.git', 'v2.0.9'),
-    array('Symfony/Component/Yaml', 'http://github.com/symfony/Yaml.git', 'v2.0.9'),
+    array('doctrine-orm', 'http://github.com/doctrine/doctrine2.git', '6cd82d77f5'),
+    array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', 'c8835edf74'),
+    array('doctrine-common', 'http://github.com/doctrine/common.git', 'fc26d10d97'),
+    array('doctrine-mongodb', 'http://github.com/doctrine/mongodb.git', 'd7fdcff25b'),
+    array('doctrine-mongodb-odm', 'http://github.com/doctrine/mongodb-odm.git', 'e8c0bfb975'),
+
+    array('Symfony/Component/ClassLoader', 'http://github.com/symfony/ClassLoader.git', 'v2.0.10'),
+    array('Symfony/Component/Console', 'http://github.com/symfony/Console.git', 'v2.0.10'),
+    array('Symfony/Component/Finder', 'http://github.com/symfony/Finder.git', 'v2.0.10'),
+    array('Symfony/Component/Yaml', 'http://github.com/symfony/Yaml.git', 'v2.0.10'),
 );
 
 foreach ($deps23x as $dep) {

tests/Gedmo/Tool/BaseTestCaseMongoODM.php

@@ -158,9 +158,17 @@ abstract class BaseTestCaseMongoODM extends \PHPUnit_Framework_TestCase
             ->method('getClassMetadataFactoryName')
             ->will($this->returnValue('Doctrine\\ODM\\MongoDB\\Mapping\\ClassMetadataFactory'));
 
-        $config->expects($this->any())
+        $config
+            ->expects($this->any())
             ->method('getMongoCmd')
-            ->will($this->returnValue('$'));
+            ->will($this->returnValue('$'))
+        ;
+
+        $config
+            ->expects($this->any())
+            ->method('getDefaultCommitOptions')
+            ->will($this->returnValue(array('safe' => true)))
+        ;
 
         $mappingDriver = $this->getMetadataDriverImplementation();
 

tests/Gedmo/Tool/BaseTestCaseOM.php

@@ -249,9 +249,17 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
             ->method('getClassMetadataFactoryName')
             ->will($this->returnValue('Doctrine\\ODM\\MongoDB\\Mapping\\ClassMetadataFactory'));
 
-        $config->expects($this->any())
+        $config
+            ->expects($this->any())
             ->method('getMongoCmd')
-            ->will($this->returnValue('$'));
+            ->will($this->returnValue('$'))
+        ;
+
+        $config
+            ->expects($this->any())
+            ->method('getDefaultCommitOptions')
+            ->will($this->returnValue(array('safe' => true)))
+        ;
 
         if (is_null($mappingDriver)) {
             $mappingDriver = $this->getDefaultMongoODMMetadataDriverImplementation();

tests/Gedmo/Translatable/TranslatableIdentifierTest.php

@@ -33,10 +33,21 @@ class TranslatableIdentifierTest extends BaseTestCaseORM
         $this->translatableListener->setDefaultLocale('en_us');
         $evm->addEventSubscriber($this->translatableListener);
 
+        $conn = array(
+                    'driver' => 'pdo_mysql',
+                    'host' => '127.0.0.1',
+                    'dbname' => 'test',
+                    'user' => 'root',
+                    'password' => 'nimda'
+        );
+        //$this->getMockCustomEntityManager($conn, $evm);
         $this->getMockSqliteEntityManager($evm);
     }
 
-    public function testStringIdentifier()
+    /**
+     * @test
+     */
+    function shouldHandleStringIdentifier()
     {
         $object = new StringIdentifier();
         $object->setTitle('title in en');
@@ -80,21 +91,19 @@ class TranslatableIdentifierTest extends BaseTestCaseORM
         $this->assertEquals('title in de', $translations['de_de']['title']);
 
         // dql test object hydration
-        $q = $this->em->createQuery('SELECT si FROM ' . self::FIXTURE . ' si WHERE si.uid = :id');
-        $data = $q->execute(
-            array('id' => $this->testObjectId),
-            \Doctrine\ORM\Query::HYDRATE_OBJECT
-        );
+        $q = $this->em
+            ->createQuery('SELECT si FROM ' . self::FIXTURE . ' si WHERE si.uid = :id')
+            ->setParameter('id', $this->testObjectId)
+            ->useResultCache(false)
+        ;
+        $data = $q->getResult();
         $this->assertEquals(count($data), 1);
         $object = $data[0];
         $this->assertEquals('title in en', $object->getTitle());
 
+        $this->em->clear(); // based on 2.3.0 it caches in identity map
         $this->translatableListener->setTranslatableLocale('de_de');
-        $q = $this->em->createQuery('SELECT si FROM ' . self::FIXTURE . ' si WHERE si.uid = :id');
-        $data = $q->execute(
-            array('id' => $this->testObjectId),
-            \Doctrine\ORM\Query::HYDRATE_OBJECT
-        );
+        $data = $q->getResult();
         $this->assertEquals(count($data), 1);
         $object = $data[0];
         $this->assertEquals('title in de', $object->getTitle());