adapts tests to pass with php 7

Author: l3pp4rd

tests/Gedmo/Mapping/Driver/Yaml/Mapping.Fixture.Yaml.Category.dcm.yml

@@ -31,11 +31,11 @@ Mapping\Fixture\Yaml\Category:
           fields:
             - title
           handlers:
-            "Gedmo\Sluggable\Handler\RelativeSlugHandler":
+            Gedmo\Sluggable\Handler\RelativeSlugHandler:
               relationField: parent
               relationSlugField: slug
               separator: /
-            "Gedmo\Sluggable\Handler\TreeSlugHandler":
+            Gedmo\Sluggable\Handler\TreeSlugHandler:
               parentRelationField: parent
               separator: /
     changed:

tests/Gedmo/Tool/BaseTestCaseMongoODM.php

@@ -132,75 +132,16 @@ private function getEventManager()
      */
     protected function getMockAnnotatedConfig()
     {
-        $config = $this->getMock('Doctrine\\ODM\\MongoDB\\Configuration');
-
-        $config->expects($this->any())
-            ->method('getFilterClassName')
-            ->will($this->returnValue('Gedmo\\SoftDeleteable\\Filter\\ODM\\SoftDeleteableFilter'));
-
-        $config->expects($this->any())
-            ->method('getFilterParameters')
-            ->will($this->returnValue(array()));
-
-        $config->expects($this->once())
-            ->method('getProxyDir')
-            ->will($this->returnValue(__DIR__.'/../../temp'));
-
-        $config->expects($this->once())
-            ->method('getProxyNamespace')
-            ->will($this->returnValue('Proxy'));
-
-        $config->expects($this->once())
-            ->method('getHydratorDir')
-            ->will($this->returnValue(__DIR__.'/../../temp'));
-
-        $config->expects($this->once())
-            ->method('getHydratorNamespace')
-            ->will($this->returnValue('Hydrator'));
-
-        $config->expects($this->any())
-            ->method('getDefaultDB')
-            ->will($this->returnValue('gedmo_extensions_test'));
-
-        $config->expects($this->once())
-            ->method('getAutoGenerateProxyClasses')
-            ->will($this->returnValue(true));
-
-        $config->expects($this->once())
-            ->method('getAutoGenerateHydratorClasses')
-            ->will($this->returnValue(true));
-
-        $config->expects($this->once())
-            ->method('getClassMetadataFactoryName')
-            ->will($this->returnValue('Doctrine\\ODM\\MongoDB\\Mapping\\ClassMetadataFactory'));
-
-        $config
-            ->expects($this->any())
-            ->method('getMongoCmd')
-            ->will($this->returnValue('$'))
-        ;
-
-        $config
-            ->expects($this->any())
-            ->method('getDefaultCommitOptions')
-            ->will($this->returnValue(array('safe' => true)))
-        ;
-
-        $mappingDriver = $this->getMetadataDriverImplementation();
-
-        $config->expects($this->any())
-            ->method('getMetadataDriverImpl')
-            ->will($this->returnValue($mappingDriver));
-
-        $config->expects($this->any())
-            ->method('getRepositoryFactory')
-            ->will($this->returnValue(new DefaultRepositoryFactory()));
-
-        $config->expects($this->any())
-            ->method('getDefaultRepositoryClassName')
-            ->will($this->returnValue('Doctrine\\ODM\\MongoDB\\DocumentRepository'));
-
-
+        $config = new \Doctrine\ODM\MongoDB\Configuration();
+        $config->addFilter("softdeleteable", 'Gedmo\\SoftDeleteable\\Filter\\ODM\\SoftDeleteableFilter');
+        $config->setProxyDir(__DIR__."/../../temp");
+        $config->setHydratorDir(__DIR__."/../../temp");
+        $config->setProxyNamespace("Proxy");
+        $config->setHydratorNamespace("Hydrator");
+        $config->setDefaultDB("gedmo_extensions_test");
+        $config->setAutoGenerateProxyClasses(true);
+        $config->setAutoGenerateHydratorClasses(true);
+        $config->setMetadataDriverImpl($this->getMetadataDriverImplementation());
         return $config;
     }
 }

