Fixed some deprecation elements

* Also changed BehatBridge to BehatBridgeBundle to allow new bundle properties during major version
elcodi · Jun 9, 2015 · c1f57c1 · c1f57c1
1 parent 3d67306
commit c1f57c1
Show file tree

Hide file tree

Showing 46 changed files with 299 additions and 203 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -160,7 +160,9 @@ public function registerBundles()
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+
             $bundles[] = new Elcodi\Bundle\FixturesBoosterBundle\ElcodiFixturesBoosterBundle();
+            $bundles[] = new Elcodi\Bridge\BehatBridgeBundle\BehatBridgeBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
         }

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -26,8 +26,8 @@ default:
                 - %paths.base%/features/store
             contexts:
                 - Behat\MinkExtension\Context\MinkContext
-                - Elcodi\Bridge\BehatBridge\DoctrineContext
-                - Elcodi\Bridge\BehatBridge\Context
+                - Elcodi\Bridge\BehatBridgeBundle\DoctrineContext
+                - Elcodi\Bridge\BehatBridgeBundle\Context
                 - Elcodi\Store\CoreBundle\Behat\Context
                 - Elcodi\Store\ProductBundle\Behat\Context
                 - Elcodi\Store\CartBundle\Behat\Context
@@ -38,17 +38,17 @@ default:
                 - %paths.base%/features/admin
             contexts:
                 - Behat\MinkExtension\Context\MinkContext
-                - Elcodi\Bridge\BehatBridge\DoctrineContext
-                - Elcodi\Bridge\BehatBridge\Context
+                - Elcodi\Bridge\BehatBridgeBundle\DoctrineContext
+                - Elcodi\Bridge\BehatBridgeBundle\Context
                 - Elcodi\Admin\CoreBundle\Behat\Context
 
         workflow:
             paths:
                 - %paths.base%/features/workflow
             contexts:
                 - Behat\MinkExtension\Context\MinkContext
-                - Elcodi\Bridge\BehatBridge\DoctrineContext
-                - Elcodi\Bridge\BehatBridge\Context
+                - Elcodi\Bridge\BehatBridgeBundle\DoctrineContext
+                - Elcodi\Bridge\BehatBridgeBundle\Context
                 - Elcodi\Store\CoreBundle\Behat\Context
                 - Elcodi\Store\ProductBundle\Behat\Context
                 - Elcodi\Store\CartBundle\Behat\Context

diff --git a/composer.json b/composer.json
@@ -43,6 +43,7 @@
 
         "ocramius/proxy-manager": "^1.0",
         "doctrine/orm": "^2.5",
+        "doctrine/dbal": "^2.5",
         "doctrine/common": "^2.5",
         "doctrine/doctrine-bundle": "^1.2",
         "doctrine/annotations": "^1.2",

diff --git a/features/store/cart.feature b/features/store/cart.feature
@@ -13,11 +13,13 @@ Feature: Store cart
     Then I should be on "/cart"
     And the response should not contain a "empty-cart" test attribute
 
+  @now
   Scenario: See the cart checkout without being logged in
     Given I am on "/cart/product/10/add"
     When I go to "/cart/address"
     And I should be on "/login"
 
+  @now
   Scenario: See the cart checkout being logged in
     Given I am logged as "customer@customer.com" - "1234"
     When I go to "/cart/product/10/add"

diff --git a/src/Elcodi/Admin/AttributeBundle/Form/Type/AttributeType.php b/src/Elcodi/Admin/AttributeBundle/Form/Type/AttributeType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 
@@ -31,13 +31,11 @@ class AttributeType extends AbstractType
     use FactoryTrait;
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/BannerBundle/Form/Type/BannerType.php b/src/Elcodi/Admin/BannerBundle/Form/Type/BannerType.php
@@ -19,6 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
@@ -57,13 +58,11 @@ public function __construct($imageNamespace, $bannerZoneNamespace)
     }
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/BannerBundle/Form/Type/BannerZoneType.php b/src/Elcodi/Admin/BannerBundle/Form/Type/BannerZoneType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 
@@ -57,13 +57,11 @@ public function __construct($languageNamespace, $bannerNamespace)
     }
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/CoreBundle/Behat/Context.php b/src/Elcodi/Admin/CoreBundle/Behat/Context.php
@@ -17,7 +17,7 @@
 
 namespace Elcodi\Admin\CoreBundle\Behat;
 
