[mapping] begin to update mapping tests and drivers based on new changes

bin/vendors.php

@@ -45,7 +45,18 @@ $deps23x = array(
     array('Symfony/Component/Finder', 'git://github.com/symfony/Finder.git', 'v2.0.12'),
     array('Symfony/Component/Yaml', 'git://github.com/symfony/Yaml.git', 'v2.0.12'),
 );
+$deps23x = array(
+    array('doctrine-orm', 'git://github.com/doctrine/doctrine2.git', 'cc4613533b'),
+    array('doctrine-dbal', 'git://github.com/doctrine/dbal.git', '7beb634d69'),
+    array('doctrine-common', 'git://github.com/doctrine/common.git', 'd2f8a36b86'),
+    array('doctrine-mongodb', 'git://github.com/doctrine/mongodb.git', 'bf542f0ef6'),
+    array('doctrine-mongodb-odm', 'git://github.com/doctrine/mongodb-odm.git', 'f4280d7a28'),
 
+    array('Symfony/Component/ClassLoader', 'git://github.com/symfony/ClassLoader.git', 'v2.0.12'),
+    array('Symfony/Component/Console', 'git://github.com/symfony/Console.git', 'v2.0.12'),
+    array('Symfony/Component/Finder', 'git://github.com/symfony/Finder.git', 'v2.0.12'),
+    array('Symfony/Component/Yaml', 'git://github.com/symfony/Yaml.git', 'v2.0.12'),
+);
 foreach ($deps23x as $dep) {
     list($name, $url, $rev) = $dep;
 

lib/Gedmo/Loggable/Mapping/Driver/Yaml.php

@@ -104,6 +104,6 @@ class Yaml extends File implements Driver
      */
     protected function _loadMappingFile($file)
     {
-        return \Symfony\Component\Yaml\Yaml::load($file);
+        return \Symfony\Component\Yaml\Yaml::parse($file);
     }
 }

lib/Gedmo/Sluggable/Mapping/Driver/Yaml.php

@@ -94,7 +94,7 @@ class Yaml extends File implements Driver
      */
     protected function _loadMappingFile($file)
     {
-        return \Symfony\Component\Yaml\Yaml::load($file);
+        return \Symfony\Component\Yaml\Yaml::parse($file);
     }
 
     /**

lib/Gedmo/SoftDeleteable/Mapping/Driver/Yaml.php

@@ -58,6 +58,6 @@ class Yaml extends File implements Driver
      */
     protected function _loadMappingFile($file)
     {
-        return \Symfony\Component\Yaml\Yaml::load($file);
+        return \Symfony\Component\Yaml\Yaml::parse($file);
     }
 }

lib/Gedmo/Timestampable/Mapping/Driver/Yaml.php

@@ -79,7 +79,7 @@ class Yaml extends File implements Driver
      */
     protected function _loadMappingFile($file)
     {
-        return \Symfony\Component\Yaml\Yaml::load($file);
+        return \Symfony\Component\Yaml\Yaml::parse($file);
     }
 
     /**

lib/Gedmo/Translatable/Mapping/Driver/Yaml.php

@@ -74,6 +74,6 @@ class Yaml extends File implements Driver
      */
     protected function _loadMappingFile($file)
     {
-        return \Symfony\Component\Yaml\Yaml::load($file);
+        return \Symfony\Component\Yaml\Yaml::parse($file);
     }
 }

lib/Gedmo/Tree/Mapping/Driver/Yaml.php

