Creating Payment component

Rename PaymentsBundle into PaymentBundle

phpspec.yml

@@ -7,7 +7,7 @@ suites:
     MoneyBundle           : { namespace: Sylius, spec_path: src/Sylius/Bundle/MoneyBundle }
     OmnipayBundle         : { namespace: Sylius, spec_path: src/Sylius/Bundle/OmnipayBundle }
     OrderBundle           : { namespace: Sylius, spec_path: src/Sylius/Bundle/OrderBundle }
-    PaymentsBundle        : { namespace: Sylius, spec_path: src/Sylius/Bundle/PaymentsBundle }
+    PaymentBundle         : { namespace: Sylius, spec_path: src/Sylius/Bundle/PaymentBundle }
     PayumBundle           : { namespace: Sylius, spec_path: src/Sylius/Bundle/PayumBundle }
     ProductBundle         : { namespace: Sylius, spec_path: src/Sylius/Bundle/ProductBundle }
     PromotionBundle       : { namespace: Sylius, spec_path: src/Sylius/Bundle/PromotionBundle }

src/Sylius/Bundle/CoreBundle/Checkout/Step/PurchaseStep.php

@@ -14,11 +14,11 @@ namespace Sylius\Bundle\CoreBundle\Checkout\Step;
 use Payum\Bundle\PayumBundle\Security\TokenFactory;
 use Payum\Core\Registry\RegistryInterface;
 use Payum\Core\Security\HttpRequestVerifierInterface;
-use Sylius\Bundle\CoreBundle\Model\OrderInterface;
-use Sylius\Bundle\FlowBundle\Process\Context\ProcessContextInterface;
-use Sylius\Bundle\PaymentsBundle\SyliusPaymentEvents;
 use Sylius\Bundle\CoreBundle\Checkout\SyliusCheckoutEvents;
 use Sylius\Bundle\CoreBundle\Event\PurchaseCompleteEvent;
+use Sylius\Bundle\CoreBundle\Model\OrderInterface;
+use Sylius\Bundle\FlowBundle\Process\Context\ProcessContextInterface;
+use Sylius\Bundle\PaymentBundle\SyliusPaymentEvents;
 use Sylius\Bundle\PayumBundle\Payum\Request\StatusRequest;
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Symfony\Component\HttpFoundation\RedirectResponse;

src/Sylius/Bundle/CoreBundle/EventListener/OrderPaymentListener.php

@@ -14,8 +14,8 @@ namespace Sylius\Bundle\CoreBundle\EventListener;
 use Sylius\Bundle\CoreBundle\Model\OrderInterface;
 use Sylius\Bundle\CoreBundle\OrderProcessing\PaymentProcessorInterface;
 use Sylius\Bundle\CoreBundle\SyliusOrderEvents;
-use Sylius\Bundle\PaymentsBundle\Model\PaymentInterface;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Sylius\Component\Payment\Model\PaymentInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
@@ -115,7 +115,7 @@ class OrderPaymentListener
 
         if (!$payment instanceof PaymentInterface) {
             throw new \InvalidArgumentException(sprintf(
-                'Order payment listener requires event subject to be instance of "Sylius\Bundle\PaymentsBundle\Model\PaymentInterface", %s given.',
+                'Order payment listener requires event subject to be instance of "Sylius\Component\Payment\Model\PaymentInterface", %s given.',
                 is_object($payment) ? get_class($payment) : gettype($payment)
             ));
         }

src/Sylius/Bundle/CoreBundle/EventListener/PurchaseListener.php

@@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Sylius\Bundle\CartBundle\Provider\CartProviderInterface;
 use Sylius\Bundle\CoreBundle\Event\PurchaseCompleteEvent;
