kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[PaymentRequest] Move Payum related services to PayumBundle

Browse source
This commit is contained in:
Grzegorz Sadowski 2024-09-26 15:42:24 +02:00
parent 160c637cd2
commit 5c9e07e2ba
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
22 changed files with 109 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
View file

@ -14,11 +14,11 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
use Sylius\Bundle\PayumBundle\PaymentRequest\Resolver\DoctrineProxyObjectResolverInterface;
use Sylius\Component\Core\Model\PaymentMethodInterface;
use Symfony\Component\Messenger\Attribute\AsMessageHandler;

4
src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
View file

@ -14,12 +14,12 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
use Sylius\Bundle\PayumBundle\PaymentRequest\Resolver\DoctrineProxyObjectResolverInterface;
use Sylius\Component\Payment\Exception\NonExistingPayumTokenException;
use Symfony\Component\Messenger\Attribute\AsMessageHandler;

2
src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/RequestProcessor.php
View file

@ -15,7 +15,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum;
use Payum\Core\Payum;
use Payum\Core\Security\TokenAggregateInterface;
use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface;
use Sylius\Bundle\PayumBundle\PaymentRequest\Context\PaymentRequestContextInterface;
use Sylius\Component\Payment\Model\PaymentRequestInterface;
final class RequestProcessor implements RequestProcessorInterface

8
src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml
View file

@ -17,12 +17,4 @@
<import resource="payment_request/payum/*.xml" />
<import resource="payment_request/offline/*.xml" />
</imports>
<services>
<defaults public="true" />
<service id="sylius.payment_request.payum.context" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContext" />
<service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface" alias="sylius.payment_request.payum.context" />
</services>
</container>

34
src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/actions.xml
View file

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This file is part of the Sylius package.
(c) Sylius Sp. z o.o.
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
-->
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
>
<services>
<defaults public="true" />
<service id="sylius_payment_request.action.get_http_request" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Action\SyliusGetHttpRequestAction">
<argument type="service" id="sylius.payment_request.payum.context" />
<tag name="payum.action" all="true" prepend="true" />
</service>
<service id="sylius_payment_request.action.render_template" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Action\SyliusRenderTemplateAction">
<argument type="service" id="sylius.payment_request.payum.context" />
<tag name="payum.action" all="true" prepend="true" />
</service>
</services>
</container>

6
src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
View file

@ -20,8 +20,8 @@
<service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler" abstract="true">
<argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
<argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface" />
<argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" />
<argument type="service" id="sylius.payum.payment_request.resolver.doctrine_proxy_object_resolver" />
<argument type="service" id="sylius.payum.payment_request.factory.payum_token" />
<argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
<argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface" />
</service>
@ -38,7 +38,7 @@
<service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler" abstract="true">
<argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
<argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface" />
<argument type="service" id="sylius.payum.payment_request.resolver.doctrine_proxy_object_resolver" />
<argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
</service>

2
src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
View file

@ -26,7 +26,7 @@
<service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessor">
<argument type="service" id="payum" />
<argument type="service" id="sylius.payment_request.payum.context" />
<argument type="service" id="sylius.payum.context.payment_request" />
</service>
</services>

26
src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/resolver.xml
View file

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This file is part of the Sylius package.
(c) Sylius Sp. z o.o.
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
-->
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
>
<services>
<defaults public="true" />
<service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolver">
<argument type="service" id="doctrine.orm.entity_manager" />
</service>
</services>
</container>

4
src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php → src/Sylius/Bundle/PayumBundle/PaymentRequest/Action/SyliusGetHttpRequestAction.php
View file

