Separate form and input filters

config/module.config.php

@@ -37,13 +37,14 @@
 
     'form_elements' => array(
         'factories' => array(
-            'BaconUser\Form\RegistrationForm' => 'BaconUser\Form\Factory\RegistrationFormFactory'
+            'BaconUser\Form\UserFieldset'          => 'BaconUser\Form\Factory\UserFieldsetFactory',
+            'BaconUser\Form\User\RegistrationForm' => 'BaconUser\Form\Factory\RegistrationFormFactory'
         )
     ),
 
     'hydrators' => array(
         'factories' => array(
-            'BaconUser\Hydrator\RegistrationHydrator' => 'BaconUser\Hydrator\Factory\RegistrationHydratorFactory'
+            'BaconUser\Hydrator\UserHydrator' => 'BaconUser\Hydrator\Factory\UserHydrator'
         )
     ),
 

src/BaconUser/Form/Factory/RegistrationFormFactory.php

@@ -9,7 +9,7 @@
 
 namespace BaconUser\Form\Factory;
 
-use BaconUser\Form\RegistrationForm;
+use BaconUser\Form\User\RegistrationForm;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
@@ -28,10 +28,8 @@ class RegistrationFormFactory implements FactoryInterface
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $parentLocator = $serviceLocator->getServiceLocator();
-        $options       = $parentLocator->get('BaconUser\Options\UserOptions');
 
-        $form = new RegistrationForm($options);
-        $form->setHydrator($parentLocator->get('HydratorManager')->get('BaconUser\Hydrator\RegistrationHydrator'));
+        $form = new RegistrationForm();
         $form->setInputFilter($parentLocator->get('InputFilterManager')->get('BaconUser\InputFilter\RegistrationFilter'));
 
         return $form;

src/BaconUser/Form/Factory/UserFieldsetFactory.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * BaconUser
+ *
+ * @link      http://github.com/Bacon/BaconUser For the canonical source repository
+ * @copyright 2013 Ben Scholzen 'DASPRiD'
+ * @license   http://opensource.org/licenses/BSD-2-Clause Simplified BSD License
+ */
+
+namespace BaconUser\Form\Factory;
+
+use BaconUser\Form\UserFieldset;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Service factory that instantiates {@see UserFieldset}.
+ */
+class UserFieldsetFactory implements FactoryInterface
+{
+    /**
+     * createService(): defined by FactoryInterface.
+     *
+     * @see    FactoryInterface::createService()
+     * @param  ServiceLocatorInterface $serviceLocator
+     * @return UserFieldset
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        $parentLocator = $serviceLocator->getServiceLocator();
+        $options       = $parentLocator->get('BaconUser\Options\UserOptions');
+        $hydrator      = $parentLocator->get('HydratorManager')->get('BaconUser\Hydrator\UserHydrator');
+
+        $fieldset = new UserFieldset($hydrator, $options);
+
+        return $fieldset;
+    }
+}

src/BaconUser/Form/User/RegistrationForm.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * BaconUser
+ *
+ * @link      http://github.com/Bacon/BaconUser For the canonical source repository
+ * @copyright 2013 Ben Scholzen 'DASPRiD'
+ * @license   http://opensource.org/licenses/BSD-2-Clause Simplified BSD License
+ */
+
+namespace BaconUser\Form\User;
+
+use BaconUser\Options\UserOptionsInterface;
+use Zend\Form\Form;
+
+/**
+ * Generic registration form.
+ */
+class RegistrationForm extends Form
+{
+    public function init()
+    {
+        $this->setName('registration-form');
+
+        $this->add(array(
+            'type'    => 'BaconUser\Form\UserFieldset',
+            'name'    => 'user',
+            'options' => array(
+                'use_as_base_fieldset' => true
+            )
+        ));
+
+        $this->add(array(
+            'type' => 'Csrf',
+            'name' => 'csrf'
+        ));
+
+        $this->add(array(
+            'type'    => 'Submit',
+            'name'    => 'submit',
+            'options' => array(
+                'label' => 'Register',
+            )
+        ));
+
+        // Add specific registration elements
+
+        $userFieldset = $this->get('user');
+        $userFieldset->add(array(
+            'type'    => 'Password',
+            'name'    => 'passwordVerification',
+            'options' => array(
+                'label' => 'Verify password'
+            ),
+            'attributes' => array(
+                'required' => 'required'
+            )
+        ));
+    }
+}

src/BaconUser/Form/RegistrationForm.php → src/BaconUser/Form/UserFieldset.php

@@ -10,16 +10,24 @@
 namespace BaconUser\Form;
 
 use BaconUser\Options\UserOptionsInterface;
-use Zend\Form\Form;
+use Zend\Form\Fieldset;
+use Zend\Stdlib\Hydrator\HydratorInterface;
 
 /**
- * Generic registration form.
+ * Base fieldset for user
  */
-class RegistrationForm extends Form
+class UserFieldset extends Fieldset
 {
-    public function __construct(UserOptionsInterface $options)
+    /**
+     * Constructor
+     *
+     * @param HydratorInterface    $hydrator
+     * @param UserOptionsInterface $options
+     */
+    public function __construct(HydratorInterface $hydrator, UserOptionsInterface $options)
     {
-        parent::__construct(null);
+        parent::__construct('user');
+        $this->setHydrator($hydrator);
 
         if ($options->getEnableUsername()) {
             $this->add(array(
@@ -28,51 +36,31 @@ public function __construct(UserOptionsInterface $options)
                     'label' => 'Username',
                 ),
                 'attributes' => array(
-                    'type' => 'text',
+                    'required' => 'required',
                 ),
             ));
         }
 
         $this->add(array(
+            'type' => 'Email',
             'name' => 'email',
             'options' => array(
                 'label' => 'Email',
             ),
             'attributes' => array(
-                'type' => 'text'
-            ),
+                'required' => 'required'
+            )
         ));
 
         $this->add(array(
+            'type' => 'Password',
             'name' => 'password',
             'options' => array(
                 'label' => 'Password',
             ),
             'attributes' => array(
-                'type' => 'password'
-            ),
-        ));
-
-        $this->add(array(
-            'name' => 'password_verification',
-            'options' => array(
-                'label' => 'Verify password',
-            ),
-            'attributes' => array(
-                'type' => 'password'
-            ),
-        ));
-
-        $this->add(array(
-            'name' => 'submit',
-            'options' => array(
-                'label' => 'Register',
-            ),
-            'attributes' => array(
-                'type' => 'submit',
-            ),
-        ), array(
-            'priority' => -100
+                'required' => 'required'
+            )
         ));
     }
 }