-use Sylius\Bundle\PaymentsBundle\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface;
 
 class PurchaseListener
 {

src/Sylius/Bundle/CoreBundle/Model/Order.php

@@ -15,10 +15,10 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Addressing\Model\AddressInterface;
 use Sylius\Bundle\CartBundle\Model\Cart;
-use Sylius\Bundle\PaymentsBundle\Model\PaymentInterface;
 use Sylius\Component\Promotion\Model\CouponInterface;
 use Sylius\Component\Promotion\Model\PromotionInterface;
 use Sylius\Bundle\OrderBundle\Model\AdjustmentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface;
 
 /**
  * Order entity.

src/Sylius/Bundle/CoreBundle/Model/OrderInterface.php

@@ -17,7 +17,7 @@ use Sylius\Bundle\CartBundle\Model\CartInterface;
 use Sylius\Bundle\OrderBundle\Model\AdjustmentInterface;
 use Sylius\Component\Promotion\Model\CouponInterface;
 use Sylius\Component\Promotion\Model\PromotionSubjectInterface;
-use Sylius\Bundle\PaymentsBundle\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface;
 
 /**
  * Sylius core Order model.

src/Sylius/Bundle/CoreBundle/Resources/config/app/payum.yml

@@ -24,7 +24,7 @@ payum:
                 Sylius\Bundle\CoreBundle\Model\Order:
                     doctrine:
                         driver: orm
-                Sylius\Bundle\PaymentsBundle\Model\Payment:
+                Sylius\Component\Payment\Model\Payment:
                     doctrine:
                         driver: orm
 
@@ -44,7 +44,7 @@ payum:
                 Sylius\Bundle\CoreBundle\Model\Order:
                     doctrine:
                         driver: orm
-                Sylius\Bundle\PaymentsBundle\Model\Payment:
+                Sylius\Component\Payment\Model\Payment:
                     doctrine:
                         driver: orm
 
@@ -65,7 +65,7 @@ payum:
                 Sylius\Bundle\CoreBundle\Model\Order:
                     doctrine:
                         driver: orm
-                Sylius\Bundle\PaymentsBundle\Model\Payment:
+                Sylius\Component\Payment\Model\Payment:
                     doctrine:
                         driver: orm
 
@@ -86,7 +86,7 @@ payum:
                 Sylius\Bundle\CoreBundle\Model\Order:
                     doctrine:
                         driver: orm
-                Sylius\Bundle\PaymentsBundle\Model\Payment:
+                Sylius\Component\Payment\Model\Payment:
                     doctrine:
                         driver: orm
 
@@ -100,6 +100,6 @@ payum:
                 Sylius\Bundle\CoreBundle\Model\Order:
                     doctrine:
                         driver: orm
-                Sylius\Bundle\PaymentsBundle\Model\Payment:
+                Sylius\Component\Payment\Model\Payment:
                     doctrine:
                         driver: orm

src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius.yml

@@ -77,7 +77,7 @@ sylius_inventory:
         stockable:
             model: %sylius.model.variant.class%
 
-sylius_payments:
+sylius_payment:
     classes:
         payment:
             controller: Sylius\Bundle\CoreBundle\Controller\PaymentController

src/Sylius/Bundle/CoreBundle/Resources/config/doctrine/model/Order.orm.xml

@@ -20,7 +20,7 @@
             <join-column name="billing_address_id" referenced-column-name="id" nullable="true" />
         </many-to-one>
 
-        <many-to-one field="payment" target-entity="Sylius\Bundle\PaymentsBundle\Model\PaymentInterface">
+        <many-to-one field="payment" target-entity="Sylius\Component\Payment\Model\PaymentInterface">
             <cascade>
                 <cascade-all/>
             </cascade>

src/Sylius/Bundle/CoreBundle/spec/Sylius/Bundle/CoreBundle/Checkout/Step/PurchaseStepSpec.php

@@ -22,9 +22,10 @@ use spec\Sylius\Bundle\CoreBundle\Fixture\RequestStack;
 use Sylius\Bundle\CartBundle\Provider\CartProviderInterface;
 use Sylius\Bundle\CoreBundle\Checkout\SyliusCheckoutEvents;
 use Sylius\Bundle\CoreBundle\Model\Order;
+use Sylius\Bundle\CoreBundle\Checkout\SyliusCheckoutEvents;
 use Sylius\Bundle\FlowBundle\Process\Context\ProcessContextInterface;
-use Sylius\Bundle\PaymentsBundle\Model\Payment;
-use Sylius\Bundle\PaymentsBundle\SyliusPaymentEvents;
+use Sylius\Bundle\PaymentBundle\SyliusPaymentEvents;
+use Sylius\Component\Payment\Model\Payment;
 use Symfony\Bridge\Doctrine\RegistryInterface as DoctrinRegistryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;

src/Sylius/Bundle/CoreBundle/spec/Sylius/Bundle/CoreBundle/EventListener/OrderPaymentListenerSpec.php

@@ -17,7 +17,7 @@ use Sylius\Bundle\CoreBundle\Model\OrderInterface;
 use Sylius\Bundle\CoreBundle\OrderProcessing\PaymentProcessorInterface;
 use Sylius\Bundle\CoreBundle\SyliusOrderEvents;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
-use Sylius\Bundle\PaymentsBundle\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 

src/Sylius/Bundle/CoreBundle/spec/Sylius/Bundle/CoreBundle/EventListener/PurchaseListenerSpec.php

@@ -13,14 +13,14 @@ namespace spec\Sylius\Bundle\CoreBundle\EventListener;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
+use Sylius\Bundle\CartBundle\Provider\CartProviderInterface;
+use Sylius\Bundle\CoreBundle\Event\PurchaseCompleteEvent;
+use Sylius\Component\Payment\Model\PaymentInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
-use Sylius\Bundle\CartBundle\Provider\CartProviderInterface;
-use Sylius\Bundle\CoreBundle\Event\PurchaseCompleteEvent;
-use Sylius\Bundle\PaymentsBundle\Model\PaymentInterface;
 
 class PurchaseListenerSpec extends ObjectBehavior
 {

src/Sylius/Bundle/FixturesBundle/DataFixtures/ORM/LoadOrdersData.php

@@ -19,7 +19,7 @@ use Sylius\Bundle\CoreBundle\Model\OrderInterface;
 use Sylius\Bundle\CoreBundle\Model\OrderItemInterface;
 use Sylius\Bundle\CoreBundle\Model\ShipmentInterface;
 use Sylius\Bundle\OrderBundle\SyliusOrderEvents;
-use Sylius\Bundle\PaymentsBundle\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class LoadOrdersData extends DataFixture

src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\PaymentsBundle\DependencyInjection;
+namespace Sylius\Bundle\PaymentBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -31,7 +31,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('sylius_payments');
+        $rootNode = $treeBuilder->root('sylius_payment');
 
         $rootNode
             ->addDefaultsIfNotSet()
@@ -64,28 +64,28 @@ class Configuration implements ConfigurationInterface
                         ->arrayNode('payment_method')
                             ->addDefaultsIfNotSet()
                             ->children()
-                                ->scalarNode('model')->defaultValue('Sylius\Bundle\PaymentsBundle\Model\PaymentMethod')->end()
+                                ->scalarNode('model')->defaultValue('Sylius\Component\Payment\Model\PaymentMethod')->end()
                                 ->scalarNode('controller')->defaultValue('Sylius\\Bundle\\ResourceBundle\\Controller\\ResourceController')->end()
                                 ->scalarNode('repository')->end()
-                                ->scalarNode('form')->defaultValue('Sylius\\Bundle\\PaymentsBundle\\Form\\Type\\PaymentMethodType')->end()
+                                ->scalarNode('form')->defaultValue('Sylius\\Bundle\\PaymentBundle\\Form\\Type\\PaymentMethodType')->end()
                             ->end()
                         ->end()
                         ->arrayNode('payment')
                             ->addDefaultsIfNotSet()
                             ->children()
-                                ->scalarNode('model')->defaultValue('Sylius\Bundle\PaymentsBundle\Model\Payment')->end()
+                                ->scalarNode('model')->defaultValue('Sylius\Component\Payment\Model\Payment')->end()
                                 ->scalarNode('controller')->defaultValue('Sylius\\Bundle\\ResourceBundle\\Controller\\ResourceController')->end()
                                 ->scalarNode('repository')->end()
-                                ->scalarNode('form')->defaultValue('Sylius\\Bundle\\PaymentsBundle\\Form\\Type\\PaymentType')->end()
+                                ->scalarNode('form')->defaultValue('Sylius\\Bundle\\PaymentBundle\\Form\\Type\\PaymentType')->end()
                             ->end()
                         ->end()
                         ->arrayNode('credit_card')
                             ->addDefaultsIfNotSet()
                             ->children()
-                                ->scalarNode('model')->defaultValue('Sylius\Bundle\PaymentsBundle\Model\CreditCard')->end()
+                                ->scalarNode('model')->defaultValue('Sylius\Component\Payment\Model\CreditCard')->end()
                                 ->scalarNode('controller')->defaultValue('Sylius\\Bundle\\ResourceBundle\\Controller\\ResourceController')->end()
                                 ->scalarNode('repository')->end()
-                                ->scalarNode('form')->defaultValue('Sylius\\Bundle\\PaymentsBundle\\Form\\Type\\CreditCardType')->end()
+                                ->scalarNode('form')->defaultValue('Sylius\\Bundle\\PaymentBundle\\Form\\Type\\CreditCardType')->end()
                             ->end()
                         ->end()
                     ->end()

src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\PaymentsBundle\DependencyInjection;
+namespace Sylius\Bundle\PaymentBundle\DependencyInjection;
 
 use Sylius\Bundle\ResourceBundle\DependencyInjection\AbstractResourceExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -19,7 +19,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
  *
  * @author Paweł Jędrzejewski <pjedrzejewski@diweb.pl>
  */
-class SyliusPaymentsExtension extends AbstractResourceExtension
+class SyliusPaymentExtension extends AbstractResourceExtension
 {
     /**
      * {@inheritdoc}

src/Sylius/Bundle/PaymentBundle/Form/Type/CreditCardType.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\PaymentsBundle\Form\Type;
+namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Form\AbstractType;
 
 /**
  * Credit Card Form Type

src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentGatewayChoiceType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\PaymentsBundle\Form\Type;
+namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;

src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodChoiceType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\PaymentsBundle\Form\Type;
+namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;

src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodEntityType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\PaymentsBundle\Form\Type;
+namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\OptionsResolver\Options;

src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\PaymentsBundle\Form\Type;
+namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;

src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentType.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\PaymentsBundle\Form\Type;
+namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
-use Sylius\Bundle\PaymentsBundle\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;

src/Sylius/Bundle/PaymentBundle/README.md

@@ -1,4 +1,4 @@
-SyliusPaymentsBundle [![Build status...](https://secure.travis-ci.org/Sylius/SyliusPaymentsBundle.png)](http://travis-ci.org/Sylius/SyliusPaymentsBundle)
+SyliusPaymentBundle [![Build status...](https://secure.travis-ci.org/Sylius/SyliusPaymentBundle.png)](http://travis-ci.org/Sylius/SyliusPaymentBundle)
 ====================
 
 Payments component for [**Symfony2**](http://symfony.com) ecommerce applications.
@@ -19,7 +19,7 @@ $ bin/phpspec run -f pretty
 Documentation
 -------------
 
-Documentation is available on [**docs.sylius.org**](http://docs.sylius.org/en/latest/bundles/SyliusPaymentsBundle/index.html).
+Documentation is available on [**docs.sylius.org**](http://docs.sylius.org/en/latest/bundles/SyliusPaymentBundle/index.html).
 
 Contributing
 ------------
@@ -45,7 +45,7 @@ If you want to keep up with updates, [follow the official Sylius account on twit
 Bug tracking
 ------------
 
-This bundle uses [GitHub issues](https://github.com/Sylius/SyliusPaymentsBundle/issues).
+This bundle uses [GitHub issues](https://github.com/Sylius/SyliusPaymentBundle/issues).
 If you have found bug, please create an issue.
 
 Versioning
@@ -65,10 +65,10 @@ This versioning method is same for all **Sylius** bundles and applications.
 MIT License
 -----------
 
-License can be found [here](https://github.com/Sylius/SyliusPaymentsBundle/blob/master/Resources/meta/LICENSE).
+License can be found [here](https://github.com/Sylius/SyliusPaymentBundle/blob/master/Resources/meta/LICENSE).
 
 Authors
 -------
 
 The bundle was originally created by [Paweł Jędrzejewski](http://pjedrzejewski.com).
-See the list of [contributors](https://github.com/Sylius/SyliusPaymentsBundle/contributors).
+See the list of [contributors](https://github.com/Sylius/SyliusPaymentBundle/contributors).

src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/CreditCard.orm.xml

@@ -14,7 +14,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping">
 
-    <mapped-superclass name="Sylius\Bundle\PaymentsBundle\Model\CreditCard" table="sylius_credit_card">
+    <mapped-superclass name="Sylius\Component\Payment\Model\CreditCard" table="sylius_credit_card">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>

src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml

@@ -14,12 +14,12 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping">
 
-    <mapped-superclass name="Sylius\Bundle\PaymentsBundle\Model\Payment" table="sylius_payment">
+    <mapped-superclass name="Sylius\Component\Payment\Model\Payment" table="sylius_payment">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>
 
-        <many-to-one field="method" target-entity="Sylius\Bundle\PaymentsBundle\Model\PaymentMethodInterface">
+        <many-to-one field="method" target-entity="Sylius\Component\Payment\Model\PaymentMethodInterface">
             <join-column name="method_id" referenced-column-name="id" nullable="true" on-delete="SET NULL" />
         </many-to-one>
 
@@ -36,7 +36,7 @@
             <gedmo:versioned />
         </field>
 
-        <many-to-one field="creditCard" target-entity="Sylius\Bundle\PaymentsBundle\Model\CreditCardInterface">
+        <many-to-one field="creditCard" target-entity="Sylius\Component\Payment\Model\CreditCardInterface">
             <cascade>
                 <cascade-all/>
             </cascade>

src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml

@@ -14,7 +14,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping">
 
-    <mapped-superclass name="Sylius\Bundle\PaymentsBundle\Model\PaymentMethod" table="sylius_payment_method">
+    <mapped-superclass name="Sylius\Component\Payment\Model\PaymentMethod" table="sylius_payment_method">
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO" />
         </id>

src/Sylius/Bundle/PaymentBundle/Resources/config/driver/doctrine/orm.xml

@@ -17,7 +17,7 @@
                                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="sylius.form.type.payment_method_choice.class">Sylius\Bundle\PaymentsBundle\Form\Type\PaymentMethodEntityType</parameter>
+        <parameter key="sylius.form.type.payment_method_choice.class">Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodEntityType</parameter>
     </parameters>
 
 </container>

src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml

@@ -17,8 +17,8 @@
                                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="sylius.form.type.payment_gateway_choice.class">Sylius\Bundle\PaymentsBundle\Form\Type\PaymentGatewayChoiceType</parameter>
-        <parameter key="sylius.form.type.credit_card.class">Sylius\Bundle\PaymentsBundle\Form\Type\CreditCardType</parameter>
+        <parameter key="sylius.form.type.payment_gateway_choice.class">Sylius\Bundle\PaymentBundle\Form\Type\PaymentGatewayChoiceType</parameter>
+        <parameter key="sylius.form.type.credit_card.class">Sylius\Bundle\PaymentBundle\Form\Type\CreditCardType</parameter>
     </parameters>
 
     <services>

src/Sylius/Bundle/PaymentBundle/Resources/config/validation.xml

@@ -16,7 +16,7 @@
                     xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
                                         http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
 
-    <class name="Sylius\Bundle\PaymentsBundle\Model\PaymentMethod">
+    <class name="Sylius\Component\Payment\Model\PaymentMethod">
         <property name="name">
             <constraint name="NotBlank">
                 <option name="message">sylius.payment_method.name.not_blank</option>
@@ -38,7 +38,7 @@
         </property>
     </class>
 
-    <class name="Sylius\Bundle\PaymentsBundle\Model\CreditCard">
+    <class name="Sylius\Component\Payment\Model\CreditCard">
         <property name="number">
             <constraint name="NotBlank">
                 <option name="message">sylius.credit_card.number.not_blank</option>