@@ -45,7 +45,7 @@ class Yaml extends File implements Driver
     {
         $mapping = $this->_getMapping($meta->name);
         $validator = new Validator();
-        
+
         if (isset($mapping['gedmo'])) {
             $classMapping = $mapping['gedmo'];
             if (isset($classMapping['tree']['type'])) {
@@ -163,6 +163,6 @@ class Yaml extends File implements Driver
      */
     protected function _loadMappingFile($file)
     {
-        return \Symfony\Component\Yaml\Yaml::load($file);
+        return \Symfony\Component\Yaml\Yaml::parse($file);
     }
 }

lib/Gedmo/Uploadable/Mapping/Driver/Yaml.php

@@ -89,6 +89,6 @@ class Yaml extends File implements Driver
      */
     protected function _loadMappingFile($file)
     {
-        return \Symfony\Component\Yaml\Yaml::load($file);
+        return \Symfony\Component\Yaml\Yaml::parse($file);
     }
 }

tests/Gedmo/Mapping/MetadataFactory/CustomDriverTest.php

@@ -1,8 +1,8 @@
 <?php
 
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\ORM\Mapping\Driver\Driver;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Mapping\Fixture\Unmapped\Timestampable;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 
 /**
 * These are mapping tests for tree extension
@@ -64,14 +64,14 @@ class CustomDriverTest extends \PHPUnit_Framework_TestCase
     }
 }
 
-class CustomDriver implements Driver
+class CustomDriver implements MappingDriver
 {
     public function getAllClassNames()
     {
         return array('Mapping\Fixture\Unmapped\Timestampable');
     }
 
-    public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
+    public function loadMetadataForClass($className, ClassMetadata $metadata)
     {
         if ($className === 'Mapping\Fixture\Unmapped\Timestampable') {
             $id = array();
@@ -101,4 +101,4 @@ class CustomDriver implements Driver
     {
         return !in_array($className, $this->getAllClassNames());
     }
-}
+}

tests/Gedmo/Tool/BaseTestCaseOM.php

@@ -5,7 +5,10 @@ namespace Tool;
 // common
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\EventManager;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 // orm specific
+use Doctrine\ORM\Mapping\DefaultQuoteStrategy;
+use Doctrine\ORM\Mapping\DefaultNamingStrategy;
 use Doctrine\ORM\Mapping\Driver\Driver as MappingDriverORM;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver as AnnotationDriverORM;
 use Doctrine\ORM\EntityManager;
@@ -81,7 +84,7 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
      * @param Doctrine\ODM\MongoDB\Mapping\Driver\Driver $mappingDriver
      * @return DocumentManager
      */
-    protected function getMockDocumentManager($dbName, MappingDriverODM $mappingDriver = null)
+    protected function getMockDocumentManager($dbName, MappingDriver $mappingDriver = null)
     {
         if (!class_exists('Mongo')) {
             $this->markTestSkipped('Missing Mongo extension.');
@@ -107,7 +110,7 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
      * @param Doctrine\ODM\MongoDB\Mapping\Driver\Driver $mappingDriver
      * @return DocumentManager
      */
-    protected function getMockMappedDocumentManager($dbName, MappingDriverODM $mappingDriver = null)
+    protected function getMockMappedDocumentManager($dbName, MappingDriver $mappingDriver = null)
     {
         $conn = $this->getMock('Doctrine\\MongoDB\\Connection');
         $config = $this->getMockAnnotatedODMMongoDBConfig($dbName, $mappingDriver);
@@ -125,7 +128,7 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
      * @param Doctrine\ORM\Mapping\Driver\Driver $mappingDriver
      * @return EntityManager
      */
-    protected function getMockSqliteEntityManager(array $fixtures, MappingDriverORM $mappingDriver = null)
+    protected function getMockSqliteEntityManager(array $fixtures, MappingDriver $mappingDriver = null)
     {
         $conn = array(
             'driver' => 'pdo_sqlite',
@@ -152,7 +155,7 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
      * @param Doctrine\ORM\Mapping\Driver\Driver $mappingDriver
      * @return EntityManager
      */
-    protected function getMockMappedEntityManager(MappingDriverORM $mappingDriver = null)
+    protected function getMockMappedEntityManager(MappingDriver $mappingDriver = null)
     {
         $driver = $this->getMock('Doctrine\DBAL\Driver');
         $driver->expects($this->once())
@@ -215,7 +218,7 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
      * @param Doctrine\ODM\MongoDB\Mapping\Driver\Driver $mappingDriver
      * @return Doctrine\ORM\Configuration
      */
-    private function getMockAnnotatedODMMongoDBConfig($dbName, MappingDriverODM $mappingDriver = null)
+    private function getMockAnnotatedODMMongoDBConfig($dbName, MappingDriver $mappingDriver = null)
     {
         $config = $this->getMock('Doctrine\\ODM\\MongoDB\\Configuration');
         $config->expects($this->once())
@@ -279,7 +282,7 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
      * @param Doctrine\ORM\Mapping\Driver\Driver $mappingDriver
      * @return Doctrine\ORM\Configuration
      */
-    private function getMockAnnotatedORMConfig(MappingDriverORM $mappingDriver = null)
+    private function getMockAnnotatedORMConfig(MappingDriver $mappingDriver = null)
     {
         $config = $this->getMock('Doctrine\ORM\Configuration');
         $config->expects($this->once())
@@ -298,6 +301,17 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
             ->method('getClassMetadataFactoryName')
             ->will($this->returnValue('Doctrine\\ORM\\Mapping\\ClassMetadataFactory'));
 
+        $config
+            ->expects($this->any())
+            ->method('getQuoteStrategy')
+            ->will($this->returnValue(new DefaultQuoteStrategy()))
+        ;
+
+        $config
+            ->expects($this->any())
+            ->method('getNamingStrategy')
+            ->will($this->returnValue(new DefaultNamingStrategy()))
+        ;
         if (null === $mappingDriver) {
             $mappingDriver = $this->getDefaultORMMetadataDriverImplementation();
         }
@@ -308,4 +322,4 @@ abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
 
         return $config;
     }
-}
+}

tests/Gedmo/Tool/BaseTestCaseORM.php

@@ -15,6 +15,8 @@ use Gedmo\Tree\TreeListener;
 use Gedmo\Timestampable\TimestampableListener;
 use Gedmo\Loggable\LoggableListener;
 use Gedmo\SoftDeleteable\SoftDeleteableListener;
+use Doctrine\ORM\Mapping\DefaultQuoteStrategy;
+use Doctrine\ORM\Mapping\DefaultNamingStrategy;
 
 /**
  * Base test case contains common mock objects
@@ -224,7 +226,7 @@ abstract class BaseTestCaseORM extends \PHPUnit_Framework_TestCase
                 $mockMethods[] = $method->name;
             }
         }
-        
+
         $config = $this->getMock($configurationClass, $mockMethods);
 
         $config
@@ -265,6 +267,18 @@ abstract class BaseTestCaseORM extends \PHPUnit_Framework_TestCase
             ->will($this->returnValue('Doctrine\\ORM\\EntityRepository'))
         ;
 
+        $config
+            ->expects($this->any())
+            ->method('getQuoteStrategy')
+            ->will($this->returnValue(new DefaultQuoteStrategy()))
+        ;
+
+        $config
+            ->expects($this->any())
+            ->method('getNamingStrategy')
+            ->will($this->returnValue(new DefaultNamingStrategy()))
+        ;
+
         return $config;
     }
-}
+}