[User] Minor refactoring UserChangePasswordType

Sylius · May 24, 2016 · a07f633 · a07f633
1 parent c247118
commit a07f633
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/Sylius/Bundle/UserBundle/Form/Type/UserChangePasswordType.php b/src/Sylius/Bundle/UserBundle/Form/Type/UserChangePasswordType.php
@@ -21,6 +21,26 @@
  */
 class UserChangePasswordType extends AbstractType
 {
+    /**
+     * @var string
+     */
+    protected $dataClass = null;
+
+    /**
+     * @var string[]
+     */
+    protected $validationGroups = [];
+
+    /**
+     * @param string $dataClass
+     * @param string[] $validationGroups
+     */
+    public function __construct($dataClass, array $validationGroups = [])
+    {
+        $this->dataClass = $dataClass;
+        $this->validationGroups = $validationGroups;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -45,8 +65,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => ChangePassword::class,
-            'validation_groups' => ['sylius'],
+            'data_class' => $this->dataClass,
+            'validation_groups' => $this->validationGroups,
         ]);
     }
 

diff --git a/src/Sylius/Bundle/UserBundle/Resources/config/services.xml b/src/Sylius/Bundle/UserBundle/Resources/config/services.xml
@@ -58,6 +58,11 @@
 
         <parameter key="sylius.user.validator.unique_registered_user.class">Sylius\Bundle\UserBundle\Validator\Constraints\RegisteredUserValidator</parameter>
         <parameter key="sylius.user.validator.customer_initializer.class">Sylius\Bundle\UserBundle\Validator\Initializer\CustomerInitializer</parameter>
+
+        <parameter key="sylius.form.type.user_change_password.date_class">Sylius\Bundle\UserBundle\Form\Model\ChangePassword</parameter>
+        <parameter key="sylius.form.type.user_change_password.validation_groups" type="collection">
+            <parameter>sylius</parameter>
+        </parameter>
     </parameters>
 
     <services>
@@ -173,6 +178,10 @@
             <tag name="form.type" alias="sylius_user_reset_password" />
         </service>
         <service id="sylius.form.type.user_change_password" class="%sylius.form.type.user_change_password.class%">
+            <argument type="string">%sylius.form.type.user_change_password.date_class%</argument>
+            <argument type="collection">
+                <argument>sylius</argument>
+            </argument>
             <tag name="form.type" alias="sylius_user_change_password" />
         </service>
         <service id="sylius.form.type.gender" class="%sylius.form.type.gender.class%">