Fixed PHPUnit warnings in PHP >= 5.6.

doctrine · Jul 8, 2016 · 68a7749 · 68a7749
1 parent 75da694
commit 68a7749
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 19 deletions.
diff --git a/src/DoctrineMongoODMModule/Module.php b/src/DoctrineMongoODMModule/Module.php
@@ -56,10 +56,10 @@ public function init(ModuleManagerInterface $manager)
     {
         $events = $manager->getEventManager();
         // Initialize logger collector once the profiler is initialized itself
-        $events->attach('profiler_init', function(EventInterface $e) use ($manager) {
+        $events->attach('profiler_init', function (EventInterface $e) use ($manager) {
             $manager->getEvent()->getParam('ServiceManager')->get('doctrine.mongo_logger_collector.odm_default');
         });
-        $events->getSharedManager()->  attach('doctrine', 'loadCli.post', [$this, 'loadCli']);
+        $events->getSharedManager()->attach('doctrine', 'loadCli.post', [$this, 'loadCli']);
     }
 
     /**

diff --git a/src/DoctrineMongoODMModule/Service/ConfigurationFactory.php b/src/DoctrineMongoODMModule/Service/ConfigurationFactory.php
@@ -33,7 +33,6 @@
  */
 class ConfigurationFactory extends AbstractFactory
 {
-
     /**
      * @param \Zend\ServiceManager\ServiceLocatorInterface $serviceLocator
      * @return \Doctrine\ODM\MongoDB\Configuration

diff --git a/tests/DoctrineMongoODMModuleTest/Assets/CustomType.php b/tests/DoctrineMongoODMModuleTest/Assets/CustomType.php
@@ -20,10 +20,6 @@
 
 use Doctrine\ODM\MongoDB\Types\IntType;
 
-/**
- * Class CustomType
- * @package DoctrineMongoODMModuleTest\Assets
- */
 class CustomType extends IntType
 {
 }
diff --git a/tests/DoctrineMongoODMModuleTest/Assets/ExtraAnnotation.php b/tests/DoctrineMongoODMModuleTest/Assets/ExtraAnnotation.php
@@ -21,7 +21,6 @@
 use Doctrine\Common\Annotations\Annotation;
 
 /**
- *
  * @Annotation
  * @Target({"PROPERTY"})
  */

diff --git a/tests/DoctrineMongoODMModuleTest/Doctrine/DoctrineObjectHydratorFactoryTest.php b/tests/DoctrineMongoODMModuleTest/Doctrine/DoctrineObjectHydratorFactoryTest.php
@@ -18,15 +18,14 @@
  */
 namespace DoctrineMongoODMModuleTest\Doctrine;
 
-use PHPUnit_Framework_TestCase as TestCase;
 use DoctrineMongoODMModule\Service\DoctrineObjectHydratorFactory;
 use Zend\Stdlib\Hydrator\HydratorPluginManager;
 
-class DoctrineObjectHydratorFactoryTest extends TestCase
+final class DoctrineObjectHydratorFactoryTest extends \PHPUnit_Framework_TestCase
 {
     public function testReturnsHydratorInstance()
     {
-        $serviceLocatorInterface = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
+        $serviceLocatorInterface = $this->getMockBuilder('Zend\ServiceManager\ServiceLocatorInterface')->getMock();
 
         $serviceLocatorInterface
             ->expects(self::once())
@@ -38,8 +37,8 @@ public function testReturnsHydratorInstance()
                      ->getMock()
             );
 
-        /** @var HydratorPluginManager $hydratorPluginManager */
-        $hydratorPluginManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
+        /** @var HydratorPluginManager|\PHPUnit_Framework_MockObject_MockObject $hydratorPluginManager */
+        $hydratorPluginManager = $this->getMockBuilder('Zend\Stdlib\Hydrator\HydratorPluginManager')->getMock();
 
         $hydratorPluginManager
             ->expects(self::once())

diff --git a/tests/DoctrineMongoODMModuleTest/Doctrine/ModuleTest.php b/tests/DoctrineMongoODMModuleTest/Doctrine/ModuleTest.php
@@ -19,19 +19,18 @@
 namespace DoctrineMongoODMModuleTest\Doctrine;
 
 use DoctrineMongoODMModule\Module;
-use PHPUnit_Framework_TestCase;
 use Symfony\Component\Console\Application;
 use Zend\EventManager\Event;
 
-class ModuleTest extends PHPUnit_Framework_TestCase
+final class ModuleTest extends \PHPUnit_Framework_TestCase
 {
     public function testOdmDefaultIsUsedAsTheDocumentManagerIfNoneIsProvided()
     {
-        $documentManager = $this->getMockbuilder('Doctrine\ODM\MongoDB\DocumentManager')
+        $documentManager = $this->getMockBuilder('Doctrine\ODM\MongoDB\DocumentManager')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $serviceManager = $this->getMock('Zend\ServiceManager\ServiceManager');
+        $serviceManager = $this->getMockBuilder('Zend\ServiceManager\ServiceManager')->getMock();
         $serviceManager->expects(self::once())
             ->method('get')
             ->with('doctrine.documentmanager.odm_default')
@@ -50,11 +49,11 @@ public function testDocumentManagerUsedCanBeSpecifiedInCommandLineArgument()
     {
         $argvBackup = $_SERVER['argv'];
 
-        $documentManager = $this->getMockbuilder('Doctrine\ODM\MongoDB\DocumentManager')
+        $documentManager = $this->getMockBuilder('Doctrine\ODM\MongoDB\DocumentManager')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $serviceManager = $this->getMock('Zend\ServiceManager\ServiceManager');
+        $serviceManager = $this->getMockBuilder('Zend\ServiceManager\ServiceManager')->getMock();
         $serviceManager->expects(self::once())
             ->method('get')
             ->with('doctrine.documentmanager.some_other_name')