Repair the application error loop

.travis.yml

@@ -6,6 +6,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 before_script:
@@ -28,5 +29,4 @@ notifications:
 matrix:
   fast_finish: true
   allow_failures:
-    - php: 5.6
     - php: hhvm

Module.php

@@ -2,11 +2,9 @@
 
 namespace ZfcUser;
 
-use Zend\ModuleManager\ModuleManager;
 use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
 use Zend\ModuleManager\Feature\ConfigProviderInterface;
 use Zend\ModuleManager\Feature\ServiceProviderInterface;
-use Zend\Stdlib\Hydrator\ClassMethods;
 
 class Module implements
     AutoloaderProviderInterface,
@@ -36,15 +34,16 @@ public function getControllerPluginConfig()
     {
         return array(
             'factories' => array(
-                'zfcUserAuthentication' => function ($sm) {
-                    $serviceLocator = $sm->getServiceLocator();
-                    $authService = $serviceLocator->get('zfcuser_auth_service');
-                    $authAdapter = $serviceLocator->get('ZfcUser\Authentication\Adapter\AdapterChain');
-                    $controllerPlugin = new Controller\Plugin\ZfcUserAuthentication;
-                    $controllerPlugin->setAuthService($authService);
-                    $controllerPlugin->setAuthAdapter($authAdapter);
-                    return $controllerPlugin;
-                },
+                'zfcUserAuthentication' => 'ZfcUser\Factory\Controller\Plugin\ZfcUserAuthentication',
+            ),
+        );
+    }
+
+    public function getControllerConfig()
+    {
+        return array(
+            'factories' => array(
+                'zfcuser' => 'ZfcUser\Factory\Controller\UserControllerFactory',
             ),
         );
     }
