Merge pull request #2367 from spryker/bugfix/core-665-replace-set-def…

…ault-options-with-configure-options core 665 replace set default options with configure options
spryker · Nov 21, 2016 · e005b5b · e005b5b
2 parents c310a29 + 94978a6
commit e005b5b
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "spryker/sales-aggregator": "^1.0.0 || ^2.0.0",
     "spryker/session": "^2.1.0",
     "spryker/step-engine": "^1.2.0",
-    "spryker/symfony": "^2.0.0",
+    "spryker/symfony": "^2.1.6",
     "spryker/transfer": "^2.0.0",
     "spryker/zed-request": "^2.0.0"
   },

diff --git a/src/Spryker/Yves/Ratepay/Form/ElvSubForm.php b/src/Spryker/Yves/Ratepay/Form/ElvSubForm.php
@@ -11,6 +11,7 @@
 use Spryker\Shared\Ratepay\RatepayConstants;
 use Spryker\Yves\StepEngine\Dependency\Form\SubFormInterface;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class ElvSubForm extends SubFormAbstract
@@ -23,20 +24,30 @@ class ElvSubForm extends SubFormAbstract
     const FIELD_BUNK_ACCOUNT_IBAN = 'bank_account_iban';
 
     /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      *
      * @return void
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
-        parent::setDefaultOptions($resolver);
-
         $resolver->setDefaults([
             'data_class' => RatepayPaymentElvTransfer::class,
             SubFormInterface::OPTIONS_FIELD_NAME => [],
         ]);
     }
 
+    /**
+     * @deprecated Use `configureOptions()` instead.
+     *
+     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     *
+     * @return void
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
     /**
      * @return string
      */

diff --git a/src/Spryker/Yves/Ratepay/Form/InstallmentSubForm.php b/src/Spryker/Yves/Ratepay/Form/InstallmentSubForm.php
@@ -11,6 +11,7 @@
 use Spryker\Shared\Ratepay\RatepayConstants;
 use Spryker\Yves\StepEngine\Dependency\Form\SubFormInterface;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class InstallmentSubForm extends SubFormAbstract
@@ -28,20 +29,30 @@ class InstallmentSubForm extends SubFormAbstract
     const FIELD_BANK_ACCOUNT_IBAN = 'bank_account_iban';
 
     /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      *
      * @return void
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
-        parent::setDefaultOptions($resolver);
-
         $resolver->setDefaults([
             'data_class' => RatepayPaymentInstallmentTransfer::class,
             SubFormInterface::OPTIONS_FIELD_NAME => [],
         ]);
     }
 
+    /**
+     * @deprecated Use `configureOptions()` instead.
+     *
+     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     *
+     * @return void
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
     /**
      * @return string
      */

diff --git a/src/Spryker/Yves/Ratepay/Form/InvoiceSubForm.php b/src/Spryker/Yves/Ratepay/Form/InvoiceSubForm.php
@@ -10,6 +10,7 @@
 use Generated\Shared\Transfer\RatepayPaymentInvoiceTransfer;
 use Spryker\Shared\Ratepay\RatepayConstants;
 use Spryker\Yves\StepEngine\Dependency\Form\SubFormInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class InvoiceSubForm extends SubFormAbstract
@@ -18,20 +19,30 @@ class InvoiceSubForm extends SubFormAbstract
     const PAYMENT_METHOD = 'invoice';
 
     /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      *
      * @return void
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
-        parent::setDefaultOptions($resolver);
-
         $resolver->setDefaults([
             'data_class' => RatepayPaymentInvoiceTransfer::class,
             SubFormInterface::OPTIONS_FIELD_NAME => [],
         ]);
     }
 
+    /**
+     * @deprecated Use `configureOptions()` instead.
+     *
+     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     *
+     * @return void
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
     /**
      * @return string
      */

diff --git a/src/Spryker/Yves/Ratepay/Form/PrepaymentSubForm.php b/src/Spryker/Yves/Ratepay/Form/PrepaymentSubForm.php
@@ -11,6 +11,7 @@
 use Spryker\Shared\Ratepay\RatepayConstants;
 use Spryker\Yves\StepEngine\Dependency\Form\SubFormInterface;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class PrepaymentSubForm extends SubFormAbstract
@@ -19,20 +20,30 @@ class PrepaymentSubForm extends SubFormAbstract
     const PAYMENT_METHOD = 'prepayment';
 
     /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      *
      * @return void
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
-        parent::setDefaultOptions($resolver);
-
         $resolver->setDefaults([
             'data_class' => RatepayPaymentPrepaymentTransfer::class,
             SubFormInterface::OPTIONS_FIELD_NAME => [],
         ]);
     }
 
+    /**
+     * @deprecated Use `configureOptions()` instead.
+     *
+     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     *
+     * @return void
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
     /**
      * @return string
      */