Merge pull request #39 from Laminas-Commons/laminas-3.x

Laminas 3.x

Module.php

@@ -55,7 +55,7 @@ public function getServiceConfig()
                 'lmcuser_laminas_db_adapter' => \Laminas\Db\Adapter\Adapter::class,
             ),
             'invokables' => array(
-                'lmcuser_register_form_hydrator' => \Laminas\Hydrator\ClassMethods::class,
+                'lmcuser_register_form_hydrator' => \Laminas\Hydrator\ClassMethodsHydrator::class,
             ),
             'factories' => array(
                 'lmcuser_redirect_callback' => \LmcUser\Factory\Controller\RedirectCallbackFactory::class,

composer.json

@@ -57,5 +57,10 @@
         "classmap": [
             "./Module.php"
         ]
+    },
+    "autoload-dev": {
+        "psr-0": {
+            "LmcUserTest": "tests/"
+        }
     }
 }

src/LmcUser/Factory/UserHydrator.php

@@ -4,24 +4,15 @@
 
 use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class UserHydrator implements FactoryInterface
 {
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
-    {
-        return new \Laminas\Hydrator\ClassMethods();
-    }
-
-
     /**
-     * Create service
-     *
-     * @param  ServiceLocatorInterface $serviceLocator
-     * @return mixed
+     * {@inheritDoc}
+     * @see \Laminas\ServiceManager\Factory\FactoryInterface::__invoke()
      */
-    public function createService(ServiceLocatorInterface $serviceLocator)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        return $this->__invoke($serviceLocator, null);
+        return new \Laminas\Hydrator\ClassMethodsHydrator();
     }
 }

src/LmcUser/Mapper/AbstractDbMapper.php

@@ -7,11 +7,11 @@
 use Laminas\Db\Sql\Select;
 use Laminas\Db\Sql\Sql;
 use Laminas\Db\Sql\TableIdentifier;
+use Laminas\Hydrator\ClassMethodsHydrator;
 use Laminas\Hydrator\HydratorInterface;
-use Laminas\Hydrator\ClassMethods;
+use LmcUser\Db\Adapter\MasterSlaveAdapterInterface;
 use LmcUser\Entity\UserInterface as UserEntityInterface;
 use LmcUser\EventManager\EventProvider;
-use LmcUser\Db\Adapter\MasterSlaveAdapterInterface;
 
 abstract class AbstractDbMapper extends EventProvider
 {
@@ -80,7 +80,7 @@ protected function initialize()
             throw new \Exception('No db adapter present');
         }
         if (!$this->hydrator instanceof HydratorInterface) {
-            $this->hydrator = new ClassMethods;
+            $this->hydrator = new ClassMethodsHydrator();
         }
         if (!is_object($this->entityPrototype)) {
             throw new \Exception('No entity prototype set');
@@ -243,7 +243,7 @@ public function setDbSlaveAdapter(Adapter $dbSlaveAdapter)
     public function getHydrator()
     {
         if (!$this->hydrator) {
-            $this->hydrator = new ClassMethods(false);
+            $this->hydrator = new ClassMethodsHydrator(false);
         }
         return $this->hydrator;
     }

src/LmcUser/Service/User.php

@@ -288,7 +288,7 @@ public function setServiceManager(ContainerInterface $serviceManager)
     /**
      * Return the Form Hydrator
      *
-     * @return \Laminas\Hydrator\ClassMethods
+     * @return \Laminas\Hydrator\ClassMethodsHydrator
      */
     public function getFormHydrator()
     {

tests/LmcUserTest/Factory/Form/RegisterFormFactoryTest.php

@@ -4,7 +4,6 @@
 use Laminas\Form\FormElementManager;
 use Laminas\Hydrator\ClassMethodsHydrator;
 use Laminas\ServiceManager\ServiceManager;
-use Laminas\Hydrator\ClassMethods;
 use LmcUser\Factory\Form\Register as RegisterFactory;
 use LmcUser\Options\ModuleOptions;
 use LmcUser\Mapper\User as UserMapper;