tests/Gedmo/Tool/BaseTestCaseOM.php

@@ -226,67 +226,19 @@ private function getEventManager()
      */
     private function getMockAnnotatedODMMongoDBConfig($dbName, MappingDriver $mappingDriver = null)
     {
-        $config = $this->getMock('Doctrine\\ODM\\MongoDB\\Configuration');
-        $config->expects($this->once())
-            ->method('getProxyDir')
-            ->will($this->returnValue(__DIR__.'/../../temp'));
-
-        $config->expects($this->once())
-            ->method('getProxyNamespace')
-            ->will($this->returnValue('Proxy'));
-
-        $config->expects($this->once())
-            ->method('getHydratorDir')
-            ->will($this->returnValue(__DIR__.'/../../temp'));
-
-        $config->expects($this->once())
-            ->method('getHydratorNamespace')
-            ->will($this->returnValue('Hydrator'));
-
-        $config->expects($this->any())
-            ->method('getDefaultDB')
-            ->will($this->returnValue($dbName));
-
-        $config->expects($this->once())
-            ->method('getAutoGenerateProxyClasses')
-            ->will($this->returnValue(true));
-
-        $config->expects($this->once())
-            ->method('getAutoGenerateHydratorClasses')
-            ->will($this->returnValue(true));
-
-        $config->expects($this->once())
-            ->method('getClassMetadataFactoryName')
-            ->will($this->returnValue('Doctrine\\ODM\\MongoDB\\Mapping\\ClassMetadataFactory'));
-
-        $config
-            ->expects($this->any())
-            ->method('getMongoCmd')
-            ->will($this->returnValue('$'))
-        ;
-
-        $config
-            ->expects($this->any())
-            ->method('getDefaultCommitOptions')
-            ->will($this->returnValue(array('safe' => true)))
-        ;
-
         if (null === $mappingDriver) {
             $mappingDriver = $this->getDefaultMongoODMMetadataDriverImplementation();
         }
-
-        $config->expects($this->any())
-            ->method('getMetadataDriverImpl')
-            ->will($this->returnValue($mappingDriver));
-
-        $config->expects($this->any())
-            ->method('getRepositoryFactory')
-            ->will($this->returnValue(new DefaultRepositoryFactoryODM()));
-
-        $config->expects($this->any())
-            ->method('getDefaultRepositoryClassName')
-            ->will($this->returnValue('Doctrine\\ODM\\MongoDB\\DocumentRepository'));
-
+        $config = new \Doctrine\ODM\MongoDB\Configuration();
+        $config->addFilter("softdeleteable", 'Gedmo\\SoftDeleteable\\Filter\\ODM\\SoftDeleteableFilter');
+        $config->setProxyDir(__DIR__."/../../temp");
+        $config->setHydratorDir(__DIR__."/../../temp");
+        $config->setProxyNamespace("Proxy");
+        $config->setHydratorNamespace("Hydrator");
+        $config->setDefaultDB("gedmo_extensions_test");
+        $config->setAutoGenerateProxyClasses(true);
+        $config->setAutoGenerateHydratorClasses(true);
+        $config->setMetadataDriverImpl($mappingDriver);
         return $config;
     }
 

tests/Gedmo/Tree/MultiInheritanceWithSingleTableTest.php

@@ -36,6 +36,8 @@ protected function setUp()
     public function testConsistence()
     {
         $this->populate();
+        $this->em->clear();
+
         $carRepo = $this->em->getRepository(self::CAR);
         $audi = $carRepo->findOneByTitle('Audi-80');
         $this->assertEquals(2, $carRepo->childCount($audi));