Merge pull request #109 from gregorybesson/develop

revert to saty compatible with zfcuser 2.*...
gregorybesson · Jun 7, 2018 · 99aed73 · 99aed73
2 parents c760be5 + 36b1cc8
commit 99aed73
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/PlaygroundUser/Module.php b/src/PlaygroundUser/Module.php
@@ -178,10 +178,10 @@ public function getServiceConfig()
             'invokables'                                  => array(
                 'PlaygroundUser\Form\Login'                  => 'PlaygroundUser\Form\Login',
                 'playgrounduser_redirectionstrategy_service' => 'PlaygroundUser\View\Strategy\RedirectionStrategy',
+                'playgrounduser_user_service'                  => 'PlaygroundUser\Service\User',
             ),
 
             'factories'                                      => array(
-                'playgrounduser_user_service'                   => 'PlaygroundUser\Service\Factory\UserFactory',
                 'playgrounduser_rememberme_service'             => 'PlaygroundUser\Service\Factory\RememberMeFactory',
                 'playgrounduser_team_service'                   => 'PlaygroundUser\Service\Factory\TeamFactory',
                 'playgrounduser_password_service'               => 'PlaygroundUser\Service\Factory\PasswordFactory',

diff --git a/src/PlaygroundUser/Service/User.php b/src/PlaygroundUser/Service/User.php
@@ -5,6 +5,7 @@
 use PlaygroundUser\Entity\UserProvider;
 use Zend\Form\Form;
 use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\ServiceManagerAwareInterface;
 use Zend\Crypt\Password\Bcrypt;
 use PlaygroundUser\Options\ModuleOptions;
 use Zend\Validator\File\Size;
@@ -14,7 +15,7 @@
 use PlaygroundUser\Entity\Role;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
-class User extends \ZfcUser\Service\User
+class User extends \ZfcUser\Service\User implements ServiceManagerAwareInterface
 {
 
     /**
@@ -50,10 +51,10 @@ class User extends \ZfcUser\Service\User
      */
     protected $options;
 
-    public function __construct(ServiceLocatorInterface $locator)
-    {
-        $this->serviceManager = $locator;
-    }
+    // public function __construct(ServiceLocatorInterface $locator)
+    // {
+    //     $this->serviceManager = $locator;
+    // }
 
     /**
      * functional mandatory fields go in the form validator part
@@ -1133,4 +1134,11 @@ public function getServiceManager()
     {
         return $this->serviceManager;
     }
+
+    public function setServiceManager(ServiceManager $serviceManager)	
+    {	
+        $this->serviceManager = $serviceManager;	
+
+        return $this;	
+    }
 }