-use Elcodi\Bridge\BehatBridge\abstracts\AbstractElcodiContext;
+use Elcodi\Bridge\BehatBridgeBundle\Abstracts\AbstractElcodiContext;
 
 /**
  * Class Context

diff --git a/src/Elcodi/Admin/CouponBundle/Form/Type/CouponType.php b/src/Elcodi/Admin/CouponBundle/Form/Type/CouponType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 use Elcodi\Component\Coupon\ElcodiCouponTypes;
@@ -49,13 +49,11 @@ public function __construct($ruleNamespace)
     }
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/CurrencyBundle/Form/Type/CurrencyType.php b/src/Elcodi/Admin/CurrencyBundle/Form/Type/CurrencyType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 
@@ -31,13 +31,11 @@ class CurrencyType extends AbstractType
     use FactoryTrait;
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/CurrencyBundle/Form/Type/MoneyType.php b/src/Elcodi/Admin/CurrencyBundle/Form/Type/MoneyType.php
@@ -20,7 +20,7 @@
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Wrapper\Interfaces\WrapperInterface;
 use Elcodi\Component\Currency\Entity\Money;
@@ -84,9 +84,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     }
 
     /**
-     * {@inheritdoc}
+     * Configures the options for this type.
+     *
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         /**
          * We set given Currency as default object to work with

diff --git a/src/Elcodi/Admin/GeoBundle/Form/Type/AddressType.php b/src/Elcodi/Admin/GeoBundle/Form/Type/AddressType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 
@@ -31,13 +31,11 @@ class AddressType extends AbstractType
     use FactoryTrait;
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/NewsletterBundle/Form/Type/NewsletterSubscriptionType.php b/src/Elcodi/Admin/NewsletterBundle/Form/Type/NewsletterSubscriptionType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 
@@ -31,13 +31,11 @@ class NewsletterSubscriptionType extends AbstractType
     use FactoryTrait;
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/PageBundle/Form/Type/BlogPostType.php b/src/Elcodi/Admin/PageBundle/Form/Type/BlogPostType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 use Elcodi\Component\EntityTranslator\EventListener\Traits\EntityTranslatableFormTrait;
@@ -33,13 +33,11 @@ class BlogPostType extends AbstractType
     use EntityTranslatableFormTrait, FactoryTrait;
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/PageBundle/Form/Type/EmailType.php b/src/Elcodi/Admin/PageBundle/Form/Type/EmailType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 use Elcodi\Component\EntityTranslator\EventListener\Traits\EntityTranslatableFormTrait;
@@ -33,13 +33,11 @@ class EmailType extends AbstractType
     use EntityTranslatableFormTrait, FactoryTrait;
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/PageBundle/Form/Type/PageType.php b/src/Elcodi/Admin/PageBundle/Form/Type/PageType.php
@@ -20,7 +20,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
 use Elcodi\Component\EntityTranslator\EventListener\Traits\EntityTranslatableFormTrait;
@@ -51,13 +51,11 @@ public function __construct(EventSubscriberInterface $permanentPageSubscriber)
     }
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {

diff --git a/src/Elcodi/Admin/ProductBundle/Form/Type/CategoryType.php b/src/Elcodi/Admin/ProductBundle/Form/Type/CategoryType.php
@@ -19,7 +19,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints;
 
 use Elcodi\Component\Core\Factory\Traits\FactoryTrait;
@@ -34,13 +34,11 @@ class CategoryType extends AbstractType
     use EntityTranslatableFormTrait, FactoryTrait;
 
     /**
-     * Default form options
+     * Configures the options for this type.
      *
-     * @param OptionsResolverInterface $resolver
-     *
-     * @return array With the options
+     * @param OptionsResolver $resolver The resolver for the options.
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'empty_data' => function () {