diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php index 5c54f28244..551bfa876f 100644 --- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php +++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php @@ -35,11 +35,11 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr $loader->load('services.xml'); if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) { - $loader->load('paypal.xml'); + $loader->load('integrations/payum/paypal.xml'); } if (class_exists(StripeCheckoutGatewayFactory::class)) { - $loader->load('stripe.xml'); + $loader->load('integrations/payum/stripe.xml'); } $container->setParameter('payum.template.layout', $config['template']['layout']); @@ -89,19 +89,19 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr $container->prependExtensionConfig('sylius_payment', ['gateways' => $gateways]); - $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); - $loader->load('integrations/payment_request.xml'); + $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config/integrations/sylius_payment')); + $loader->load('services.xml'); if (class_exists(OfflineGatewayFactory::class)) { - $loader->load('integrations/offline.xml'); + $loader->load('offline.xml'); } if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) { - $loader->load('integrations/paypal_express_checkout.xml'); + $loader->load('paypal_express_checkout.xml'); } if (class_exists(StripeCheckoutGatewayFactory::class)) { - $loader->load('integrations/stripe.xml'); + $loader->load('stripe.xml'); } } } diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/paypal.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/paypal.xml similarity index 94% rename from src/Sylius/Bundle/PayumBundle/Resources/config/paypal.xml rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/paypal.xml index cfefe3587c..3bc5725d4a 100644 --- a/src/Sylius/Bundle/PayumBundle/Resources/config/paypal.xml +++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/paypal.xml @@ -16,10 +16,6 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - - diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/stripe.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/stripe.xml similarity index 92% rename from src/Sylius/Bundle/PayumBundle/Resources/config/stripe.xml rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/stripe.xml index 362cac89ce..4cc237ab63 100644 --- a/src/Sylius/Bundle/PayumBundle/Resources/config/stripe.xml +++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/stripe.xml @@ -16,10 +16,6 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - - diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/offline.xml similarity index 100% rename from src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/offline.xml diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/paypal_express_checkout.xml similarity index 100% rename from src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/paypal_express_checkout.xml diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/services.xml similarity index 100% rename from src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/services.xml diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/stripe.xml similarity index 100% rename from src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/stripe.xml