@@ -53,25 +52,9 @@ public function getViewHelperConfig()
     {
         return array(
             'factories' => array(
-                'zfcUserDisplayName' => function ($sm) {
-                    $locator = $sm->getServiceLocator();
-                    $viewHelper = new View\Helper\ZfcUserDisplayName;
-                    $viewHelper->setAuthService($locator->get('zfcuser_auth_service'));
-                    return $viewHelper;
-                },
-                'zfcUserIdentity' => function ($sm) {
-                    $locator = $sm->getServiceLocator();
-                    $viewHelper = new View\Helper\ZfcUserIdentity;
-                    $viewHelper->setAuthService($locator->get('zfcuser_auth_service'));
-                    return $viewHelper;
-                },
-                'zfcUserLoginWidget' => function ($sm) {
-                    $locator = $sm->getServiceLocator();
-                    $viewHelper = new View\Helper\ZfcUserLoginWidget;
-                    $viewHelper->setViewTemplate($locator->get('zfcuser_module_options')->getUserLoginWidgetViewTemplate());
-                    $viewHelper->setLoginForm($locator->get('zfcuser_login_form'));
-                    return $viewHelper;
-                },
+                'zfcUserDisplayName' => 'ZfcUser\Factory\View\Helper\ZfcUserDisplayName',
+                'zfcUserIdentity' => 'ZfcUser\Factory\View\Helper\ZfcUserIdentity',
+                'zfcUserLoginWidget' => 'ZfcUser\Factory\View\Helper\ZfcUserLoginWidget',
             ),
         );
 
@@ -80,91 +63,34 @@ public function getViewHelperConfig()
     public function getServiceConfig()
     {
         return array(
+            'aliases' => array(
+                'zfcuser_zend_db_adapter' => 'Zend\Db\Adapter\Adapter',
+            ),
             'invokables' => array(
-                'ZfcUser\Authentication\Adapter\Db' => 'ZfcUser\Authentication\Adapter\Db',
-                'ZfcUser\Authentication\Storage\Db' => 'ZfcUser\Authentication\Storage\Db',
-                'ZfcUser\Form\Login'                => 'ZfcUser\Form\Login',
-                'zfcuser_user_service'              => 'ZfcUser\Service\User',
                 'zfcuser_register_form_hydrator'    => 'Zend\Stdlib\Hydrator\ClassMethods',
             ),
             'factories' => array(
+                'zfcuser_redirect_callback' => 'ZfcUser\Factory\Controller\RedirectCallbackFactory',
+                'zfcuser_module_options' => 'ZfcUser\Factory\Options\ModuleOptions',
+                'ZfcUser\Authentication\Adapter\AdapterChain' => 'ZfcUser\Authentication\Adapter\AdapterChainServiceFactory',
 
-                'zfcuser_module_options' => function ($sm) {
-                    $config = $sm->get('Config');
-                    return new Options\ModuleOptions(isset($config['zfcuser']) ? $config['zfcuser'] : array());
-                },
                 // We alias this one because it's ZfcUser's instance of
                 // Zend\Authentication\AuthenticationService. We don't want to
                 // hog the FQCN service alias for a Zend\* class.
-                'zfcuser_auth_service' => function ($sm) {
-                    return new \Zend\Authentication\AuthenticationService(
-                        $sm->get('ZfcUser\Authentication\Storage\Db'),
-                        $sm->get('ZfcUser\Authentication\Adapter\AdapterChain')
-                    );
-                },
-
-                'ZfcUser\Authentication\Adapter\AdapterChain' => 'ZfcUser\Authentication\Adapter\AdapterChainServiceFactory',
-
-                'zfcuser_login_form' => function ($sm) {
-                    $options = $sm->get('zfcuser_module_options');
-                    $form = new Form\Login(null, $options);
-                    $form->setInputFilter(new Form\LoginFilter($options));
-                    return $form;
-                },
-
-                'zfcuser_register_form' => function ($sm) {
-                    $options = $sm->get('zfcuser_module_options');
-                    $form = new Form\Register(null, $options);
-                    //$form->setCaptchaElement($sm->get('zfcuser_captcha_element'));
-                    $form->setInputFilter(new Form\RegisterFilter(
-                        new Validator\NoRecordExists(array(
-                            'mapper' => $sm->get('zfcuser_user_mapper'),
-                            'key'    => 'email'
-                        )),
-                        new Validator\NoRecordExists(array(
-                            'mapper' => $sm->get('zfcuser_user_mapper'),
-                            'key'    => 'username'
-                        )),
-                        $options
-                    ));
-                    return $form;
-                },
+                'zfcuser_auth_service' => 'ZfcUser\Factory\AuthenticationService',
 
-                'zfcuser_change_password_form' => function ($sm) {
-                    $options = $sm->get('zfcuser_module_options');
-                    $form = new Form\ChangePassword(null, $sm->get('zfcuser_module_options'));
-                    $form->setInputFilter(new Form\ChangePasswordFilter($options));
-                    return $form;
-                },
+                'zfcuser_user_hydrator' => 'ZfcUser\Factory\UserHydrator',
+                'zfcuser_user_mapper' => 'ZfcUser\Factory\Mapper\User',
 
-                'zfcuser_change_email_form' => function ($sm) {
-                    $options = $sm->get('zfcuser_module_options');
-                    $form = new Form\ChangeEmail(null, $options);
-                    $form->setInputFilter(new Form\ChangeEmailFilter(
-                        $options,
-                        new Validator\NoRecordExists(array(
-                            'mapper' => $sm->get('zfcuser_user_mapper'),
-                            'key'    => 'email'
-                        ))
-                    ));
-                    return $form;
-                },
+                'zfcuser_login_form'            => 'ZfcUser\Factory\Form\Login',
+                'zfcuser_register_form'         => 'ZfcUser\Factory\Form\Register',
+                'zfcuser_change_password_form'  => 'ZfcUser\Factory\Form\ChangePassword',
+                'zfcuser_change_email_form'     => 'ZfcUser\Factory\Form\ChangeEmail',
 
-                'zfcuser_user_hydrator' => function ($sm) {
-                    $hydrator = new \Zend\Stdlib\Hydrator\ClassMethods();
-                    return $hydrator;
-                },
+                'ZfcUser\Authentication\Adapter\Db' => 'ZfcUser\Factory\Authentication\Adapter\DbFactory',
+                'ZfcUser\Authentication\Storage\Db' => 'ZfcUser\Factory\Authentication\Storage\DbFactory',
 
-                'zfcuser_user_mapper' => function ($sm) {
-                    $options = $sm->get('zfcuser_module_options');
-                    $mapper = new Mapper\User();
-                    $mapper->setDbAdapter($sm->get('zfcuser_zend_db_adapter'));
-                    $entityClass = $options->getUserEntityClass();
-                    $mapper->setEntityPrototype(new $entityClass);
-                    $mapper->setHydrator(new Mapper\UserHydrator());
-                    $mapper->setTableName($options->getTableName());
-                    return $mapper;
-                },
+                'zfcuser_user_service'              => 'ZfcUser\Factory\Service\UserFactory',
             ),
         );
     }

README.md

@@ -14,7 +14,7 @@ ZfcUser is a user registration and authentication module for Zend Framework 2.
 Out of the box, ZfcUser works with Zend\Db, however alternative storage adapter
 modules are available (see below). ZfcUser provides the foundations for adding
 user authentication and registration to your ZF2 site. It is designed to be very
-simple and easily to extend.
+simple and easy to extend.
 
 More information and examples are available on the [ZfcUser Wiki](https://github.com/ZF-Commons/ZfcUser/wiki)
 
@@ -86,7 +86,6 @@ Installation
     return array(
         'modules' => array(
             // ...
-            'ZfcBase',
             'ZfcUser',
         ),
         // ...

composer.json

@@ -25,7 +25,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": "^5.3.3|~7.0",
         "zendframework/zend-authentication": "~2.1",
         "zendframework/zend-crypt": "~2.1",
         "zendframework/zend-form": "~2.1",

config/module.config.php

@@ -1,20 +1,12 @@
 <?php
+
 return array(
     'view_manager' => array(
         'template_path_stack' => array(
             'zfcuser' => __DIR__ . '/../view',
         ),
     ),
-    'controllers' => array(
-        'invokables' => array(
-            'zfcuser' => 'ZfcUser\Controller\UserController',
-        ),
-    ),
-    'service_manager' => array(
-        'aliases' => array(
-            'zfcuser_zend_db_adapter' => 'Zend\Db\Adapter\Adapter',
-        ),
-    ),
+
     'router' => array(
         'routes' => array(
             'zfcuser' => array(

config/zfcuser.global.php.dist

@@ -158,7 +158,7 @@ $settings = array(
     /**
      * Logout Redirect Route
      *
-     * Upon logging out the user will be redirected to the enterd route
+     * Upon logging out the user will be redirected to the entered route
      *
      * Default value: 'zfcuser/login'
      * Accepted values: A valid route name within your application

src/ZfcUser/Authentication/Adapter/Db.php

@@ -2,17 +2,15 @@
 
 namespace ZfcUser\Authentication\Adapter;
 
-use DateTime;
 use Zend\Authentication\Result as AuthenticationResult;
-use Zend\ServiceManager\ServiceManagerAwareInterface;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Crypt\Password\Bcrypt;
 use Zend\Session\Container as SessionContainer;
 use ZfcUser\Authentication\Adapter\AdapterChainEvent as AuthEvent;
 use ZfcUser\Mapper\User as UserMapperInterface;
 use ZfcUser\Options\AuthenticationOptionsInterface;
 
-class Db extends AbstractAdapter implements ServiceManagerAwareInterface
+class Db extends AbstractAdapter
 {
     /**
      * @var UserMapperInterface
@@ -40,8 +38,7 @@ class Db extends AbstractAdapter implements ServiceManagerAwareInterface
      */
     public function logout(AuthEvent $e)
     {
-        $session = new SessionContainer($this->getStorage()->getNameSpace());
-        $session->getManager()->destroy();
+        $this->getStorage()->clear();
     }
 
     public function authenticate(AuthEvent $e)

src/ZfcUser/Authentication/Storage/Db.php

@@ -4,11 +4,10 @@
 
 use Zend\Authentication\Storage;
 use Zend\Authentication\Storage\StorageInterface;
-use Zend\ServiceManager\ServiceManagerAwareInterface;
 use Zend\ServiceManager\ServiceManager;
 use ZfcUser\Mapper\UserInterface as UserMapper;
 
-class Db implements Storage\StorageInterface, ServiceManagerAwareInterface
+class Db implements Storage\StorageInterface
 {
     /**
      * @var StorageInterface
@@ -42,7 +41,7 @@ public function isEmpty()
         if ($this->getStorage()->isEmpty()) {
             return true;
         }
-        $identity = $this->read();
+        $identity = $this->getStorage()->read();
         if ($identity === null) {
             $this->clear();
             return true;