src/BaconUser/Hydrator/Factory/RegistrationHydratorFactory.php → src/BaconUser/Hydrator/Factory/UserHydratorFactory.php

@@ -10,27 +10,27 @@
 namespace BaconUser\Hydrator\Factory;
 
 use BaconUser\Form\PasswordHashingStrategy;
-use BaconUser\Hydrator\RegistrationHydrator;
+use BaconUser\Hydrator\UserHydrator;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
- * Service factory that instantiates {@see RegistrationHydrator}.
+ * Service factory that instantiates {@see UserHydrator}.
  */
-class RegistrationHydratorFactory implements FactoryInterface
+class UserHydratorFactory implements FactoryInterface
 {
     /**
      * createService(): defined by FactoryInterface.
      *
      * @see    FactoryInterface::createService()
      * @param  ServiceLocatorInterface $serviceLocator
-     * @return RegistrationHydrator
+     * @return UserHydrator
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $parentLocator = $serviceLocator->getServiceLocator();
 
-        $hydrator = new RegistrationHydrator(
+        $hydrator = new UserHydrator(
             new PasswordHashingStrategy(
                 $parentLocator->get('BaconUser\Password\HandlerInterface')
             )

src/BaconUser/Hydrator/RegistrationHydrator.php → src/BaconUser/Hydrator/UserHydrator.php

@@ -9,35 +9,33 @@
 
 namespace BaconUser\Hydrator;
 
+use Zend\Stdlib\Exception;
 use Zend\Stdlib\Hydrator\ClassMethods;
 use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
 
 /**
  * Hydrator for the {@see RegistrationForm}.
  */
-class RegistrationHydrator extends ClassMethods
+class UserHydrator extends ClassMethods
 {
     /**
      * @param StrategyInterface $passwordHashingStrategy
      */
     public function __construct(StrategyInterface $passwordHashingStrategy)
     {
-        parent::__construct(true);
-        $this->addStrategy('password_hash', $passwordHashingStrategy);
+        parent::__construct(false);
+        $this->addStrategy('passwordHash', $passwordHashingStrategy);
     }
 
     /**
-     * hydrate(): defined by ClassMethods.
-     *
-     * @see    ClassMethods::hydrate()
-     * @param  array  $data
+     * @param  array $data
      * @param  object $object
      * @return object
      */
     public function hydrate(array $data, $object)
     {
         if (isset($data['password'])) {
-            $data['password_hash'] = $data['password'];
+            $data['passwordHash'] = $data['password'];
         }
 
         return parent::hydrate($data, $object);

src/BaconUser/InputFilter/Factory/RegistrationFilterFactory.php

@@ -32,18 +32,16 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         $userRepository = $parentLocator->get('BaconUser\Repository\UserRepository');
         $options        = $parentLocator->get('BaconUser\Options\UserOptions');
 
-        $inputFilter = new RegistrationFilter(
-            new NoObjectExists(array(
-                'object_repository' => $userRepository,
-                'fields'            => 'email',
-            )),
-            new NoObjectExists(array(
-                'object_repository' => $userRepository,
-                'fields'            => 'username',
-            )),
-            $options
-        );
+        $usernameValidator = new NoObjectExists(array(
+            'object_repository' => $userRepository,
+            'fields'            => 'username'
+        ));
 
-        return $inputFilter;
+        $emailValidator = new NoObjectExists(array(
+            'object_repository' => $userRepository,
+            'fields'            => 'email'
+        ));
+
+        return new RegistrationFilter($userRepository, $usernameValidator, $emailValidator, $options);
     }
 }