@ -11,12 +11,12 @@
declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Action;
namespace Sylius\Bundle\PayumBundle\PaymentRequest\Action;
use Payum\Core\Action\ActionInterface;
use Payum\Core\Exception\RequestNotSupportedException;
use Payum\Core\Request\GetHttpRequest;
use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface;
use Sylius\Bundle\PayumBundle\PaymentRequest\Context\PaymentRequestContextInterface;
final class SyliusGetHttpRequestAction implements ActionInterface
{

4
src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusRenderTemplateAction.php → src/Sylius/Bundle/PayumBundle/PaymentRequest/Action/SyliusRenderTemplateAction.php
View file

@ -11,12 +11,12 @@
declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Action;
namespace Sylius\Bundle\PayumBundle\PaymentRequest\Action;
use Payum\Core\Action\ActionInterface;
use Payum\Core\Exception\RequestNotSupportedException;
use Payum\Core\Request\RenderTemplate;
use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface;
use Sylius\Bundle\PayumBundle\PaymentRequest\Context\PaymentRequestContextInterface;
final class SyliusRenderTemplateAction implements ActionInterface
{

2
src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContext.php → src/Sylius/Bundle/PayumBundle/PaymentRequest/Context/PaymentRequestContext.php
View file

@ -11,7 +11,7 @@
declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum;
namespace Sylius\Bundle\PayumBundle\PaymentRequest\Context;
use Sylius\Component\Payment\Model\PaymentRequestInterface;

2
src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContextInterface.php → src/Sylius/Bundle/PayumBundle/PaymentRequest/Context/PaymentRequestContextInterface.php
View file

@ -11,7 +11,7 @@
declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum;
namespace Sylius\Bundle\PayumBundle\PaymentRequest\Context;
use Sylius\Component\Payment\Model\PaymentRequestInterface;

2
src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php → src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
View file

@ -11,7 +11,7 @@
declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory;
namespace Sylius\Bundle\PayumBundle\PaymentRequest\Factory;
use Payum\Core\Payum;
use Payum\Core\Security\TokenInterface;

2
src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactoryInterface.php → src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactoryInterface.php
View file

@ -11,7 +11,7 @@
declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory;
namespace Sylius\Bundle\PayumBundle\PaymentRequest\Factory;
use Payum\Core\Security\TokenInterface;
use Sylius\Component\Payment\Model\PaymentRequestInterface;

2
src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Resolver/DoctrineProxyObjectResolver.php → src/Sylius/Bundle/PayumBundle/PaymentRequest/Resolver/DoctrineProxyObjectResolver.php
View file

@ -11,7 +11,7 @@
declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver;
namespace Sylius\Bundle\PayumBundle\PaymentRequest\Resolver;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\Persistence\Proxy;

2
src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Resolver/DoctrineProxyObjectResolverInterface.php → src/Sylius/Bundle/PayumBundle/PaymentRequest/Resolver/DoctrineProxyObjectResolverInterface.php
View file

@ -11,7 +11,7 @@
declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver;
namespace Sylius\Bundle\PayumBundle\PaymentRequest\Resolver;
use Sylius\Component\Payment\Model\PaymentRequestInterface;

2
src/Sylius/Bundle/PayumBundle/Resources/config/services.xml
View file

@ -17,7 +17,7 @@
http://symfony.com/schema/dic/services/services-1.0.xsd">
<imports>
<import resource="services/**.xml" />
<import resource="services/**/*.xml" />
</imports>
<services>

34
src/Sylius/Bundle/PayumBundle/Resources/config/services/payment_request/action.xml Normal file
View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This file is part of the Sylius package.
(c) Sylius Sp. z o.o.
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
-->
<container
xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
>
<services>
<defaults public="true" />
<service id="sylius.payum_action.payment_request.action.get_http_request" class="Sylius\Bundle\PayumBundle\PaymentRequest\Action\SyliusGetHttpRequestAction">
<argument type="service" id="sylius.payum.context.payment_request" />
<tag name="payum.action" all="true" prepend="true" />
</service>
<service id="sylius.payum_action.payment_request.action.render_template" class="Sylius\Bundle\PayumBundle\PaymentRequest\Action\SyliusRenderTemplateAction">
<argument type="service" id="sylius.payum.context.payment_request" />
<tag name="payum.action" all="true" prepend="true" />
</service>
</services>
</container>

26
src/Sylius/Bundle/PayumBundle/Resources/config/services/payment_request/context.xml Normal file
View file

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This file is part of the Sylius package.
(c) Sylius Sp. z o.o.
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
-->
<container
xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
>
<services>
<defaults public="true" />
<service id="sylius.payum.context.payment_request" class="Sylius\Bundle\PayumBundle\PaymentRequest\Context\PaymentRequestContext" />
<service id="Sylius\Bundle\PayumBundle\PaymentRequest\Context\PaymentRequestContextInterface" alias="sylius.payum.context.payment_request" />
</services>
</container>

4
src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml → src/Sylius/Bundle/PayumBundle/Resources/config/services/payment_request/factory.xml
View file

@ -18,9 +18,9 @@
<services>
<defaults public="true" />
<service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactory">
<service id="sylius.payum.payment_request.factory.payum_token" class="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactory">
<argument type="service" id="payum" />
</service>
<service id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" alias="sylius.payum.payment_request.factory.payum_token" />
</services>
</container>

27
src/Sylius/Bundle/PayumBundle/Resources/config/services/payment_request/resolver.xml Normal file
View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This file is part of the Sylius package.
(c) Sylius Sp. z o.o.
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
-->
<container
xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
>
<services>
<defaults public="true" />
<service id="sylius.payum.payment_request.resolver.doctrine_proxy_object_resolver" class="Sylius\Bundle\PayumBundle\PaymentRequest\Resolver\DoctrineProxyObjectResolver">
<argument type="service" id="doctrine.orm.entity_manager" />
</service>
<service id="Sylius\Bundle\PayumBundle\PaymentRequest\Resolver\DoctrineProxyObjectResolverInterface" alias="sylius.payum.payment_request.resolver.doctrine_proxy_object_resolver" />
</services>
</container>

2
src/Sylius/Bundle/PayumBundle/composer.json
View file

@ -1,7 +1,7 @@
{
"name": "sylius/payum-bundle",
"type": "symfony-bundle",
"description": "Payum integration for Symfony e-commerce applications.",
"description": "PaymentRequest integration for Symfony e-commerce applications.",
"keywords": [
"payments",
"payment",