From 9acd3b741581c36fb39e2fe276b30fd6c1480281 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:15:41 +0100
Subject: [PATCH 001/200] Add Payment request model

---
 composer.json                                 |   1 +
 .../Migrations/Version20231106190918.php      |  39 ++++++
 .../DependencyInjection/Configuration.php     |  19 +++
 .../Resources/config/app/config.yml           |   8 ++
 .../doctrine/model/PaymentRequest.orm.xml     |  44 ++++++
 src/Sylius/Bundle/PaymentBundle/composer.json |   3 +-
 .../Payment/Model/PaymentRequest.php          | 106 +++++++++++++++
 .../Payment/Model/PaymentRequestInterface.php |  70 ++++++++++
 .../Payment/spec/Model/PaymentRequestSpec.php | 126 ++++++++++++++++++
 symfony.lock                                  |   9 ++
 10 files changed, 424 insertions(+), 1 deletion(-)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
 create mode 100644 src/Sylius/Component/Payment/Model/PaymentRequest.php
 create mode 100644 src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
 create mode 100644 src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php

diff --git a/composer.json b/composer.json
index 7811e75f59..473e9dff0c 100644
--- a/composer.json
+++ b/composer.json
@@ -71,6 +71,7 @@
         "psr/http-message": "^1.0",
         "psr/log": "^2.0",
         "ramsey/uuid": "^4.0",
+        "ramsey/uuid-doctrine": "^2.0",
         "sonata-project/block-bundle": "^4.2 || ^5.0",
         "stof/doctrine-extensions-bundle": "^1.4",
         "sylius-labs/association-hydrator": "^1.1 || ^1.2",
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
new file mode 100644
index 0000000000..a38141a0cc
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20231106190918 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create payment request';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE sylius_payment_request (hash CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, data LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', details JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id)');
+        $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE sylius_payment_request DROP FOREIGN KEY FK_86D904B19883967');
+        $this->addSql('ALTER TABLE sylius_payment_request DROP FOREIGN KEY FK_86D904B4C3A3BB');
+        $this->addSql('DROP TABLE sylius_payment_request');
+    }
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
index 6c26b7a571..f525bae9cb 100644
--- a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
@@ -24,6 +24,8 @@ use Sylius\Component\Payment\Model\PaymentMethod;
 use Sylius\Component\Payment\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentMethodTranslation;
 use Sylius\Component\Payment\Model\PaymentMethodTranslationInterface;
+use Sylius\Component\Payment\Model\PaymentRequest;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Resource\Factory\Factory;
 use Sylius\Component\Resource\Factory\TranslatableFactory;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
@@ -118,6 +120,23 @@ final class Configuration implements ConfigurationInterface
                                 ->end()
                             ->end()
                         ->end()
+                        ->arrayNode('payment_request')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->variableNode('options')->end()
+                                ->arrayNode('classes')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->scalarNode('model')->defaultValue(PaymentRequest::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('interface')->defaultValue(PaymentRequestInterface::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('repository')->cannotBeEmpty()->end()
+                                        ->scalarNode('factory')->defaultValue(Factory::class)->end()
+                                        ->scalarNode('form')->defaultValue(null)->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
                     ->end()
                 ->end()
             ->end()
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
index e5bfe497fe..7748456355 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
@@ -1,6 +1,14 @@
 # This file is part of the Sylius package.
 # (c) Sylius Sp. z o.o.
 
+parameters:
+    sylius.uuid_type: Ramsey\Uuid\Doctrine\UuidType
+
+doctrine:
+    dbal:
+        types:
+            sylius_uuid: "%sylius.uuid_type%"
+
 jms_serializer:
     metadata:
         directories:
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
new file mode 100644
index 0000000000..992e2712ba
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -0,0 +1,44 @@
+<?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.
+
+-->
+
+<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\Component\Payment\Model\PaymentRequest" table="sylius_payment_request">
+        <id name="hash" column="hash" type="sylius_uuid">
+            <generator strategy="AUTO" />
+            <custom-id-generator class="Ramsey\Uuid\Doctrine\UuidGenerator"/>
+        </id>
+
+        <many-to-one field="method" target-entity="Sylius\Component\Payment\Model\PaymentMethodInterface">
+            <join-column name="method_id" referenced-column-name="id" nullable="true" />
+        </many-to-one>
+
+        <many-to-one field="payment" target-entity="Sylius\Component\Payment\Model\PaymentInterface">
+            <join-column name="payment_id" referenced-column-name="id" nullable="true" />
+        </many-to-one>
+
+        <field name="state" column="state" type="string" />
+        <field name="type" column="type" type="string" />
+        <field name="data" column="data" type="object" />
+        <field name="details" column="details" type="json" />
+
+        <field name="createdAt" column="created_at" type="datetime">
+            <gedmo:timestampable on="create"/>
+        </field>
+        <field name="updatedAt" column="updated_at" type="datetime" nullable="true">
+            <gedmo:timestampable on="update"/>
+        </field>
+    </mapped-superclass>
+
+</doctrine-mapping>
diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json
index dce6337dad..3ebb64ae54 100644
--- a/src/Sylius/Bundle/PaymentBundle/composer.json
+++ b/src/Sylius/Bundle/PaymentBundle/composer.json
@@ -29,7 +29,8 @@
         "php": "^8.2",
         "sylius/payment": "^2.0",
         "sylius/resource-bundle": "^1.10",
-        "symfony/framework-bundle": "^6.4.1"
+        "symfony/framework-bundle": "^6.4.1",
+        "ramsey/uuid-doctrine": "^2.0"
     },
     "conflict": {
         "doctrine/orm": "2.15.2"
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
new file mode 100644
index 0000000000..396fa877e8
--- /dev/null
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Model;
+
+use Sylius\Component\Resource\Model\TimestampableTrait;
+
+class PaymentRequest implements PaymentRequestInterface
+{
+    use TimestampableTrait;
+
+    protected ?string $hash = null;
+
+    protected ?PaymentMethodInterface $method = null;
+
+    protected ?PaymentInterface $payment = null;
+
+    protected string $state = PaymentRequestInterface::STATE_NEW;
+
+    protected string $type = PaymentRequestInterface::DATA_TYPE_CAPTURE;
+
+    protected mixed $data = null;
+
+    /** @var mixed[] */
+    protected array $details = [];
+
+    public function __construct()
+    {
+        $this->createdAt = new \DateTime();
+    }
+
+    public function getId(): ?string
+    {
+        return $this->hash;
+    }
+
+    public function getMethod(): ?PaymentMethodInterface
+    {
+        return $this->method;
+    }
+
+    public function setMethod(?PaymentMethodInterface $method): void
+    {
+        $this->method = $method;
+    }
+
+    public function getPayment(): ?PaymentInterface
+    {
+        return $this->payment;
+    }
+
+    public function setPayment(?PaymentInterface $payment): void
+    {
+        $this->payment = $payment;
+    }
+
+    public function getState(): string
+    {
+        return $this->state;
+    }
+
+    public function setState(string $state): void
+    {
+        $this->state = $state;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function setType(string $type): void
+    {
+        $this->type = $type;
+    }
+
+    public function getData(): mixed
+    {
+        return $this->data;
+    }
+
+    public function setData(mixed $data): void
+    {
+        $this->data = $data;
+    }
+
+    public function getDetails(): array
+    {
+        return $this->details;
+    }
+
+    public function setDetails(array $details): void
+    {
+        $this->details = $details;
+    }
+}
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
new file mode 100644
index 0000000000..398af790fc
--- /dev/null
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Model;
+
+use Sylius\Component\Resource\Model\ResourceInterface;
+use Sylius\Component\Resource\Model\TimestampableInterface;
+
+interface PaymentRequestInterface extends TimestampableInterface, ResourceInterface
+{
+    public const STATE_NEW = 'new';
+
+    public const STATE_PROCESSING = 'processing';
+
+    public const STATE_FAILED = 'failed';
+
+    public const STATE_CANCELLED = 'cancelled';
+
+    public const STATE_COMPLETED = 'completed';
+
+    public const DATA_TYPE_CAPTURE = 'capture';
+
+    public const DATA_TYPE_AUTHORIZE = 'authorize';
+
+    public const DATA_TYPE_STATUS = 'status';
+
+    public const DATA_TYPE_SYNC = 'sync';
+
+    public const DATA_TYPE_PAYOUT = 'payout';
+
+    public function getMethod(): ?PaymentMethodInterface;
+
+    public function setMethod(?PaymentMethodInterface $method): void;
+
+    public function getPayment(): ?PaymentInterface;
+
+    public function setPayment(?PaymentInterface $payment): void;
+
+    public function getState(): string;
+
+    public function setState(string $state): void;
+
+    public function getType(): string;
+
+    public function setType(string $type): void;
+
+    public function getData(): mixed;
+
+    public function setData(mixed $data): void;
+
+    /**
+     * @return mixed[]
+     */
+    public function getDetails(): array;
+
+    /**
+     * @param mixed[] $details
+     */
+    public function setDetails(array $details): void;
+}
diff --git a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
new file mode 100644
index 0000000000..ad15f1bd31
--- /dev/null
+++ b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Component\Payment\Model;
+
+use PhpSpec\ObjectBehavior;
+use stdClass;
+use Sylius\Component\Payment\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+
+final class PaymentRequestSpec extends ObjectBehavior
+{
+    function it_implements_sylius_payment_request_interface(): void
+    {
+        $this->shouldImplement(PaymentRequestInterface::class);
+    }
+
+    function it_has_no_hash_by_default(): void
+    {
+        $this->getId()->shouldReturn(null);
+    }
+
+    function it_has_no_payment_method_by_default(): void
+    {
+        $this->getMethod()->shouldReturn(null);
+    }
+
+    function its_payment_method_is_mutable(PaymentMethodInterface $method): void
+    {
+        $this->setMethod($method);
+        $this->getMethod()->shouldReturn($method);
+    }
+
+    function it_has_no_payment_by_default(): void
+    {
+        $this->getPayment()->shouldReturn(null);
+    }
+
+    function its_payment_is_mutable(PaymentInterface $payment): void
+    {
+        $this->setPayment($payment);
+        $this->getPayment()->shouldReturn($payment);
+    }
+
+    function it_has_new_state_by_default(): void
+    {
+        $this->getState()->shouldReturn(PaymentRequestInterface::STATE_NEW);
+    }
+
+    function its_state_is_mutable(): void
+    {
+        $this->setState('test_state');
+        $this->getState()->shouldReturn('test_state');
+    }
+
+    function it_has_capture_type_by_default(): void
+    {
+        $this->getType()->shouldReturn(PaymentRequestInterface::DATA_TYPE_CAPTURE);
+    }
+
+    function its_type_is_mutable(): void
+    {
+        $this->setType('test_type');
+        $this->getType()->shouldReturn('test_type');
+    }
+
+    function it_has_null_data_by_default(): void
+    {
+        $this->getData()->shouldReturn(null);
+    }
+
+    function its_data_is_mutable(): void
+    {
+        $stdClass = new stdClass();
+        $this->setData($stdClass);
+        $this->getData()->shouldReturn($stdClass);
+    }
+
+    function it_has_empty_array_details_by_default(): void
+    {
+        $this->getDetails()->shouldReturn([]);
+    }
+
+    function its_details_are_mutable(): void
+    {
+        $this->setDetails(['foo', 'bar']);
+        $this->getDetails()->shouldReturn(['foo', 'bar']);
+    }
+
+    function it_initializes_creation_date_by_default(): void
+    {
+        $this->getCreatedAt()->shouldHaveType('DateTime');
+    }
+
+    function its_creation_date_is_mutable(): void
+    {
+        $date = new \DateTime('last year');
+
+        $this->setCreatedAt($date);
+        $this->getCreatedAt()->shouldReturn($date);
+    }
+
+    function it_has_no_last_update_date_by_default(): void
+    {
+        $this->getUpdatedAt()->shouldReturn(null);
+    }
+
+    function its_last_update_date_is_mutable(): void
+    {
+        $date = new \DateTime('last year');
+
+        $this->setUpdatedAt($date);
+        $this->getUpdatedAt()->shouldReturn($date);
+    }
+}
diff --git a/symfony.lock b/symfony.lock
index 36d0121891..2755d00962 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -469,6 +469,15 @@
     "ramsey/uuid": {
         "version": "3.8.0"
     },
+    "ramsey/uuid-doctrine": {
+        "version": "2.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes-contrib",
+            "branch": "main",
+            "version": "1.3",
+            "ref": "471aed0fbf5620b8d7f92b7a5ebbbf6c0945c27a"
+        }
+    },
     "rector/rector": {
         "version": "0.11.52"
     },

From e9e251f2d5e7f38036093b04ba5dd9b52259a0eb Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 17 Nov 2023 13:03:04 +0100
Subject: [PATCH 002/200] Add API resource

---
 .../Command/Payment/AddPaymentRequest.php     | 30 ++++++++
 .../Payment/AddPaymentRequestHandler.php      | 28 ++++++++
 .../config/api_resources/PaymentRequest.xml   | 68 +++++++++++++++++++
 .../config/serialization/PaymentMethod.xml    |  4 ++
 .../config/serialization/PaymentRequest.xml   | 56 +++++++++++++++
 .../Resources/config/services/filters.xml     |  9 +++
 6 files changed, 195 insertions(+)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml

diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
new file mode 100644
index 0000000000..82e56b72d4
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Command\Payment;
+
+use Sylius\Bundle\ApiBundle\Command\CustomerEmailAwareInterface;
+use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
+use Sylius\Bundle\ApiBundle\Command\PaymentMethodCodeAwareInterface;
+
+/** @experimental */
+class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
+{
+    public function __construct(
+        public string $type,
+        public mixed $data,
+        public ?string $paymentId,
+        public ?string $paymentMethodCode,
+    ) {
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
new file mode 100644
index 0000000000..4d0d2718d3
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Checkout;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+
+/** @experimental */
+final class AddPaymentRequestHandler implements MessageHandlerInterface
+{
+
+    public function __invoke(AddPaymentRequest $addPaymentRequest): PaymentRequestInterface
+    {
+
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
new file mode 100644
index 0000000000..d70cdbb062
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" ?>
+
+<!--
+
+ 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.
+
+-->
+
+<resources xmlns="https://api-platform.com/schema/metadata"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
+>
+    <resource class="%sylius.model.payment_request.class%" shortName="PaymentRequest">
+        <attribute name="validation_groups">sylius</attribute>
+
+        <attribute name="order">
+            <attribute name="createdAt">DESC</attribute>
+        </attribute>
+
+        <collectionOperations>
+            <collectionOperation name="admin_get">
+                <attribute name="method">GET</attribute>
+                <attribute name="path">/admin/payment-requests</attribute>
+                <attribute name="filters">
+                    <attribute>sylius.api.search_payment_request_filter</attribute>
+                </attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">admin:payment_request:read</attribute>
+                </attribute>
+            </collectionOperation>
+
+            <collectionOperation name="shop_post">
+                <attribute name="method">POST</attribute>
+                <attribute name="path">/shop/payment-requests</attribute>
+                <attribute name="messenger">input</attribute>
+                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest</attribute>
+                <attribute name="denormalization_context">
+                    <attribute name="groups">shop:product_review:create</attribute>
+                </attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">shop:product_review:read</attribute>
+                </attribute>
+            </collectionOperation>
+        </collectionOperations>
+
+        <itemOperations>
+            <itemOperation name="shop_get">
+                <attribute name="method">GET</attribute>
+                <attribute name="path">/shop/payment-requests/{hash}</attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">shop:payment_request:read</attribute>
+                </attribute>
+            </itemOperation>
+        </itemOperations>
+
+        <property name="hash" identifier="true" writable="false" />
+        <property name="createdAt" writable="false" />
+        <property name="updatedAt" writable="false" />
+        <property name="state" writable="false" />
+        <property name="data" writable="true" />
+        <property name="details" writable="false" />
+    </resource>
+</resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
index 0781097cdf..10e86f6afb 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
@@ -40,6 +40,8 @@
             <group>sylius:admin:payment_method:show</group>
             <group>admin:payment_method:update</group>
             <group>sylius:admin:payment_method:update</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
         </attribute>
 
         <attribute name="name">
@@ -49,6 +51,8 @@
             <group>sylius:shop:payment_method:index</group>
             <group>shop:payment_method:show</group>
             <group>sylius:shop:payment_method:show</group>
+            <group>sylius:shop:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
         </attribute>
 
         <attribute name="enabled">
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
new file mode 100644
index 0000000000..acd2b6aa94
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+
+<!--
+
+ 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.
+
+-->
+
+<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
+>
+    <class name="Sylius\Component\Core\Model\PaymentRequest">
+        <attribute name="hash">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+        <attribute name="payment">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+        <attribute name="method">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+        <attribute name="type">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+        <attribute name="state">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+        <attribute name="data">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+        <attribute name="details">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+        <attribute name="createdAt">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+        <attribute name="updatedAt">
+            <group>admin:payment_request:read</group>
+            <group>shop:payment_request:read</group>
+        </attribute>
+    </class>
+</serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
index 5edc5c55d3..20a5546da0 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
@@ -17,6 +17,15 @@
             <tag name="api_platform.filter" />
         </service>
 
+        <service id="sylius.api.search_payment_request_filter" parent="api_platform.doctrine.orm.search_filter" public="true">
+            <argument type="collection">
+                <argument key="state">exact</argument>
+                <argument key="type">exact</argument>
+                <argument key="method.code">exact</argument>
+            </argument>
+            <tag name="api_platform.filter" />
+        </service>
+
         <service id="sylius.api.search_shipment_filter" parent="api_platform.doctrine.orm.search_filter" public="true">
             <argument type="collection">
                 <argument key="state">exact</argument>

From 50c169d076b3ddfbcdfe281b8cf014ffef132153 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 23 Nov 2023 20:00:25 +0100
Subject: [PATCH 003/200] Add first step of a PAYUM Capture request

---
 .../Command/Payment/Payum/PayumCapture.php    | 13 ++++
 .../Payment/AddPaymentRequestHandler.php      | 50 ++++++++++++-
 .../Payment/Payum/PayumCaptureHandler.php     | 74 +++++++++++++++++++
 .../PaymentRequestCommandProviderPass.php     | 42 +++++++++++
 .../PaymentRequestNotSupportedException.php   | 26 +++++++
 .../PaymentRequestDuplicationChecker.php      | 35 +++++++++
 ...mentRequestDuplicationCheckerInterface.php | 12 +++
 .../Payment/PaymentRequestCommandProvider.php | 64 ++++++++++++++++
 ...PaymentRequestCommandProviderInterface.php | 14 ++++
 .../Payment/Payum/PayumApiContext.php         | 34 +++++++++
 .../Payum/PayumApiContextInterface.php        | 22 ++++++
 .../Payment/Payum/PayumRequestProcessor.php   | 50 +++++++++++++
 .../Payum/PayumRequestProcessorInterface.php  | 23 ++++++
 ...umCapturePaymentRequestCommandProvider.php | 21 ++++++
 .../config/services/command_handlers.xml      | 11 +++
 .../Resources/config/services/payments.xml    | 14 ++++
 .../config/services/payum/offline.xml         | 26 +++++++
 .../config/services/payum/paypal.xml          | 26 +++++++
 .../Resources/config/services/payum/payum.xml | 37 ++++++++++
 .../config/services/payum/stripe.xml          | 26 +++++++
 .../Bundle/ApiBundle/SyliusApiBundle.php      |  2 +
 .../config/app/sylius/sylius_payment.yml      |  4 +
 .../Doctrine/ORM/PaymentRequestRepository.php | 38 ++++++++++
 .../Payment/Model/PaymentRequest.php          |  5 ++
 .../Payment/Model/PaymentRequestInterface.php |  2 +
 .../PaymentRequestRepositoryInterface.php     | 25 +++++++
 26 files changed, 695 insertions(+), 1 deletion(-)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapture.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumCaptureHandler.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Exception/PaymentRequestNotSupportedException.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationChecker.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationCheckerInterface.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProviderInterface.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/PayumCapturePaymentRequestCommandProvider.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/payum.xml
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
 create mode 100644 src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php

diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapture.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapture.php
new file mode 100644
index 0000000000..38e653c8b6
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapture.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Command\Payment\Payum;
+
+class PayumCapture
+{
+    public function __construct(
+        public string $hash,
+    ) {
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 4d0d2718d3..d3448fe23f 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -11,18 +11,66 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler\Checkout;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
+use Doctrine\Persistence\ObjectManager;
 use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
+use Sylius\Bundle\ApiBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
+use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Resource\Factory\FactoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Webmozart\Assert\Assert;
 
 /** @experimental */
 final class AddPaymentRequestHandler implements MessageHandlerInterface
 {
+    public function __construct(
+        private FactoryInterface $paymentRequestFactory,
+        private PaymentMethodRepositoryInterface $paymentMethodRepository,
+        private PaymentRepositoryInterface $paymentRepository,
+        private ObjectManager $paymentRequestManager,
+        private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
+        private MessageBusInterface $commandBus,
+    ) {
+    }
 
     public function __invoke(AddPaymentRequest $addPaymentRequest): PaymentRequestInterface
     {
+        $paymentRequest = $this->createPaymentRequest($addPaymentRequest);
+        if (!$this->paymentRequestCommandProvider->supports($paymentRequest)) {
+            throw new PaymentRequestNotSupportedException();
+        }
 
+        $command = $this->paymentRequestCommandProvider->handle($paymentRequest);
+
+        $this->commandBus->dispatch($command);
+
+        return $paymentRequest;
+    }
+
+    private function createPaymentRequest(AddPaymentRequest $addPaymentRequest): PaymentRequestInterface
+    {
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $this->paymentMethodRepository->findOneBy(['code' => $addPaymentRequest->paymentMethodCode]);
+        Assert::notNull($paymentMethod);
+        /** @var PaymentInterface|null $payment */
+        $payment = $this->paymentRepository->find($addPaymentRequest->paymentId);
+        Assert::notNull($payment);
+
+        /** @var PaymentRequestInterface $paymentRequest */
+        $paymentRequest = $this->paymentRequestFactory->createNew();
+        $paymentRequest->setPayment($payment);
+        $paymentRequest->setMethod($paymentMethod);
+        $paymentRequest->setType($addPaymentRequest->type);
+        $paymentRequest->setData($addPaymentRequest->data);
+
+        $this->paymentRequestManager->persist($paymentRequest);
+        return $paymentRequest;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumCaptureHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumCaptureHandler.php
new file mode 100644
index 0000000000..43c6966c36
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumCaptureHandler.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum;
+
+use Payum\Core\Payum;
+use Payum\Core\Request\Capture;
+use Sylius\Bundle\ApiBundle\Command\Payment\Payum\PayumCapture;
+use Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Webmozart\Assert\Assert;
+
+/** @experimental */
+final class PayumCaptureHandler implements MessageHandlerInterface
+{
+    public function __construct(
+        private RepositoryInterface $paymentRequestRepository,
+        private Payum $payum,
+        private PayumRequestProcessorInterface $payumReplyProcessor,
+    ) {
+    }
+
+    public function __invoke(PayumCapture $payumCapture): void
+    {
+        /** @var PaymentRequestInterface|null $paymentRequest */
+        $paymentRequest = $this->paymentRequestRepository->find($payumCapture->hash);
+        Assert::notNull($paymentRequest);
+
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+        Assert::notNull($paymentMethod);
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        Assert::notNull($gatewayConfig);
+
+        $gatewayName = $gatewayConfig->getGatewayName();
+
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment);
+
+        /** @var array|null $data */
+        $data = $paymentRequest->getData();
+        Assert::notNull($data);
+
+        $afterPath = $data['after_path'] ?? null;
+        Assert::notNull($afterPath);
+
+        $afterPathParameters = $data['after_path_parameters'] ?? [];
+
+        $token = $this->payum->getTokenFactory()->createCaptureToken(
+            $gatewayName,
+            $payment,
+            $afterPath,
+            $afterPathParameters
+        );
+
+        $captureRequest = new Capture($token);
+        $this->payumReplyProcessor->process($paymentRequest, $captureRequest);
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php b/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
new file mode 100644
index 0000000000..908cd8c454
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Webmozart\Assert\Assert;
+
+final class PaymentRequestCommandProviderPass implements CompilerPassInterface
+{
+
+    public function process(ContainerBuilder $container): void
+    {
+        $commandProviders = [];
+        foreach ($container->findTaggedServiceIds('sylius.api.payment_request.command_provider', true) as $serviceId => $tags) {
+            foreach ($tags as $tag) {
+                if (!isset($tag['id'])) {
+                    $tag['id'] = $serviceId;
+                }
+
+                $factoryName = $tag['factory'] ?? null;
+                Assert::notNull(
+                    $factoryName,
+                    sprintf('The tag "%s" must have a "factory" attribut.', 'sylius.api.payment_request.command_provider')
+                );
+
+                $type = $tag['type'] ?? null;
+                Assert::notNull(
+                    $type,
+                    sprintf('The tag "%s" must have a "type" attribut.', 'sylius.api.payment_request.command_provider')
+                );
+
+                $commandProviders[sprintf('%s::%s', $factoryName, $type)] = new Reference($serviceId);
+            }
+        }
+
+        $container->getDefinition('sylius.api.payment_request.command_provider.locator')->addArgument($commandProviders);
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Exception/PaymentRequestNotSupportedException.php b/src/Sylius/Bundle/ApiBundle/Exception/PaymentRequestNotSupportedException.php
new file mode 100644
index 0000000000..bf31ca989b
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Exception/PaymentRequestNotSupportedException.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Exception;
+
+/** @experimental */
+final class PaymentRequestNotSupportedException extends \RuntimeException
+{
+    public function __construct(
+        string $message = 'Payment request not supported.',
+        int $code = 0,
+        \Throwable $previous = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationChecker.php b/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationChecker.php
new file mode 100644
index 0000000000..bf7cb23a97
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationChecker.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Checker;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Webmozart\Assert\Assert;
+
+final class PaymentRequestDuplicationChecker implements PaymentRequestDuplicationCheckerInterface
+{
+
+    public function __construct(
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+    ) {
+    }
+
+    public function hasDuplicates(PaymentRequestInterface $paymentRequest): bool
+    {
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment);
+
+        $paymentMethod = $paymentRequest->getMethod();
+        Assert::notNull($paymentMethod);
+
+        $paymentRequests = $this->paymentRequestRepository->findExisting(
+            $payment,
+            $paymentMethod,
+            $paymentRequest->getType()
+        );
+
+        return count($paymentRequests) > 0;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationCheckerInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationCheckerInterface.php
new file mode 100644
index 0000000000..78526585bb
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationCheckerInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Checker;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface PaymentRequestDuplicationCheckerInterface
+{
+    public function hasDuplicates(PaymentRequestInterface $paymentRequest): bool;
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php
new file mode 100644
index 0000000000..cc3ff4c4d8
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment;
+
+use Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationCheckerInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+use Webmozart\Assert\Assert;
+
+final class PaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+{
+    public function __construct(
+        private PaymentRequestDuplicationCheckerInterface $paymentRequestDuplicationChecker,
+        private ServiceProviderInterface $paymentRequestCommandProviderLocator,
+    ) {
+    }
+
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        $hasDuplicates = $this->paymentRequestDuplicationChecker->hasDuplicates($paymentRequest);
+
+        if ($hasDuplicates) {
+            return false;
+        }
+
+        return $this->getCommandProvider($paymentRequest)->supports($paymentRequest);
+    }
+
+    public function handle(PaymentRequestInterface $paymentRequest): object
+    {
+        return $this->getCommandProvider($paymentRequest)->handle($paymentRequest);
+    }
+
+    protected function getCommandProvider(PaymentRequestInterface $paymentRequest): PaymentRequestCommandProviderInterface
+    {
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+        Assert::notNull($paymentMethod);
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        Assert::notNull($gatewayConfig);
+        /** @var PaymentRequestCommandProviderInterface $service */
+        $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
+
+        $id = sprintf('%s::%s', $factoryName, $paymentRequest->getType());
+
+        /** @var PaymentRequestCommandProviderInterface $provider */
+        $provider = $this->paymentRequestCommandProviderLocator->get($id);
+
+        return $provider;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProviderInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProviderInterface.php
new file mode 100644
index 0000000000..a6927abd74
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProviderInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface PaymentRequestCommandProviderInterface
+{
+    public function supports(PaymentRequestInterface $paymentRequest): bool;
+
+    public function handle(PaymentRequestInterface $paymentRequest): object;
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php
new file mode 100644
index 0000000000..7f8c0597ed
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+
+final class PayumApiContext implements PayumApiContextInterface
+{
+    private bool $enabled = false;
+
+    public function isEnabled(): bool
+    {
+        return $this->enabled;
+    }
+
+    public function enable(): void
+    {
+        $this->enabled = true;
+    }
+
+    public function disable(): void
+    {
+        $this->enabled = false;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php
new file mode 100644
index 0000000000..5ea74e5bde
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+
+interface PayumApiContextInterface
+{
+    public function isEnabled(): bool;
+
+    public function enable(): void;
+    public function disable(): void;
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
new file mode 100644
index 0000000000..302320be83
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+
+use Payum\Core\Payum;
+use Payum\Core\Security\TokenAggregateInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Webmozart\Assert\Assert;
+
+final class PayumRequestProcessor implements PayumRequestProcessorInterface
+{
+    public function __construct(
+        private Payum $payum,
+        private PayumApiContextInterface $payumApiContext,
+    ) {
+    }
+
+    public function process( PaymentRequestInterface $paymentRequest, TokenAggregateInterface $request): void
+    {
+        $token = $request->getToken();
+        Assert::notNull($token);
+
+        $gateway = $this->payum->getGateway($token->getGatewayName());
+
+        $this->payumApiContext->enable();
+        $reply = $gateway->execute($request, true);
+        $this->payumApiContext->disable();
+
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment);
+
+        $details = $paymentRequest->getDetails();
+        if (null === $reply) {
+            $details['after_url'] = $token->getAfterUrl();
+        }
+
+        $payment->setDetails($details);
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php
new file mode 100644
index 0000000000..e339e5e9e1
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+
+use Payum\Core\Security\TokenAggregateInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface PayumRequestProcessorInterface
+{
+
+    public function process( PaymentRequestInterface $paymentRequest, TokenAggregateInterface $request): void;
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/PayumCapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/ApiBundle/Payment/PayumCapturePaymentRequestCommandProvider.php
new file mode 100644
index 0000000000..71e5e24b9a
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/PayumCapturePaymentRequestCommandProvider.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\Payum\PayumCapture;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class PayumCapturePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+{
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
+    }
+
+    public function handle(PaymentRequestInterface $paymentRequest): object
+    {
+        return new PayumCapture($paymentRequest->getHash());
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index af075d3b35..50c031418d 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -238,5 +238,16 @@
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
+
+        <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\AddPaymentRequestHandler">
+            <argument type="service" id="sylius.factory.payment" />
+            <argument type="service" id="sylius.repository.payment_method" />
+            <argument type="service" id="sylius.repository.payment" />
+            <argument type="service" id="sylius.manager.payment_request" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProvider" />
+            <argument type="service" id="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
index 95b4fb5172..989e9a1052 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
@@ -22,5 +22,19 @@
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="Sylius\Bundle\ApiBundle\Provider\CompositePaymentConfigurationProvider" />
         </service>
+
+        <service id="sylius.api.payment_request.command_provider.locator" class="Symfony\Component\DependencyInjection\ServiceLocator">
+            <tag name="container.service_locator" />
+        </service>
+
+        <service id="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationChecker">
+            <argument type="service" id="sylius.repository.payment_request" />
+        </service>
+
+        <service id="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProvider">
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationChecker" />
+            <argument type="service" id="sylius.api.payment_request.command_provider.locator" />
+        </service>
+
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml
new file mode 100644
index 0000000000..6c12bb4eee
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml
@@ -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.api.payment_request.command_provider.offline" class="Sylius\Bundle\ApiBundle\Payment\PayumCapturePaymentRequestCommandProvider">
+            <tag name="sylius.api.payment_request.command_provider" factory="offline" type="capture" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml
new file mode 100644
index 0000000000..5293dc25e6
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml
@@ -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.api.payment_request.command_provider.paypal_express_checkout_nvp" class="Sylius\Bundle\ApiBundle\Payment\PayumCapturePaymentRequestCommandProvider">
+            <tag name="sylius.api.payment_request.command_provider" factory="paypal_express_checkout_nvp" type="capture" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/payum.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/payum.xml
new file mode 100644
index 0000000000..044b3cc0dd
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/payum.xml
@@ -0,0 +1,37 @@
+<?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\ApiBundle\CommandHandler\Payment\Payum\PayumCaptureHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="payum" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessor" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+        <service id="sylius.api.payment.payum.context" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumApiContext" />
+
+        <service id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessor">
+            <argument type="service" id="payum" />
+            <argument type="service" id="sylius.api.payment.payum.context" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml
new file mode 100644
index 0000000000..8608439fb9
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml
@@ -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.api.payment_request.command_provider.stripe" class="Sylius\Bundle\ApiBundle\Payment\PayumCapturePaymentRequestCommandProvider">
+            <tag name="sylius.api.payment_request.command_provider" factory="stripe" type="capture" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php b/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
index f74852f938..50bb0ca71a 100644
--- a/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
+++ b/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
@@ -17,6 +17,7 @@ use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\CommandDataTransformerP
 use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\ExtractorMergingCompilerPass;
 use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\FlattenExceptionNormalizerDecoratorCompilerPass;
 use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\LegacyErrorHandlingCompilerPass;
+use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\PaymentRequestCommandProviderPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -27,6 +28,7 @@ final class SyliusApiBundle extends Bundle
         $container->addCompilerPass(new CommandDataTransformerPass());
         $container->addCompilerPass(new FlattenExceptionNormalizerDecoratorCompilerPass());
         $container->addCompilerPass(new LegacyErrorHandlingCompilerPass());
+        $container->addCompilerPass(new PaymentRequestCommandProviderPass());
         $container->addCompilerPass(new ExtractorMergingCompilerPass());
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_payment.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_payment.yml
index 2f3f553141..06bd27ea5f 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_payment.yml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_payment.yml
@@ -12,3 +12,7 @@ sylius_payment:
                 model: Sylius\Component\Core\Model\PaymentMethod
                 repository: Sylius\Bundle\CoreBundle\Doctrine\ORM\PaymentMethodRepository
                 controller: Sylius\Bundle\CoreBundle\Controller\PaymentMethodController
+        payment_request:
+            classes:
+                model: Sylius\Component\Payment\Model\PaymentRequest
+                repository: Sylius\Bundle\PaymentBundle\Doctrine\ORM\PaymentRequestRepository
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
new file mode 100644
index 0000000000..cde996394a
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Doctrine\ORM;
+
+use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Sylius\Component\Payment\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+
+class PaymentRequestRepository extends EntityRepository implements PaymentRequestRepositoryInterface
+{
+    public function findExisting(PaymentInterface $payment, PaymentMethodInterface $paymentMethod, string $type): array
+    {
+            return $this->createQueryBuilder('o')
+                ->innerJoin('o.payment', 'payment')
+                ->innerJoin('o.method', 'method')
+                ->andWhere('o.type = :type')
+                ->andWhere('o.payment = :payment')
+                ->andWhere('o.method = :method')
+                ->setParameter('type', $type)
+                ->setParameter('method', $paymentMethod)
+                ->setParameter('payment', $payment)
+                ->getQuery()
+                ->getResult()
+            ;
+    }
+}
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index 396fa877e8..bf3650c854 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -40,6 +40,11 @@ class PaymentRequest implements PaymentRequestInterface
     }
 
     public function getId(): ?string
+    {
+        return $this->getHash();
+    }
+
+    public function getHash(): ?string
     {
         return $this->hash;
     }
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index 398af790fc..a844a531af 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -38,6 +38,8 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public const DATA_TYPE_PAYOUT = 'payout';
 
+    public function getHash(): ?string;
+
     public function getMethod(): ?PaymentMethodInterface;
 
     public function setMethod(?PaymentMethodInterface $method): void;
diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
new file mode 100644
index 0000000000..98797e75c1
--- /dev/null
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Repository;
+
+use Sylius\Component\Payment\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+interface PaymentRequestRepositoryInterface
+{
+    /**
+     * @return PaymentRequestInterface[]
+     */
+    public function findExisting(PaymentInterface $payment, PaymentMethodInterface $paymentMethod, string $type): array;
+}

From 8b92e854f6b3c646efba7f51b4e0734ddd8c3b3d Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 20 Dec 2023 17:28:37 +0100
Subject: [PATCH 004/200] Finalise Payum POC and 1st try with no Payum using
 Offline payment method

---
 ...aymentStateMachineTransitionApplicator.php |  7 ++
 ...teMachineTransitionApplicatorInterface.php |  2 +
 .../Payment/Offline/CapturePaymentRequest.php | 34 +++++++++
 .../Payment/Offline/StatusPaymentRequest.php  | 34 +++++++++
 .../Command/Payment/Payum/PayumCapture.php    | 13 ----
 .../Payum/PayumCapturePaymentRequest.php      | 20 +++++
 .../Payum/PayumStatusPaymentRequest.php       | 20 +++++
 .../PaymentRequestHashAwareInterface.php      | 22 ++++++
 .../Offline/CapturePaymentRequestHandler.php  | 66 +++++++++++++++++
 .../Payment/Payum/PayumCaptureHandler.php     | 74 -------------------
 .../Payum/PayumPaymentRequestHandler.php      | 48 ++++++++++++
 .../CapturePaymentRequestCommandProvider.php  | 31 ++++++++
 .../PaymentRequestToDetailsConverter.php      | 35 +++++++++
 ...mentRequestToDetailsConverterInterface.php | 21 ++++++
 .../StatusPaymentRequestCommandProvider.php   | 31 ++++++++
 .../Payment/PaymentRequestCommandProvider.php |  3 +-
 .../Action/SyliusApiGetHttpRequestAction.php  | 61 +++++++++++++++
 .../Action/SyliusApiRenderTemplateAction.php  | 46 ++++++++++++
 .../Payment/Payum/PayumApiContext.php         | 17 +++--
 .../Payum/PayumApiContextInterface.php        |  7 +-
 ...umCapturePaymentRequestCommandProvider.php |  7 +-
 .../Payment/Payum/PayumRequestProcessor.php   |  2 +-
 .../Payum/PayumRequestProcessorInterface.php  |  1 -
 ...yumStatusPaymentRequestCommandProvider.php | 22 ++++++
 .../Payment/Payum/PayumTokenFactory.php       | 66 +++++++++++++++++
 .../Payum/PayumTokenFactoryInterface.php      | 22 ++++++
 .../config/services/command_handlers.xml      |  2 +-
 .../payum.xml => payment_request/offline.xml} | 17 ++---
 .../Resources/config/services/payments.xml    |  6 +-
 .../Resources/config/services/payum/all.xml   | 67 +++++++++++++++++
 .../config/services/payum/offline.xml         |  8 +-
 .../config/services/payum/paypal.xml          |  6 +-
 .../config/services/payum/stripe.xml          |  6 +-
 ...ntStateMachineTransitionApplicatorSpec.php | 11 +++
 34 files changed, 719 insertions(+), 116 deletions(-)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/CapturePaymentRequest.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/StatusPaymentRequest.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapture.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapturePaymentRequest.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumStatusPaymentRequest.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumCaptureHandler.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumPaymentRequestHandler.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestCommandProvider.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverter.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverterInterface.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Offline/StatusPaymentRequestCommandProvider.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php
 rename src/Sylius/Bundle/ApiBundle/Payment/{ => Payum}/PayumCapturePaymentRequestCommandProvider.php (62%)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumStatusPaymentRequestCommandProvider.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactoryInterface.php
 rename src/Sylius/Bundle/ApiBundle/Resources/config/services/{payum/payum.xml => payment_request/offline.xml} (52%)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/all.xml

diff --git a/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicator.php b/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicator.php
index ccbe66f3f9..b40c357097 100644
--- a/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicator.php
+++ b/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicator.php
@@ -44,6 +44,13 @@ final class PaymentStateMachineTransitionApplicator implements PaymentStateMachi
         return $data;
     }
 
+    public function process(PaymentInterface $data): PaymentInterface
+    {
+        $this->applyTransition($data, PaymentTransitions::TRANSITION_PROCESS);
+
+        return $data;
+    }
+
     private function applyTransition(PaymentInterface $payment, string $transition): void
     {
         $stateMachine = $this->getStateMachine();
diff --git a/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicatorInterface.php b/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicatorInterface.php
index 4193a7f7f4..aa794e7fc7 100644
--- a/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicatorInterface.php
+++ b/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicatorInterface.php
@@ -18,4 +18,6 @@ use Sylius\Component\Payment\Model\PaymentInterface;
 interface PaymentStateMachineTransitionApplicatorInterface
 {
     public function complete(PaymentInterface $data): PaymentInterface;
+
+    public function process(PaymentInterface $data): PaymentInterface;
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/CapturePaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/CapturePaymentRequest.php
new file mode 100644
index 0000000000..5b1b3c3ee6
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/CapturePaymentRequest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Command\Payment\Offline;
+
+use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+
+class CapturePaymentRequest implements PaymentRequestHashAwareInterface
+{
+    public function __construct(
+        protected string $hash,
+    ) {
+    }
+
+    public function getHash(): string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(string $hash): void
+    {
+        $this->hash = $hash;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/StatusPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/StatusPaymentRequest.php
new file mode 100644
index 0000000000..f014a9fed4
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/StatusPaymentRequest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Command\Payment\Offline;
+
+use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+
+class StatusPaymentRequest implements PaymentRequestHashAwareInterface
+{
+    public function __construct(
+        protected string $hash,
+    ) {
+    }
+
+    public function getHash(): string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(string $hash): void
+    {
+        $this->hash = $hash;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapture.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapture.php
deleted file mode 100644
index 38e653c8b6..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapture.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\Command\Payment\Payum;
-
-class PayumCapture
-{
-    public function __construct(
-        public string $hash,
-    ) {
-    }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapturePaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapturePaymentRequest.php
new file mode 100644
index 0000000000..9fc44d4dc6
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapturePaymentRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Command\Payment\Payum;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\Offline\CapturePaymentRequest;
+
+class PayumCapturePaymentRequest extends CapturePaymentRequest
+{
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumStatusPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumStatusPaymentRequest.php
new file mode 100644
index 0000000000..dbc53b50aa
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumStatusPaymentRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Command\Payment\Payum;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\Offline\StatusPaymentRequest;
+
+class PayumStatusPaymentRequest extends StatusPaymentRequest
+{
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php b/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
new file mode 100644
index 0000000000..f2e075002a
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Command;
+
+/** @experimental */
+interface PaymentRequestHashAwareInterface
+{
+    public function getHash(): string;
+
+    public function setHash(string $hash): void;
+}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
new file mode 100644
index 0000000000..5360bc8258
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment\Offline;
+
+use Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicatorInterface;
+use Sylius\Bundle\ApiBundle\Command\Payment\Offline\CapturePaymentRequest;
+use Sylius\Bundle\ApiBundle\Payment\Offline\PaymentRequestToDetailsConverterInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Webmozart\Assert\Assert;
+
+/** @experimental */
+final class CapturePaymentRequestHandler implements MessageHandlerInterface
+{
+    public const FACTORY_NAME = 'offline';
+
+    public function __construct(
+        private RepositoryInterface $paymentRequestRepository,
+        private PaymentRequestToDetailsConverterInterface $paymentRequestToDetailsConverter,
+        private PaymentStateMachineTransitionApplicatorInterface $paymentStateMachineTransitionApplicator,
+    ) {
+    }
+
+    public function __invoke(CapturePaymentRequest $capturePaymentRequest): void
+    {
+        /** @var PaymentRequestInterface|null $paymentRequest */
+        $paymentRequest = $this->paymentRequestRepository->find($capturePaymentRequest->getHash());
+        Assert::notNull($paymentRequest);
+
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+        Assert::notNull($paymentMethod);
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        Assert::notNull($gatewayConfig);
+        $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
+        Assert::eq($factoryName, self::FACTORY_NAME, 'Expected a factory name equal to %2$s. Got: %s');
+
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment);
+
+        $details = $this->paymentRequestToDetailsConverter->convert($paymentRequest);
+        $paymentRequest->setDetails($details);
+
+        if ($paymentRequest->getDetails()['paid']) {
+            $this->paymentStateMachineTransitionApplicator->complete($payment);
+        } else {
+            $this->paymentStateMachineTransitionApplicator->process($payment);
+        }
+
+        $payment->setDetails($paymentRequest->getDetails());
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumCaptureHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumCaptureHandler.php
deleted file mode 100644
index 43c6966c36..0000000000
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumCaptureHandler.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum;
-
-use Payum\Core\Payum;
-use Payum\Core\Request\Capture;
-use Sylius\Bundle\ApiBundle\Command\Payment\Payum\PayumCapture;
-use Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Webmozart\Assert\Assert;
-
-/** @experimental */
-final class PayumCaptureHandler implements MessageHandlerInterface
-{
-    public function __construct(
-        private RepositoryInterface $paymentRequestRepository,
-        private Payum $payum,
-        private PayumRequestProcessorInterface $payumReplyProcessor,
-    ) {
-    }
-
-    public function __invoke(PayumCapture $payumCapture): void
-    {
-        /** @var PaymentRequestInterface|null $paymentRequest */
-        $paymentRequest = $this->paymentRequestRepository->find($payumCapture->hash);
-        Assert::notNull($paymentRequest);
-
-        /** @var PaymentMethodInterface|null $paymentMethod */
-        $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod);
-
-        $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig);
-
-        $gatewayName = $gatewayConfig->getGatewayName();
-
-        $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment);
-
-        /** @var array|null $data */
-        $data = $paymentRequest->getData();
-        Assert::notNull($data);
-
-        $afterPath = $data['after_path'] ?? null;
-        Assert::notNull($afterPath);
-
-        $afterPathParameters = $data['after_path_parameters'] ?? [];
-
-        $token = $this->payum->getTokenFactory()->createCaptureToken(
-            $gatewayName,
-            $payment,
-            $afterPath,
-            $afterPathParameters
-        );
-
-        $captureRequest = new Capture($token);
-        $this->payumReplyProcessor->process($paymentRequest, $captureRequest);
-    }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumPaymentRequestHandler.php
new file mode 100644
index 0000000000..90a94cdc94
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumPaymentRequestHandler.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum;
+
+use Payum\Core\Security\TokenAggregateInterface;
+use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface;
+use Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactoryInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Webmozart\Assert\Assert;
+
+/** @experimental */
+final class PayumPaymentRequestHandler implements MessageHandlerInterface
+{
+    public function __construct(
+        private RepositoryInterface $paymentRequestRepository,
+        private PayumTokenFactoryInterface $payumTokenFactory,
+        private PayumRequestProcessorInterface $payumReplyProcessor,
+        /** @var class-string<TokenAggregateInterface> */
+        private string $payumRequestClass,
+    ) {
+    }
+
+    public function __invoke(PaymentRequestHashAwareInterface $payumRequest): void
+    {
+        /** @var PaymentRequestInterface|null $paymentRequest */
+        $paymentRequest = $this->paymentRequestRepository->find($payumRequest->getHash());
+        Assert::notNull($paymentRequest);
+
+        $token = $this->payumTokenFactory->createNew($paymentRequest);
+
+        $captureRequest = new $this->payumRequestClass($token);
+        $this->payumReplyProcessor->process($paymentRequest, $captureRequest);
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestCommandProvider.php
new file mode 100644
index 0000000000..28cd3d83fe
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestCommandProvider.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Offline;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\Offline\CapturePaymentRequest;
+use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class CapturePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+{
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
+    }
+
+    public function handle(PaymentRequestInterface $paymentRequest): object
+    {
+        return new CapturePaymentRequest($paymentRequest->getHash());
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverter.php b/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverter.php
new file mode 100644
index 0000000000..a3f6dbb404
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverter.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Offline;
+
+use Sylius\Component\Payment\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Webmozart\Assert\Assert;
+
+final class PaymentRequestToDetailsConverter implements PaymentRequestToDetailsConverterInterface
+{
+    public function convert(PaymentRequestInterface $paymentRequest): array
+    {
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment);
+
+        if (PaymentInterface::STATE_NEW === $payment->getState()) {
+            return [
+                'paid' => false,
+            ];
+        }
+
+        return $payment->getDetails();
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverterInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverterInterface.php
new file mode 100644
index 0000000000..05c79d89ad
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverterInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Offline;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface PaymentRequestToDetailsConverterInterface
+{
+    public function convert(PaymentRequestInterface $paymentRequest): array;
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/StatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/ApiBundle/Payment/Offline/StatusPaymentRequestCommandProvider.php
new file mode 100644
index 0000000000..36bd2d92e8
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Offline/StatusPaymentRequestCommandProvider.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Offline;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\Offline\StatusPaymentRequest;
+use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class StatusPaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+{
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
+    }
+
+    public function handle(PaymentRequestInterface $paymentRequest): object
+    {
+        return new StatusPaymentRequest($paymentRequest->getHash());
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php
index cc3ff4c4d8..1a08a39887 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php
@@ -43,7 +43,7 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
         return $this->getCommandProvider($paymentRequest)->handle($paymentRequest);
     }
 
-    protected function getCommandProvider(PaymentRequestInterface $paymentRequest): PaymentRequestCommandProviderInterface
+    private function getCommandProvider(PaymentRequestInterface $paymentRequest): PaymentRequestCommandProviderInterface
     {
         /** @var PaymentMethodInterface|null $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
@@ -54,6 +54,7 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
         /** @var PaymentRequestCommandProviderInterface $service */
         $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
 
+        /** @todo consider founding better nested service provider */
         $id = sprintf('%s::%s', $factoryName, $paymentRequest->getType());
 
         /** @var PaymentRequestCommandProviderInterface $provider */
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
new file mode 100644
index 0000000000..95dd3c5686
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum\Action;
+
+use Payum\Core\Action\ActionInterface;
+use Payum\Core\Exception\RequestNotSupportedException;
+use Payum\Core\Request\GetHttpRequest;
+use Sylius\Bundle\ApiBundle\Payment\Payum\PayumApiContextInterface;
+use Webmozart\Assert\Assert;
+
+final class SyliusApiGetHttpRequestAction implements ActionInterface
+{
+    public function __construct(
+        private PayumApiContextInterface $payumApiContext,
+    ) {
+    }
+
+    public function execute($request): void
+    {
+        /** @var $request GetHttpRequest */
+        RequestNotSupportedException::assertSupports($this, $request);
+
+        $this->updateRequest($request);
+    }
+
+    private function updateRequest(GetHttpRequest $request): void
+    {
+        $paymentRequest = $this->payumApiContext->getPaymentRequest();
+        Assert::notNull($paymentRequest);
+
+        /** @var array $details */
+        $details = $paymentRequest->getData();
+        $httpRequest = $details['http_request'] ?? [];
+
+        $request->query = $httpRequest['query'];
+        $request->request = $httpRequest['request'];
+        // Not existing property
+        //$request->headers = $httpRequest['headers'];
+        $request->method = $httpRequest['method'] ?? 'POST';
+        $request->uri = $httpRequest['uri'] ?? '';
+        $request->clientIp = $httpRequest['client_ip'] ?? '';
+        $request->userAgent = $httpRequest['user_agent'];
+        $request->content = $httpRequest['content'];
+    }
+
+    public function supports($request): bool
+    {
+        return $this->payumApiContext->isEnabled() && $request instanceof GetHttpRequest;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php
new file mode 100644
index 0000000000..e020cb6c6a
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum\Action;
+
+use Payum\Core\Action\ActionInterface;
+use Payum\Core\Exception\RequestNotSupportedException;
+use Payum\Core\Request\RenderTemplate;
+use Sylius\Bundle\ApiBundle\Payment\Payum\PayumApiContextInterface;
+use Webmozart\Assert\Assert;
+
+final class SyliusApiRenderTemplateAction implements ActionInterface
+{
+    public function __construct(
+        private PayumApiContextInterface $payumApiContext,
+    ) {
+    }
+    public function execute($request): void
+    {
+        /** @var $request RenderTemplate */
+        RequestNotSupportedException::assertSupports($this, $request);
+
+        $paymentRequest = $this->payumApiContext->getPaymentRequest();
+        Assert::notNull($paymentRequest);
+
+        $details = $paymentRequest->getDetails();
+        $paymentRequest->setDetails(array_merge($details, $request->getParameters()));
+
+        $request->setResult('');
+    }
+
+    public function supports($request): bool
+    {
+        return $this->payumApiContext->isEnabled() && $request instanceof RenderTemplate;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php
index 7f8c0597ed..78b64453a3 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php
@@ -13,22 +13,29 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ApiBundle\Payment\Payum;
 
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
 final class PayumApiContext implements PayumApiContextInterface
 {
-    private bool $enabled = false;
+    private ?PaymentRequestInterface $paymentRequest = null;
 
     public function isEnabled(): bool
     {
-        return $this->enabled;
+        return null !== $this->paymentRequest;
     }
 
-    public function enable(): void
+    public function enable(PaymentRequestInterface $paymentRequest): void
     {
-        $this->enabled = true;
+        $this->paymentRequest = $paymentRequest;
+    }
+
+    public function getPaymentRequest(): ?PaymentRequestInterface
+    {
+        return $this->paymentRequest;
     }
 
     public function disable(): void
     {
-        $this->enabled = false;
+        $this->paymentRequest = null;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php
index 5ea74e5bde..4278d8d186 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php
@@ -13,10 +13,15 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ApiBundle\Payment\Payum;
 
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
 interface PayumApiContextInterface
 {
     public function isEnabled(): bool;
 
-    public function enable(): void;
+    public function enable(PaymentRequestInterface $paymentRequest): void;
+
     public function disable(): void;
+
+    public function getPaymentRequest(): ?PaymentRequestInterface;
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/PayumCapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumCapturePaymentRequestCommandProvider.php
similarity index 62%
rename from src/Sylius/Bundle/ApiBundle/Payment/PayumCapturePaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumCapturePaymentRequestCommandProvider.php
index 71e5e24b9a..0fc941be20 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/PayumCapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumCapturePaymentRequestCommandProvider.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment;
+namespace Sylius\Bundle\ApiBundle\Payment\Payum;
 
-use Sylius\Bundle\ApiBundle\Command\Payment\Payum\PayumCapture;
+use Sylius\Bundle\ApiBundle\Command\Payment\Payum\PayumCapturePaymentRequest;
+use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class PayumCapturePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
@@ -16,6 +17,6 @@ final class PayumCapturePaymentRequestCommandProvider implements PaymentRequestC
 
     public function handle(PaymentRequestInterface $paymentRequest): object
     {
-        return new PayumCapture($paymentRequest->getHash());
+        return new PayumCapturePaymentRequest($paymentRequest->getHash());
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
index 302320be83..38d587719a 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
@@ -33,7 +33,7 @@ final class PayumRequestProcessor implements PayumRequestProcessorInterface
 
         $gateway = $this->payum->getGateway($token->getGatewayName());
 
-        $this->payumApiContext->enable();
+        $this->payumApiContext->enable($paymentRequest);
         $reply = $gateway->execute($request, true);
         $this->payumApiContext->disable();
 
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php
index e339e5e9e1..81a9c0cbed 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php
@@ -18,6 +18,5 @@ use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 interface PayumRequestProcessorInterface
 {
-
     public function process( PaymentRequestInterface $paymentRequest, TokenAggregateInterface $request): void;
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumStatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumStatusPaymentRequestCommandProvider.php
new file mode 100644
index 0000000000..34234e5fd1
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumStatusPaymentRequestCommandProvider.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\Payum\PayumStatusPaymentRequest;
+use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class PayumStatusPaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+{
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_STATUS;
+    }
+
+    public function handle(PaymentRequestInterface $paymentRequest): object
+    {
+        return new PayumStatusPaymentRequest($paymentRequest->getHash());
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
new file mode 100644
index 0000000000..db99538daa
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+
+use Payum\Core\Payum;
+use Payum\Core\Security\TokenInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Webmozart\Assert\Assert;
+
+final class PayumTokenFactory implements PayumTokenFactoryInterface
+{
+
+    public function __construct(private Payum $payum)
+    {
+    }
+
+    public function createNew(PaymentRequestInterface $paymentRequest): TokenInterface
+    {
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment);
+
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+        Assert::notNull($paymentMethod);
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        Assert::notNull($gatewayConfig);
+
+        $gatewayName = $gatewayConfig->getGatewayName();
+
+        /** @var array|null $data */
+        $data = $paymentRequest->getData();
+        Assert::notNull($data);
+
+        $targetPath = $data['target_path'] ?? null;
+        Assert::notNull($targetPath);
+
+        $targetPathParameters = $data['target_path_parameters'] ?? [];
+
+        $afterPath = $data['after_path'] ?? null;
+        Assert::notNull($afterPath);
+
+        $afterPathParameters = $data['after_path_parameters'] ?? [];
+
+        return $this->payum->getTokenFactory()->createToken(
+            $gatewayName,
+            $payment,
+            $targetPath,
+            $targetPathParameters,
+            $afterPath,
+            $afterPathParameters,
+        );
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactoryInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactoryInterface.php
new file mode 100644
index 0000000000..ea6462dcb1
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactoryInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+
+use Payum\Core\Security\TokenInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface PayumTokenFactoryInterface
+{
+    public function createNew(PaymentRequestInterface $paymentRequest): TokenInterface;
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 50c031418d..5d7412ea2f 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -244,7 +244,7 @@
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="sylius.manager.payment_request" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProvider" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface" />
             <argument type="service" id="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/payum.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request/offline.xml
similarity index 52%
rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/payum.xml
rename to src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request/offline.xml
index 044b3cc0dd..7c530d81ef 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/payum.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request/offline.xml
@@ -18,20 +18,19 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum\PayumCaptureHandler">
+        <service id="sylius.api.payment_request.command_provider.offline.capture" class="Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestCommandProvider">
+            <tag name="sylius.api.payment_request.command_provider" factory="offline" type="capture" priority="-100" />
+        </service>
+
+        <service id="sylius.api.payment_request.offline.capture" class="Sylius\Bundle\ApiBundle\CommandHandler\Payment\Offline\CapturePaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="payum" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessor" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Offline\PaymentRequestToDetailsConverterInterface" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicatorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
-        <service id="sylius.api.payment.payum.context" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumApiContext" />
-
-        <service id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessor">
-            <argument type="service" id="payum" />
-            <argument type="service" id="sylius.api.payment.payum.context" />
-        </service>
+        <service id="Sylius\Bundle\ApiBundle\Payment\Offline\PaymentRequestToDetailsConverterInterface" class="Sylius\Bundle\ApiBundle\Payment\Offline\PaymentRequestToDetailsConverter" />
 
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
index 989e9a1052..377da87e5f 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
@@ -27,12 +27,12 @@
             <tag name="container.service_locator" />
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationChecker">
+        <service id="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationCheckerInterface" class="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationChecker">
             <argument type="service" id="sylius.repository.payment_request" />
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProvider">
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationChecker" />
+        <service id="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProvider">
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationCheckerInterface" />
             <argument type="service" id="sylius.api.payment_request.command_provider.locator" />
         </service>
 
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/all.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/all.xml
new file mode 100644
index 0000000000..42c657ac64
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/all.xml
@@ -0,0 +1,67 @@
+<?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"
+>
+    <parameters>
+        <parameter key="sylius_api.payment_request.payum.capture.class">Payum\Core\Request\Capture</parameter>
+        <parameter key="sylius_api.payment_request.payum.status.class">Sylius\Bundle\PayumBundle\Request\GetStatus</parameter>
+    </parameters>
+    <services>
+        <defaults public="true" />
+
+        <service id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessor">
+            <argument type="service" id="payum" />
+            <argument type="service" id="sylius.api.payment.payum.context" />
+        </service>
+
+        <service id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactoryInterface" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactory">
+            <argument type="service" id="payum" />
+        </service>
+
+        <service id="sylius.api.payment_request.payum.capture" class="Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum\PayumPaymentRequestHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactoryInterface" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface" />
+            <argument type="string">%sylius_api.payment_request.payum.capture.class%</argument>
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+        <service id="sylius.api.payment_request.payum.status" class="Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum\PayumPaymentRequestHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactoryInterface" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface" />
+            <argument type="string">%sylius_api.payment_request.payum.status.class%</argument>
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+        <service id="sylius.api.payment.payum.context" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumApiContext" />
+
+        <service id="sylius_api.action.get_http_request" class="Sylius\Bundle\ApiBundle\Payment\Payum\Action\SyliusApiGetHttpRequestAction">
+            <argument type="service" id="sylius.api.payment.payum.context" />
+
+            <tag name="payum.action" all="true" prepend="true" />
+        </service>
+
+        <service id="sylius_api.action.render_template" class="Sylius\Bundle\ApiBundle\Payment\Payum\Action\SyliusApiRenderTemplateAction">
+            <argument type="service" id="sylius.api.payment.payum.context" />
+
+            <tag name="payum.action" all="true" prepend="true" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml
index 6c12bb4eee..4f5b8fc87a 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml
@@ -18,8 +18,12 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.api.payment_request.command_provider.offline" class="Sylius\Bundle\ApiBundle\Payment\PayumCapturePaymentRequestCommandProvider">
-            <tag name="sylius.api.payment_request.command_provider" factory="offline" type="capture" />
+        <service id="sylius.api.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumCapturePaymentRequestCommandProvider">
+            <tag name="sylius.api.payment_request.command_provider" factory="offline" type="capture" priority="-200" />
+        </service>
+
+        <service id="sylius.api.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumStatusPaymentRequestCommandProvider">
+            <tag name="sylius.api.payment_request.command_provider" factory="offline" type="status" priority="-200" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml
index 5293dc25e6..4b8a93dd56 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml
@@ -18,9 +18,13 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.api.payment_request.command_provider.paypal_express_checkout_nvp" class="Sylius\Bundle\ApiBundle\Payment\PayumCapturePaymentRequestCommandProvider">
+        <service id="sylius.api.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumCapturePaymentRequestCommandProvider">
             <tag name="sylius.api.payment_request.command_provider" factory="paypal_express_checkout_nvp" type="capture" />
         </service>
 
+        <service id="sylius.api.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumStatusPaymentRequestCommandProvider">
+            <tag name="sylius.api.payment_request.command_provider" factory="paypal_express_checkout_nvp" type="status" />
+        </service>
+
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml
index 8608439fb9..6fae63e2e2 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml
@@ -18,9 +18,13 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.api.payment_request.command_provider.stripe" class="Sylius\Bundle\ApiBundle\Payment\PayumCapturePaymentRequestCommandProvider">
+        <service id="sylius.api.payment_request.command_provider.payum.stripe.capture" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumCapturePaymentRequestCommandProvider">
             <tag name="sylius.api.payment_request.command_provider" factory="stripe" type="capture" />
         </service>
 
+        <service id="sylius.api.payment_request.command_provider.payum.stripe.status" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumStatusPaymentRequestCommandProvider">
+            <tag name="sylius.api.payment_request.command_provider" factory="stripe" type="status" />
+        </service>
+
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/spec/Applicator/PaymentStateMachineTransitionApplicatorSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Applicator/PaymentStateMachineTransitionApplicatorSpec.php
index 3b568d505b..17697f8551 100644
--- a/src/Sylius/Bundle/ApiBundle/spec/Applicator/PaymentStateMachineTransitionApplicatorSpec.php
+++ b/src/Sylius/Bundle/ApiBundle/spec/Applicator/PaymentStateMachineTransitionApplicatorSpec.php
@@ -40,6 +40,17 @@ final class PaymentStateMachineTransitionApplicatorSpec extends ObjectBehavior
         $this->complete($payment);
     }
 
+    function it_process_payment(
+        StateMachineFactoryInterface $stateMachineFactory,
+        PaymentInterface $payment,
+        WinzouStateMachine $stateMachine,
+    ): void {
+        $stateMachineFactory->get($payment, PaymentTransitions::GRAPH)->willReturn($stateMachine);
+        $stateMachine->apply(PaymentTransitions::TRANSITION_PROCESS)->shouldBeCalled();
+
+        $this->process($payment);
+    }
+
     function it_throws_exception_if_cannot_complete_payment(
         StateMachineFactoryInterface $stateMachineFactory,
         PaymentInterface $payment,

From 73cd74d55b219a840efa0e98d02950d5e9709c9a Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 21 Dec 2023 11:16:03 +0100
Subject: [PATCH 005/200] Rename data to payload

---
 .../Payment/AddPaymentRequestHandler.php              |  2 +-
 .../Payment/Offline/CapturePaymentRequestHandler.php  |  3 +--
 .../Payum/Action/SyliusApiGetHttpRequestAction.php    |  2 +-
 .../ApiBundle/Payment/Payum/PayumTokenFactory.php     |  2 +-
 .../Resources/config/api_resources/PaymentRequest.xml |  2 +-
 .../Resources/config/serialization/PaymentRequest.xml |  2 +-
 .../config/doctrine/model/PaymentRequest.orm.xml      |  2 +-
 src/Sylius/Component/Payment/Model/PaymentRequest.php | 11 +++++------
 .../Payment/Model/PaymentRequestInterface.php         | 10 ++--------
 .../Payment/spec/Model/PaymentRequestSpec.php         |  6 +++---
 10 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index d3448fe23f..3ec500243c 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -68,7 +68,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         $paymentRequest->setPayment($payment);
         $paymentRequest->setMethod($paymentMethod);
         $paymentRequest->setType($addPaymentRequest->type);
-        $paymentRequest->setData($addPaymentRequest->data);
+        $paymentRequest->setPayload($addPaymentRequest->data);
 
         $this->paymentRequestManager->persist($paymentRequest);
         return $paymentRequest;
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
index 5360bc8258..771c08ae4d 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
@@ -54,13 +54,12 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
 
         $details = $this->paymentRequestToDetailsConverter->convert($paymentRequest);
         $paymentRequest->setDetails($details);
+        $payment->setDetails($details);
 
         if ($paymentRequest->getDetails()['paid']) {
             $this->paymentStateMachineTransitionApplicator->complete($payment);
         } else {
             $this->paymentStateMachineTransitionApplicator->process($payment);
         }
-
-        $payment->setDetails($paymentRequest->getDetails());
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
index 95dd3c5686..0e7c456278 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
@@ -40,7 +40,7 @@ final class SyliusApiGetHttpRequestAction implements ActionInterface
         Assert::notNull($paymentRequest);
 
         /** @var array $details */
-        $details = $paymentRequest->getData();
+        $details = $paymentRequest->getPayload();
         $httpRequest = $details['http_request'] ?? [];
 
         $request->query = $httpRequest['query'];
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
index db99538daa..24c920cc4b 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
@@ -41,7 +41,7 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
         $gatewayName = $gatewayConfig->getGatewayName();
 
         /** @var array|null $data */
-        $data = $paymentRequest->getData();
+        $data = $paymentRequest->getPayload();
         Assert::notNull($data);
 
         $targetPath = $data['target_path'] ?? null;
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
index d70cdbb062..c809834789 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -62,7 +62,7 @@
         <property name="createdAt" writable="false" />
         <property name="updatedAt" writable="false" />
         <property name="state" writable="false" />
-        <property name="data" writable="true" />
+        <property name="payload" writable="true" />
         <property name="details" writable="false" />
     </resource>
 </resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
index acd2b6aa94..8c64fcea8b 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -36,7 +36,7 @@
             <group>admin:payment_request:read</group>
             <group>shop:payment_request:read</group>
         </attribute>
-        <attribute name="data">
+        <attribute name="payload">
             <group>admin:payment_request:read</group>
             <group>shop:payment_request:read</group>
         </attribute>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index 992e2712ba..bfbbc5334f 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -30,7 +30,7 @@
 
         <field name="state" column="state" type="string" />
         <field name="type" column="type" type="string" />
-        <field name="data" column="data" type="object" />
+        <field name="payload" column="payload" type="object" />
         <field name="details" column="details" type="json" />
 
         <field name="createdAt" column="created_at" type="datetime">
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index bf3650c854..a2ab136053 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -29,9 +29,8 @@ class PaymentRequest implements PaymentRequestInterface
 
     protected string $type = PaymentRequestInterface::DATA_TYPE_CAPTURE;
 
-    protected mixed $data = null;
+    protected mixed $payload = null;
 
-    /** @var mixed[] */
     protected array $details = [];
 
     public function __construct()
@@ -89,14 +88,14 @@ class PaymentRequest implements PaymentRequestInterface
         $this->type = $type;
     }
 
-    public function getData(): mixed
+    public function getPayload(): mixed
     {
-        return $this->data;
+        return $this->payload;
     }
 
-    public function setData(mixed $data): void
+    public function setPayload(mixed $payload): void
     {
-        $this->data = $data;
+        $this->payload = $payload;
     }
 
     public function getDetails(): array
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index a844a531af..7029b44765 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -56,17 +56,11 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public function setType(string $type): void;
 
-    public function getData(): mixed;
+    public function getPayload(): mixed;
 
-    public function setData(mixed $data): void;
+    public function setPayload(mixed $payload): void;
 
-    /**
-     * @return mixed[]
-     */
     public function getDetails(): array;
 
-    /**
-     * @param mixed[] $details
-     */
     public function setDetails(array $details): void;
 }
diff --git a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
index ad15f1bd31..edefb33ae5 100644
--- a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
+++ b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
@@ -77,14 +77,14 @@ final class PaymentRequestSpec extends ObjectBehavior
 
     function it_has_null_data_by_default(): void
     {
-        $this->getData()->shouldReturn(null);
+        $this->getPayload()->shouldReturn(null);
     }
 
     function its_data_is_mutable(): void
     {
         $stdClass = new stdClass();
-        $this->setData($stdClass);
-        $this->getData()->shouldReturn($stdClass);
+        $this->setPayload($stdClass);
+        $this->getPayload()->shouldReturn($stdClass);
     }
 
     function it_has_empty_array_details_by_default(): void

From ff3e8e0ce197d5ce7d24f2d4a9ce80f7e26f4e1f Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:07:28 +0100
Subject: [PATCH 006/200] Rename input/output data to
 requestPayload/responseData

---
 .../Payment/AddPaymentRequestHandler.php      |  2 +-
 .../Offline/CapturePaymentRequestHandler.php  |  6 +++---
 .../PaymentRequestCommandProviderPass.php     |  5 ++++-
 .../Action/SyliusApiGetHttpRequestAction.php  |  4 ++--
 .../Action/SyliusApiRenderTemplateAction.php  |  4 ++--
 .../Payment/Payum/PayumRequestProcessor.php   |  3 ---
 .../Payment/Payum/PayumTokenFactory.php       |  2 +-
 .../config/api_resources/PaymentRequest.xml   |  4 ++--
 .../config/serialization/PaymentRequest.xml   |  4 ++--
 .../doctrine/model/PaymentRequest.orm.xml     |  4 ++--
 .../Payment/Model/PaymentRequest.php          | 20 +++++++++----------
 .../Payment/Model/PaymentRequestInterface.php | 10 ++++++----
 .../Payment/spec/Model/PaymentRequestSpec.php | 12 +++++------
 13 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 3ec500243c..9602e61073 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -68,7 +68,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         $paymentRequest->setPayment($payment);
         $paymentRequest->setMethod($paymentMethod);
         $paymentRequest->setType($addPaymentRequest->type);
-        $paymentRequest->setPayload($addPaymentRequest->data);
+        $paymentRequest->setRequestPayload($addPaymentRequest->data);
 
         $this->paymentRequestManager->persist($paymentRequest);
         return $paymentRequest;
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
index 771c08ae4d..889cced3b9 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
@@ -53,10 +53,10 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
         Assert::notNull($payment);
 
         $details = $this->paymentRequestToDetailsConverter->convert($paymentRequest);
-        $paymentRequest->setDetails($details);
-        $payment->setDetails($details);
+        $paymentRequest->setResponseData($details);
+        // @todo modify Payment->getDetails() to retrieve last payment request `responseData`
 
-        if ($paymentRequest->getDetails()['paid']) {
+        if ($details['paid']) {
             $this->paymentStateMachineTransitionApplicator->complete($payment);
         } else {
             $this->paymentStateMachineTransitionApplicator->process($payment);
diff --git a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php b/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
index 908cd8c454..2f1a078b45 100644
--- a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
+++ b/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
@@ -34,7 +34,10 @@ final class PaymentRequestCommandProviderPass implements CompilerPassInterface
                 );
 
                 $commandProviders[sprintf('%s::%s', $factoryName, $type)] = new Reference($serviceId);
-            }
+            }// offline::capture,
+            // stripe::capture
+            // stripe::status
+            // stripe::refund
         }
 
         $container->getDefinition('sylius.api.payment_request.command_provider.locator')->addArgument($commandProviders);
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
index 0e7c456278..09ffe68d69 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
@@ -40,13 +40,13 @@ final class SyliusApiGetHttpRequestAction implements ActionInterface
         Assert::notNull($paymentRequest);
 
         /** @var array $details */
-        $details = $paymentRequest->getPayload();
+        $details = $paymentRequest->getRequestPayload();
         $httpRequest = $details['http_request'] ?? [];
 
         $request->query = $httpRequest['query'];
         $request->request = $httpRequest['request'];
         // Not existing property
-        //$request->headers = $httpRequest['headers'];
+        $request->headers = $httpRequest['headers'];
         $request->method = $httpRequest['method'] ?? 'POST';
         $request->uri = $httpRequest['uri'] ?? '';
         $request->clientIp = $httpRequest['client_ip'] ?? '';
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php
index e020cb6c6a..0c7641d74e 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php
@@ -33,8 +33,8 @@ final class SyliusApiRenderTemplateAction implements ActionInterface
         $paymentRequest = $this->payumApiContext->getPaymentRequest();
         Assert::notNull($paymentRequest);
 
-        $details = $paymentRequest->getDetails();
-        $paymentRequest->setDetails(array_merge($details, $request->getParameters()));
+        $details = $paymentRequest->getResponseData();
+        $paymentRequest->setResponseData(array_merge($details, $request->getParameters()));
 
         $request->setResult('');
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
index 38d587719a..1abc713afb 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
@@ -40,11 +40,8 @@ final class PayumRequestProcessor implements PayumRequestProcessorInterface
         $payment = $paymentRequest->getPayment();
         Assert::notNull($payment);
 
-        $details = $paymentRequest->getDetails();
         if (null === $reply) {
             $details['after_url'] = $token->getAfterUrl();
         }
-
-        $payment->setDetails($details);
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
index 24c920cc4b..833d254770 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
@@ -41,7 +41,7 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
         $gatewayName = $gatewayConfig->getGatewayName();
 
         /** @var array|null $data */
-        $data = $paymentRequest->getPayload();
+        $data = $paymentRequest->getRequestPayload();
         Assert::notNull($data);
 
         $targetPath = $data['target_path'] ?? null;
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
index c809834789..9b05ee9b12 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -62,7 +62,7 @@
         <property name="createdAt" writable="false" />
         <property name="updatedAt" writable="false" />
         <property name="state" writable="false" />
-        <property name="payload" writable="true" />
-        <property name="details" writable="false" />
+        <property name="requestPayload" writable="true" />
+        <property name="responseData" writable="false" />
     </resource>
 </resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
index 8c64fcea8b..dd280a5e69 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -36,11 +36,11 @@
             <group>admin:payment_request:read</group>
             <group>shop:payment_request:read</group>
         </attribute>
-        <attribute name="payload">
+        <attribute name="requestPayload">
             <group>admin:payment_request:read</group>
             <group>shop:payment_request:read</group>
         </attribute>
-        <attribute name="details">
+        <attribute name="responseData">
             <group>admin:payment_request:read</group>
             <group>shop:payment_request:read</group>
         </attribute>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index bfbbc5334f..34ea8cbf19 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -30,8 +30,8 @@
 
         <field name="state" column="state" type="string" />
         <field name="type" column="type" type="string" />
-        <field name="payload" column="payload" type="object" />
-        <field name="details" column="details" type="json" />
+        <field name="requestPayload" column="request_payload" type="object" />
+        <field name="responseData" column="response_data" type="json" />
 
         <field name="createdAt" column="created_at" type="datetime">
             <gedmo:timestampable on="create"/>
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index a2ab136053..2880153b3f 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -29,9 +29,9 @@ class PaymentRequest implements PaymentRequestInterface
 
     protected string $type = PaymentRequestInterface::DATA_TYPE_CAPTURE;
 
-    protected mixed $payload = null;
+    protected mixed $requestPayload = null;
 
-    protected array $details = [];
+    protected array $responseData = [];
 
     public function __construct()
     {
@@ -88,23 +88,23 @@ class PaymentRequest implements PaymentRequestInterface
         $this->type = $type;
     }
 
-    public function getPayload(): mixed
+    public function getRequestPayload(): mixed
     {
-        return $this->payload;
+        return $this->requestPayload;
     }
 
-    public function setPayload(mixed $payload): void
+    public function setRequestPayload(mixed $requestPayload): void
     {
-        $this->payload = $payload;
+        $this->requestPayload = $requestPayload;
     }
 
-    public function getDetails(): array
+    public function getResponseData(): array
     {
-        return $this->details;
+        return $this->responseData;
     }
 
-    public function setDetails(array $details): void
+    public function setResponseData(array $responseData): void
     {
-        $this->details = $details;
+        $this->responseData = $responseData;
     }
 }
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index 7029b44765..554d488f94 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -32,6 +32,8 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public const DATA_TYPE_AUTHORIZE = 'authorize';
 
+    public const DATA_TYPE_REFUND = 'refund';
+
     public const DATA_TYPE_STATUS = 'status';
 
     public const DATA_TYPE_SYNC = 'sync';
@@ -56,11 +58,11 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public function setType(string $type): void;
 
-    public function getPayload(): mixed;
+    public function getRequestPayload(): mixed;
 
-    public function setPayload(mixed $payload): void;
+    public function setRequestPayload(mixed $requestPayload): void;
 
-    public function getDetails(): array;
+    public function getResponseData(): array;
 
-    public function setDetails(array $details): void;
+    public function setResponseData(array $responseData): void;
 }
diff --git a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
index edefb33ae5..dad5d6a8aa 100644
--- a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
+++ b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
@@ -77,25 +77,25 @@ final class PaymentRequestSpec extends ObjectBehavior
 
     function it_has_null_data_by_default(): void
     {
-        $this->getPayload()->shouldReturn(null);
+        $this->getRequestPayload()->shouldReturn(null);
     }
 
     function its_data_is_mutable(): void
     {
         $stdClass = new stdClass();
-        $this->setPayload($stdClass);
-        $this->getPayload()->shouldReturn($stdClass);
+        $this->setRequestPayload($stdClass);
+        $this->getRequestPayload()->shouldReturn($stdClass);
     }
 
     function it_has_empty_array_details_by_default(): void
     {
-        $this->getDetails()->shouldReturn([]);
+        $this->getResponseData()->shouldReturn([]);
     }
 
     function its_details_are_mutable(): void
     {
-        $this->setDetails(['foo', 'bar']);
-        $this->getDetails()->shouldReturn(['foo', 'bar']);
+        $this->setResponseData(['foo', 'bar']);
+        $this->getResponseData()->shouldReturn(['foo', 'bar']);
     }
 
     function it_initializes_creation_date_by_default(): void

From f6fb4d8538a1a42ba5b485d08dd41d97b3a37846 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:13:11 +0100
Subject: [PATCH 007/200] Move Payum stuff to PayumBundle

---
 .../Command/Payment/AddPaymentRequest.php     |  2 +-
 .../Payum/PayumCapturePaymentRequest.php      | 20 ------
 .../Payum/PayumStatusPaymentRequest.php       | 20 ------
 .../Payment/AddPaymentRequestHandler.php      |  2 +-
 .../Offline/CapturePaymentRequestHandler.php  | 10 +--
 ...php => CapturePaymentRequestProcessor.php} | 10 +--
 ...pturePaymentRequestProcessorInterface.php} |  4 +-
 .../Commands/Payment/AddPaymentRequest.xml    | 35 +++++++++++
 ...ffline.xml => payment_request_offline.xml} |  4 +-
 .../Action/SyliusApiGetHttpRequestAction.php  | 10 +--
 .../Action/SyliusApiRenderTemplateAction.php  |  4 +-
 .../Api}/PayumApiContext.php                  |  2 +-
 .../Api}/PayumApiContextInterface.php         |  2 +-
 ...umCapturePaymentRequestCommandProvider.php |  6 +-
 .../Api}/PayumRequestProcessor.php            |  2 +-
 .../Api}/PayumRequestProcessorInterface.php   |  2 +-
 ...yumStatusPaymentRequestCommandProvider.php |  6 +-
 .../Api}/PayumTokenFactory.php                | 16 ++---
 .../Api}/PayumTokenFactoryInterface.php       |  2 +-
 .../Command/CapturePaymentRequest.php         | 34 ++++++++++
 .../Command/StatusPaymentRequest.php          | 34 ++++++++++
 .../CommandHandler/PaymentRequestHandler.php} |  8 +--
 .../UnregisterPaypalGatewayTypePass.php       | 35 -----------
 .../UnregisterStripeGatewayTypePass.php       | 32 ----------
 .../SyliusPayumExtension.php                  | 62 +++++++++++++++----
 .../config/integrations}/offline.xml          |  0
 .../Resources/config/integrations}/paypal.xml |  0
 .../Resources/config/integrations}/stripe.xml |  0
 .../config/integrations/sylius_api.xml}       | 22 +++----
 .../PayumBundle/Resources/config/paypal.xml   | 36 +++++++++++
 .../Resources/config/services/action.xml      |  6 --
 .../Resources/config/services/form.xml        | 10 ---
 .../PayumBundle/Resources/config/stripe.xml   | 31 ++++++++++
 .../Bundle/PayumBundle/SyliusPayumBundle.php  |  4 --
 src/Sylius/Bundle/PayumBundle/composer.json   |  5 +-
 35 files changed, 282 insertions(+), 196 deletions(-)
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapturePaymentRequest.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumStatusPaymentRequest.php
 rename src/Sylius/Bundle/ApiBundle/Payment/Offline/{PaymentRequestToDetailsConverter.php => CapturePaymentRequestProcessor.php} (63%)
 rename src/Sylius/Bundle/ApiBundle/Payment/Offline/{PaymentRequestToDetailsConverterInterface.php => CapturePaymentRequestProcessorInterface.php} (73%)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
 rename src/Sylius/Bundle/ApiBundle/Resources/config/services/{payment_request/offline.xml => payment_request_offline.xml} (85%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle}/Action/SyliusApiGetHttpRequestAction.php (85%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle}/Action/SyliusApiRenderTemplateAction.php (90%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle/Api}/PayumApiContext.php (94%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle/Api}/PayumApiContextInterface.php (92%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle/Api}/PayumCapturePaymentRequestCommandProvider.php (72%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle/Api}/PayumRequestProcessor.php (96%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle/Api}/PayumRequestProcessorInterface.php (91%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle/Api}/PayumStatusPaymentRequestCommandProvider.php (73%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle/Api}/PayumTokenFactory.php (76%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Payum => PayumBundle/Api}/PayumTokenFactoryInterface.php (90%)
 create mode 100644 src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php
 rename src/Sylius/Bundle/{ApiBundle/CommandHandler/Payment/Payum/PayumPaymentRequestHandler.php => PayumBundle/CommandHandler/PaymentRequestHandler.php} (83%)
 delete mode 100644 src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/UnregisterPaypalGatewayTypePass.php
 delete mode 100644 src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/UnregisterStripeGatewayTypePass.php
 rename src/Sylius/Bundle/{ApiBundle/Resources/config/services/payum => PayumBundle/Resources/config/integrations}/offline.xml (100%)
 rename src/Sylius/Bundle/{ApiBundle/Resources/config/services/payum => PayumBundle/Resources/config/integrations}/paypal.xml (100%)
 rename src/Sylius/Bundle/{ApiBundle/Resources/config/services/payum => PayumBundle/Resources/config/integrations}/stripe.xml (100%)
 rename src/Sylius/Bundle/{ApiBundle/Resources/config/services/payum/all.xml => PayumBundle/Resources/config/integrations/sylius_api.xml} (67%)
 create mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/paypal.xml
 create mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/stripe.xml

diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index 82e56b72d4..6bc6d8243b 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -22,7 +22,7 @@ class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
 {
     public function __construct(
         public string $type,
-        public mixed $data,
+        public mixed $requestPayload,
         public ?string $paymentId,
         public ?string $paymentMethodCode,
     ) {
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapturePaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapturePaymentRequest.php
deleted file mode 100644
index 9fc44d4dc6..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumCapturePaymentRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\Command\Payment\Payum;
-
-use Sylius\Bundle\ApiBundle\Command\Payment\Offline\CapturePaymentRequest;
-
-class PayumCapturePaymentRequest extends CapturePaymentRequest
-{
-}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumStatusPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumStatusPaymentRequest.php
deleted file mode 100644
index dbc53b50aa..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/Payum/PayumStatusPaymentRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\Command\Payment\Payum;
-
-use Sylius\Bundle\ApiBundle\Command\Payment\Offline\StatusPaymentRequest;
-
-class PayumStatusPaymentRequest extends StatusPaymentRequest
-{
-}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 9602e61073..cb10665cc7 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -68,7 +68,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         $paymentRequest->setPayment($payment);
         $paymentRequest->setMethod($paymentMethod);
         $paymentRequest->setType($addPaymentRequest->type);
-        $paymentRequest->setRequestPayload($addPaymentRequest->data);
+        $paymentRequest->setRequestPayload($addPaymentRequest->requestPayload);
 
         $this->paymentRequestManager->persist($paymentRequest);
         return $paymentRequest;
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
index 889cced3b9..cf62579c1c 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment\Offline;
 
 use Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicatorInterface;
 use Sylius\Bundle\ApiBundle\Command\Payment\Offline\CapturePaymentRequest;
-use Sylius\Bundle\ApiBundle\Payment\Offline\PaymentRequestToDetailsConverterInterface;
+use Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestProcessorInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
@@ -29,7 +29,7 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
 
     public function __construct(
         private RepositoryInterface $paymentRequestRepository,
-        private PaymentRequestToDetailsConverterInterface $paymentRequestToDetailsConverter,
+        private CapturePaymentRequestProcessorInterface $capturePaymentRequestProcessor,
         private PaymentStateMachineTransitionApplicatorInterface $paymentStateMachineTransitionApplicator,
     ) {
     }
@@ -52,11 +52,11 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
         $payment = $paymentRequest->getPayment();
         Assert::notNull($payment);
 
-        $details = $this->paymentRequestToDetailsConverter->convert($paymentRequest);
-        $paymentRequest->setResponseData($details);
+        $this->capturePaymentRequestProcessor->process($paymentRequest);
+
         // @todo modify Payment->getDetails() to retrieve last payment request `responseData`
 
-        if ($details['paid']) {
+        if ($paymentRequest->getResponseData()['paid']) {
             $this->paymentStateMachineTransitionApplicator->complete($payment);
         } else {
             $this->paymentStateMachineTransitionApplicator->process($payment);
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverter.php b/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessor.php
similarity index 63%
rename from src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverter.php
rename to src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessor.php
index a3f6dbb404..eabf53ec1e 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverter.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessor.php
@@ -17,19 +17,21 @@ use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Webmozart\Assert\Assert;
 
-final class PaymentRequestToDetailsConverter implements PaymentRequestToDetailsConverterInterface
+final class CapturePaymentRequestProcessor implements CapturePaymentRequestProcessorInterface
 {
-    public function convert(PaymentRequestInterface $paymentRequest): array
+    public function process(PaymentRequestInterface $paymentRequest): void
     {
         $payment = $paymentRequest->getPayment();
         Assert::notNull($payment);
 
+        $responseData = $payment->getDetails();
         if (PaymentInterface::STATE_NEW === $payment->getState()) {
-            return [
+            $responseData = [
                 'paid' => false,
             ];
         }
 
-        return $payment->getDetails();
+        $paymentRequest->setResponseData($responseData);
+        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED);
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverterInterface.php b/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessorInterface.php
similarity index 73%
rename from src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverterInterface.php
rename to src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessorInterface.php
index 05c79d89ad..5d66d98c18 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Offline/PaymentRequestToDetailsConverterInterface.php
+++ b/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessorInterface.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\ApiBundle\Payment\Offline;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface PaymentRequestToDetailsConverterInterface
+interface CapturePaymentRequestProcessorInterface
 {
-    public function convert(PaymentRequestInterface $paymentRequest): array;
+    public function process(PaymentRequestInterface $paymentRequest): void;
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
new file mode 100644
index 0000000000..ce75fb1877
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+
+<!--
+
+ 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.
+
+-->
+
+<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
+>
+    <class name="Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest">
+        <attribute name="type">
+            <group>shop:payment_request:create</group>
+        </attribute>
+        <attribute name="requestPayload">
+            <group>shop:payment_request:create</group>
+        </attribute>
+        <attribute name="paymentId">
+            <group>shop:payment_request:create</group>
+        </attribute>
+        <attribute name="paymentMethodCode">
+            <group>shop:payment_request:create</group>
+        </attribute>
+        <attribute name="">
+            <group>shop:payment_request:create</group>
+        </attribute>
+    </class>
+</serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request/offline.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request_offline.xml
similarity index 85%
rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request/offline.xml
rename to src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request_offline.xml
index 7c530d81ef..b55f84c9f2 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request/offline.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request_offline.xml
@@ -24,13 +24,13 @@
 
         <service id="sylius.api.payment_request.offline.capture" class="Sylius\Bundle\ApiBundle\CommandHandler\Payment\Offline\CapturePaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Offline\PaymentRequestToDetailsConverterInterface" />
+            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestProcessorInterface" />
             <argument type="service" id="Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicatorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\Payment\Offline\PaymentRequestToDetailsConverterInterface" class="Sylius\Bundle\ApiBundle\Payment\Offline\PaymentRequestToDetailsConverter" />
+        <service id="Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestProcessorInterface" class="Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestProcessor" />
 
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php b/src/Sylius/Bundle/PayumBundle/Action/SyliusApiGetHttpRequestAction.php
similarity index 85%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
rename to src/Sylius/Bundle/PayumBundle/Action/SyliusApiGetHttpRequestAction.php
index 09ffe68d69..882486714f 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/SyliusApiGetHttpRequestAction.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum\Action;
+namespace Sylius\Bundle\PayumBundle\Action;
 
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\GetHttpRequest;
-use Sylius\Bundle\ApiBundle\Payment\Payum\PayumApiContextInterface;
+use Sylius\Bundle\PayumBundle\Api\PayumApiContextInterface;
 use Webmozart\Assert\Assert;
 
 final class SyliusApiGetHttpRequestAction implements ActionInterface
@@ -39,9 +39,9 @@ final class SyliusApiGetHttpRequestAction implements ActionInterface
         $paymentRequest = $this->payumApiContext->getPaymentRequest();
         Assert::notNull($paymentRequest);
 
-        /** @var array $details */
-        $details = $paymentRequest->getRequestPayload();
-        $httpRequest = $details['http_request'] ?? [];
+        /** @var array $payload */
+        $payload = $paymentRequest->getRequestPayload();
+        $httpRequest = $payload['http_request'] ?? [];
 
         $request->query = $httpRequest['query'];
         $request->request = $httpRequest['request'];
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php b/src/Sylius/Bundle/PayumBundle/Action/SyliusApiRenderTemplateAction.php
similarity index 90%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php
rename to src/Sylius/Bundle/PayumBundle/Action/SyliusApiRenderTemplateAction.php
index 0c7641d74e..4e4d58a849 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/Action/SyliusApiRenderTemplateAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/SyliusApiRenderTemplateAction.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum\Action;
+namespace Sylius\Bundle\PayumBundle\Action;
 
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\RenderTemplate;
-use Sylius\Bundle\ApiBundle\Payment\Payum\PayumApiContextInterface;
+use Sylius\Bundle\PayumBundle\Api\PayumApiContextInterface;
 use Webmozart\Assert\Assert;
 
 final class SyliusApiRenderTemplateAction implements ActionInterface
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php b/src/Sylius/Bundle/PayumBundle/Api/PayumApiContext.php
similarity index 94%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php
rename to src/Sylius/Bundle/PayumBundle/Api/PayumApiContext.php
index 78b64453a3..f34058ef22 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContext.php
+++ b/src/Sylius/Bundle/PayumBundle/Api/PayumApiContext.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\Api;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php b/src/Sylius/Bundle/PayumBundle/Api/PayumApiContextInterface.php
similarity index 92%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php
rename to src/Sylius/Bundle/PayumBundle/Api/PayumApiContextInterface.php
index 4278d8d186..bedf49622e 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumApiContextInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Api/PayumApiContextInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\Api;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumCapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/PayumBundle/Api/PayumCapturePaymentRequestCommandProvider.php
similarity index 72%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumCapturePaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PayumBundle/Api/PayumCapturePaymentRequestCommandProvider.php
index 0fc941be20..20ad74ec82 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumCapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/Api/PayumCapturePaymentRequestCommandProvider.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\Api;
 
-use Sylius\Bundle\ApiBundle\Command\Payment\Payum\PayumCapturePaymentRequest;
 use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class PayumCapturePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
@@ -17,6 +17,6 @@ final class PayumCapturePaymentRequestCommandProvider implements PaymentRequestC
 
     public function handle(PaymentRequestInterface $paymentRequest): object
     {
-        return new PayumCapturePaymentRequest($paymentRequest->getHash());
+        return new CapturePaymentRequest($paymentRequest->getHash());
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php b/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessor.php
similarity index 96%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
rename to src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessor.php
index 1abc713afb..45f56ec449 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessor.php
+++ b/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessor.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\Api;
 
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenAggregateInterface;
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php b/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessorInterface.php
similarity index 91%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php
rename to src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessorInterface.php
index 81a9c0cbed..7d704b4368 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\Api;
 
 use Payum\Core\Security\TokenAggregateInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumStatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/PayumBundle/Api/PayumStatusPaymentRequestCommandProvider.php
similarity index 73%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumStatusPaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PayumBundle/Api/PayumStatusPaymentRequestCommandProvider.php
index 34234e5fd1..bd60b82147 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumStatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/Api/PayumStatusPaymentRequestCommandProvider.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\Api;
 
-use Sylius\Bundle\ApiBundle\Command\Payment\Payum\PayumStatusPaymentRequest;
 use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class PayumStatusPaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
@@ -17,6 +17,6 @@ final class PayumStatusPaymentRequestCommandProvider implements PaymentRequestCo
 
     public function handle(PaymentRequestInterface $paymentRequest): object
     {
-        return new PayumStatusPaymentRequest($paymentRequest->getHash());
+        return new StatusPaymentRequest($paymentRequest->getHash());
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php b/src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactory.php
similarity index 76%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
rename to src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactory.php
index 833d254770..adaeddc619 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactory.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\Api;
 
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenInterface;
@@ -40,19 +40,19 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
 
         $gatewayName = $gatewayConfig->getGatewayName();
 
-        /** @var array|null $data */
-        $data = $paymentRequest->getRequestPayload();
-        Assert::notNull($data);
+        /** @var array|null $payload */
+        $payload = $paymentRequest->getRequestPayload();
+        Assert::notNull($payload);
 
-        $targetPath = $data['target_path'] ?? null;
+        $targetPath = $payload['target_path'] ?? null;
         Assert::notNull($targetPath);
 
-        $targetPathParameters = $data['target_path_parameters'] ?? [];
+        $targetPathParameters = $payload['target_path_parameters'] ?? [];
 
-        $afterPath = $data['after_path'] ?? null;
+        $afterPath = $payload['after_path'] ?? null;
         Assert::notNull($afterPath);
 
-        $afterPathParameters = $data['after_path_parameters'] ?? [];
+        $afterPathParameters = $payload['after_path_parameters'] ?? [];
 
         return $this->payum->getTokenFactory()->createToken(
             $gatewayName,
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactoryInterface.php
similarity index 90%
rename from src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactoryInterface.php
rename to src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactoryInterface.php
index ea6462dcb1..8413ce4a54 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Payum/PayumTokenFactoryInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactoryInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\Api;
 
 use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
diff --git a/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php b/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php
new file mode 100644
index 0000000000..8e9f1a9765
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\Command;
+
+use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+
+class CapturePaymentRequest implements PaymentRequestHashAwareInterface
+{
+    public function __construct(
+        protected string $hash,
+    ) {
+    }
+
+    public function getHash(): string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(string $hash): void
+    {
+        $this->hash = $hash;
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php b/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php
new file mode 100644
index 0000000000..df9e91683e
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\Command;
+
+use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+
+class StatusPaymentRequest implements PaymentRequestHashAwareInterface
+{
+    public function __construct(
+        protected string $hash,
+    ) {
+    }
+
+    public function getHash(): string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(string $hash): void
+    {
+        $this->hash = $hash;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumPaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/PaymentRequestHandler.php
similarity index 83%
rename from src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumPaymentRequestHandler.php
rename to src/Sylius/Bundle/PayumBundle/CommandHandler/PaymentRequestHandler.php
index 90a94cdc94..94e70c4a2b 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Payum/PayumPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/PaymentRequestHandler.php
@@ -11,19 +11,19 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum;
+namespace Sylius\Bundle\PayumBundle\CommandHandler;
 
 use Payum\Core\Security\TokenAggregateInterface;
 use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface;
-use Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactoryInterface;
+use Sylius\Bundle\PayumBundle\Api\PayumRequestProcessorInterface;
+use Sylius\Bundle\PayumBundle\Api\PayumTokenFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
 /** @experimental */
-final class PayumPaymentRequestHandler implements MessageHandlerInterface
+final class PaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private RepositoryInterface $paymentRequestRepository,
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/UnregisterPaypalGatewayTypePass.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/UnregisterPaypalGatewayTypePass.php
deleted file mode 100644
index ca0b76b679..0000000000
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/UnregisterPaypalGatewayTypePass.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\PayumBundle\DependencyInjection\Compiler;
-
-use Payum\Paypal\ExpressCheckout\Nvp\PaypalExpressCheckoutGatewayFactory;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-final class UnregisterPaypalGatewayTypePass implements CompilerPassInterface
-{
-    private const PAYPAL_GATEWAY_TYPE_SERVICE_ID = 'sylius.form.type.gateway_configuration.paypal';
-
-    private const PAYPAL_CONVERT_ACTION_SERVICE_ID = 'sylius.payum_action.paypal_express_checkout.convert_payment';
-
-    public function process(ContainerBuilder $container): void
-    {
-        if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) {
-            return;
-        }
-
-        $container->removeDefinition(self::PAYPAL_GATEWAY_TYPE_SERVICE_ID);
-        $container->removeDefinition(self::PAYPAL_CONVERT_ACTION_SERVICE_ID);
-    }
-}
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/UnregisterStripeGatewayTypePass.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/UnregisterStripeGatewayTypePass.php
deleted file mode 100644
index 201ff3ed7e..0000000000
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/UnregisterStripeGatewayTypePass.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\PayumBundle\DependencyInjection\Compiler;
-
-use Payum\Stripe\StripeCheckoutGatewayFactory;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-final class UnregisterStripeGatewayTypePass implements CompilerPassInterface
-{
-    private const STRIPE_GATEWAY_TYPE_SERVICE_ID = 'sylius.form.type.gateway_configuration.stripe';
-
-    public function process(ContainerBuilder $container): void
-    {
-        if (class_exists(StripeCheckoutGatewayFactory::class)) {
-            return;
-        }
-
-        $container->removeDefinition(self::STRIPE_GATEWAY_TYPE_SERVICE_ID);
-    }
-}
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
index 760306e14a..96863230e7 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -13,6 +13,9 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\DependencyInjection;
 
+use Payum\Offline\OfflineGatewayFactory;
+use Payum\Paypal\ExpressCheckout\Nvp\PaypalExpressCheckoutGatewayFactory;
+use Payum\Stripe\StripeCheckoutGatewayFactory;
 use Sylius\Bundle\PayumBundle\Attribute\AsGatewayConfigurationType;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
 use Symfony\Component\Config\FileLocator;
@@ -31,6 +34,14 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
 
         $loader->load('services.xml');
 
+        if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) {
+            $loader->load('paypal.xml');
+        }
+
+        if (class_exists(StripeCheckoutGatewayFactory::class)) {
+            $loader->load('stripe.xml');
+        }
+
         $container->setParameter('payum.template.layout', $config['template']['layout']);
         $container->setParameter('payum.template.obtain_credit_card', $config['template']['obtain_credit_card']);
         $container->setParameter('sylius.payum.gateway_config.validation_groups', $config['gateway_config']['validation_groups']);
@@ -39,6 +50,26 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
     }
 
     public function prepend(ContainerBuilder $container): void
+    {
+        $this->prependSyliusPayment($container);
+        $this->prependSyliusApi($container);
+    }
+
+    private function registerAutoconfiguration(ContainerBuilder $container): void
+    {
+        $container->registerAttributeForAutoconfiguration(
+            AsGatewayConfigurationType::class,
+            static function (ChildDefinition $definition, AsGatewayConfigurationType $attribute): void {
+                $definition->addTag(AsGatewayConfigurationType::SERVICE_TAG, [
+                    'type' => $attribute->getType(),
+                    'label' => $attribute->getLabel(),
+                    'priority' => $attribute->getPriority(),
+                ]);
+            },
+        );
+    }
+
+    private function prependSyliusPayment(ContainerBuilder $container): void
     {
         if (!$container->hasExtension('sylius_payment')) {
             return;
@@ -60,17 +91,26 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
         $container->prependExtensionConfig('sylius_payment', ['gateways' => $gateways]);
     }
 
-    private function registerAutoconfiguration(ContainerBuilder $container): void
+    private function prependSyliusApi(ContainerBuilder $container): void
     {
-        $container->registerAttributeForAutoconfiguration(
-            AsGatewayConfigurationType::class,
-            static function (ChildDefinition $definition, AsGatewayConfigurationType $attribute): void {
-                $definition->addTag(AsGatewayConfigurationType::SERVICE_TAG, [
-                    'type' => $attribute->getType(),
-                    'label' => $attribute->getLabel(),
-                    'priority' => $attribute->getPriority(),
-                ]);
-            },
-        );
+        if (!$container->hasExtension('sylius_api')) {
+            return;
+        }
+
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+
+        $loader->load('integrations/sylius_api.xml');
+
+        if (class_exists(OfflineGatewayFactory::class)) {
+            $loader->load('integrations/offline.xml');
+        }
+
+        if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) {
+            $loader->load('integrations/paypal.xml');
+        }
+
+        if (class_exists(StripeCheckoutGatewayFactory::class)) {
+            $loader->load('integrations/stripe.xml');
+        }
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml
similarity index 100%
rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/offline.xml
rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal.xml
similarity index 100%
rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/paypal.xml
rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal.xml
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml
similarity index 100%
rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/stripe.xml
rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/all.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_api.xml
similarity index 67%
rename from src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/all.xml
rename to src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_api.xml
index 42c657ac64..15a744d9eb 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payum/all.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_api.xml
@@ -22,42 +22,42 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessor">
+        <service id="Sylius\Bundle\PayumBundle\Api\PayumRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\Api\PayumRequestProcessor">
             <argument type="service" id="payum" />
             <argument type="service" id="sylius.api.payment.payum.context" />
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactoryInterface" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactory">
+        <service id="Sylius\Bundle\PayumBundle\Api\PayumTokenFactoryInterface" class="Sylius\Bundle\PayumBundle\Api\PayumTokenFactory">
             <argument type="service" id="payum" />
         </service>
 
-        <service id="sylius.api.payment_request.payum.capture" class="Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum\PayumPaymentRequestHandler">
+        <service id="sylius.api.payment_request.payum.capture" class="Sylius\Bundle\PayumBundle\CommandHandler\PaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\Api\PayumTokenFactoryInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\Api\PayumRequestProcessorInterface" />
             <argument type="string">%sylius_api.payment_request.payum.capture.class%</argument>
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
-        <service id="sylius.api.payment_request.payum.status" class="Sylius\Bundle\ApiBundle\CommandHandler\Payment\Payum\PayumPaymentRequestHandler">
+        <service id="sylius.api.payment_request.payum.status" class="Sylius\Bundle\PayumBundle\CommandHandler\PaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Payum\PayumRequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\Api\PayumTokenFactoryInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\Api\PayumRequestProcessorInterface" />
             <argument type="string">%sylius_api.payment_request.payum.status.class%</argument>
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
-        <service id="sylius.api.payment.payum.context" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumApiContext" />
+        <service id="sylius.api.payment.payum.context" class="Sylius\Bundle\PayumBundle\Api\PayumApiContext" />
 
-        <service id="sylius_api.action.get_http_request" class="Sylius\Bundle\ApiBundle\Payment\Payum\Action\SyliusApiGetHttpRequestAction">
+        <service id="sylius_api.action.get_http_request" class="Sylius\Bundle\PayumBundle\Action\SyliusApiGetHttpRequestAction">
             <argument type="service" id="sylius.api.payment.payum.context" />
 
             <tag name="payum.action" all="true" prepend="true" />
         </service>
 
-        <service id="sylius_api.action.render_template" class="Sylius\Bundle\ApiBundle\Payment\Payum\Action\SyliusApiRenderTemplateAction">
+        <service id="sylius_api.action.render_template" class="Sylius\Bundle\PayumBundle\Action\SyliusApiRenderTemplateAction">
             <argument type="service" id="sylius.api.payment.payum.context" />
 
             <tag name="payum.action" all="true" prepend="true" />
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/paypal.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/paypal.xml
new file mode 100644
index 0000000000..cfefe3587c
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/paypal.xml
@@ -0,0 +1,36 @@
+<?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">
+
+    <imports>
+        <import resource="paypal/**.xml" />
+    </imports>
+
+    <services>
+        <defaults public="true" />
+
+        <service id="sylius.form.type.gateway_configuration.paypal" class="Sylius\Bundle\PayumBundle\Form\Type\PaypalGatewayConfigurationType">
+            <tag name="sylius.gateway_configuration_type" type="paypal_express_checkout" label="sylius.payum_gateway_factory.paypal_express_checkout" priority="100" />
+            <tag name="form.type" />
+        </service>
+
+        <service id="sylius.payum_action.paypal_express_checkout.convert_payment" class="Sylius\Bundle\PayumBundle\Action\Paypal\ExpressCheckout\ConvertPaymentAction">
+            <argument type="service" id="sylius.invoice_number_generator" />
+            <tag name="payum.action" factory="paypal_express_checkout" alias="sylius.paypal_express_checkout.convert_payment" />
+        </service>
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml
index 28c7650375..cdff2fb237 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml
@@ -23,12 +23,6 @@
             <tag name="payum.action" all="true" alias="sylius.resolve_next_route" />
         </service>
 
-        <!-- PayPal -->
-        <service id="sylius.payum_action.paypal_express_checkout.convert_payment" class="Sylius\Bundle\PayumBundle\Action\Paypal\ExpressCheckout\ConvertPaymentAction">
-            <argument type="service" id="sylius.invoice_number_generator" />
-            <tag name="payum.action" factory="paypal_express_checkout" alias="sylius.paypal_express_checkout.convert_payment" />
-        </service>
-
         <!-- Offline -->
         <service id="sylius.payum_action.offline.convert_payment" class="Sylius\Bundle\PayumBundle\Action\Offline\ConvertPaymentAction">
             <tag name="payum.action" factory="offline" alias="sylius.offline.convert_payment" />
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
index 85ae98cc67..c9be25e5ba 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
@@ -31,15 +31,5 @@
             <argument type="service" id="payum.dynamic_gateways.cypher" on-invalid="null" />
             <tag name="form.type_extension" extended-type="Sylius\Bundle\PayumBundle\Form\Type\GatewayConfigType" priority="100" />
         </service>
-
-        <service id="sylius.form.type.gateway_configuration.paypal" class="Sylius\Bundle\PayumBundle\Form\Type\PaypalGatewayConfigurationType">
-            <tag name="sylius.gateway_configuration_type" type="paypal_express_checkout" label="sylius.payum_gateway_factory.paypal_express_checkout" priority="100" />
-            <tag name="form.type" />
-        </service>
-
-        <service id="sylius.form.type.gateway_configuration.stripe" class="Sylius\Bundle\PayumBundle\Form\Type\StripeGatewayConfigurationType">
-            <tag name="sylius.gateway_configuration_type" type="stripe_checkout" label="sylius.payum_gateway_factory.stripe_checkout" priority="50" />
-            <tag name="form.type" />
-        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/stripe.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/stripe.xml
new file mode 100644
index 0000000000..362cac89ce
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/stripe.xml
@@ -0,0 +1,31 @@
+<?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">
+
+    <imports>
+        <import resource="stripe/**.xml" />
+    </imports>
+
+    <services>
+        <defaults public="true" />
+
+        <service id="sylius.form.type.gateway_configuration.stripe" class="Sylius\Bundle\PayumBundle\Form\Type\StripeGatewayConfigurationType">
+            <tag name="sylius.gateway_configuration_type" type="stripe_checkout" label="sylius.payum_gateway_factory.stripe_checkout" priority="50" />
+            <tag name="form.type" />
+        </service>
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/PayumBundle/SyliusPayumBundle.php b/src/Sylius/Bundle/PayumBundle/SyliusPayumBundle.php
index eb0601154c..212daa295b 100644
--- a/src/Sylius/Bundle/PayumBundle/SyliusPayumBundle.php
+++ b/src/Sylius/Bundle/PayumBundle/SyliusPayumBundle.php
@@ -15,8 +15,6 @@ namespace Sylius\Bundle\PayumBundle;
 
 use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\InjectContainerIntoControllersPass;
 use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\RegisterGatewayConfigTypePass;
-use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\UnregisterPaypalGatewayTypePass;
-use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\UnregisterStripeGatewayTypePass;
 use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\UseTweakedDoctrineStoragePass;
 use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
@@ -38,7 +36,5 @@ final class SyliusPayumBundle extends AbstractResourceBundle
         $container->addCompilerPass(new InjectContainerIntoControllersPass());
         $container->addCompilerPass(new RegisterGatewayConfigTypePass());
         $container->addCompilerPass(new UseTweakedDoctrineStoragePass());
-        $container->addCompilerPass(new UnregisterPaypalGatewayTypePass(), priority: 128);
-        $container->addCompilerPass(new UnregisterStripeGatewayTypePass(), priority: 128);
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json
index 9f3b61ef4a..141a96db12 100644
--- a/src/Sylius/Bundle/PayumBundle/composer.json
+++ b/src/Sylius/Bundle/PayumBundle/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "sylius/payum-bundle",
     "type": "symfony-bundle",
-    "description": "Payum integration for Symfony e-commerce applications.",
+    "description": "CommandHandler integration for Symfony e-commerce applications.",
     "keywords": [
         "payments",
         "payment",
@@ -44,7 +44,8 @@
     },
     "suggest": {
         "payum/paypal-express-checkout-nvp": "To use PayPal Express Chekout NVP",
-        "payum/stripe": "To use Stripe Checkout"
+        "payum/stripe": "To use Stripe Checkout",
+        "sylius/api-bundle": "To use Payum with the Sylius API Bundle"
     },
     "config": {
         "allow-plugins": {

From c6f207af4537a56a25ce68c6b6a0cc6581145d25 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:09:34 +0100
Subject: [PATCH 008/200] Move services from ApiBundle to PaymentBundle

---
 .../PaymentRequestCommandProviderPass.php     | 45 -------------------
 .../services/payment_request_offline.xml      | 36 ---------------
 .../PaymentRequestDuplicationChecker.php      | 16 +------
 ...mentRequestDuplicationCheckerInterface.php |  2 +-
 .../Offline/CapturePaymentRequest.php         |  4 +-
 .../Command/Offline/StatusPaymentRequest.php  | 34 ++++++++++++++
 .../PaymentRequestHashAwareInterface.php      | 22 +++++++++
 .../Offline/CapturePaymentRequestHandler.php  | 20 +++++----
 .../Doctrine/ORM/PaymentRequestRepository.php | 31 ++++++-------
 .../Processor/OfflineCaptureProcessor.php}    |  4 +-
 .../OfflineCaptureProcessorInterface.php}     |  4 +-
 .../CapturePaymentRequestCommandProvider.php  |  8 ++--
 .../StatusPaymentRequestCommandProvider.php   |  8 ++--
 .../PaymentRequestCommandProvider.php         | 15 +++----
 ...PaymentRequestCommandProviderInterface.php |  4 +-
 .../PaymentRequestTypeCommandProvider.php     | 32 +++++++++++++
 .../Resources/config/app/config.yml           |  2 +-
 .../doctrine/model/PaymentRequest.orm.xml     |  4 +-
 .../Resources/config/services.xml             |  3 ++
 .../Resources/config/services/checker.xml     | 26 +++++++++++
 .../Resources/config/services/offline.xml     | 45 +++++++++++++++++++
 .../Resources/config/services/provider.xml    | 27 +++++++++++
 22 files changed, 244 insertions(+), 148 deletions(-)
 delete mode 100644 src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request_offline.xml
 rename src/Sylius/Bundle/{ApiBundle/Payment => PaymentBundle}/Checker/PaymentRequestDuplicationChecker.php (61%)
 rename src/Sylius/Bundle/{ApiBundle/Payment => PaymentBundle}/Checker/PaymentRequestDuplicationCheckerInterface.php (82%)
 rename src/Sylius/Bundle/{ApiBundle/Command/Payment => PaymentBundle/Command}/Offline/CapturePaymentRequest.php (81%)
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Command/Offline/StatusPaymentRequest.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Command/PaymentRequestHashAwareInterface.php
 rename src/Sylius/Bundle/{ApiBundle/CommandHandler/Payment => PaymentBundle/CommandHandler}/Offline/CapturePaymentRequestHandler.php (69%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Offline/CapturePaymentRequestProcessor.php => PaymentBundle/Processor/OfflineCaptureProcessor.php} (86%)
 rename src/Sylius/Bundle/{ApiBundle/Payment/Offline/CapturePaymentRequestProcessorInterface.php => PaymentBundle/Processor/OfflineCaptureProcessorInterface.php} (79%)
 rename src/Sylius/Bundle/{ApiBundle/Payment => PaymentBundle/Provider}/Offline/CapturePaymentRequestCommandProvider.php (70%)
 rename src/Sylius/Bundle/{ApiBundle/Payment => PaymentBundle/Provider}/Offline/StatusPaymentRequestCommandProvider.php (70%)
 rename src/Sylius/Bundle/{ApiBundle/Payment => PaymentBundle/Provider}/PaymentRequestCommandProvider.php (74%)
 rename src/Sylius/Bundle/{ApiBundle/Payment => PaymentBundle/Provider}/PaymentRequestCommandProviderInterface.php (64%)
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Resources/config/services/checker.xml
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml

diff --git a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php b/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
deleted file mode 100644
index 2f1a078b45..0000000000
--- a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/PaymentRequestCommandProviderPass.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Webmozart\Assert\Assert;
-
-final class PaymentRequestCommandProviderPass implements CompilerPassInterface
-{
-
-    public function process(ContainerBuilder $container): void
-    {
-        $commandProviders = [];
-        foreach ($container->findTaggedServiceIds('sylius.api.payment_request.command_provider', true) as $serviceId => $tags) {
-            foreach ($tags as $tag) {
-                if (!isset($tag['id'])) {
-                    $tag['id'] = $serviceId;
-                }
-
-                $factoryName = $tag['factory'] ?? null;
-                Assert::notNull(
-                    $factoryName,
-                    sprintf('The tag "%s" must have a "factory" attribut.', 'sylius.api.payment_request.command_provider')
-                );
-
-                $type = $tag['type'] ?? null;
-                Assert::notNull(
-                    $type,
-                    sprintf('The tag "%s" must have a "type" attribut.', 'sylius.api.payment_request.command_provider')
-                );
-
-                $commandProviders[sprintf('%s::%s', $factoryName, $type)] = new Reference($serviceId);
-            }// offline::capture,
-            // stripe::capture
-            // stripe::status
-            // stripe::refund
-        }
-
-        $container->getDefinition('sylius.api.payment_request.command_provider.locator')->addArgument($commandProviders);
-    }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request_offline.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request_offline.xml
deleted file mode 100644
index b55f84c9f2..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payment_request_offline.xml
+++ /dev/null
@@ -1,36 +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.api.payment_request.command_provider.offline.capture" class="Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestCommandProvider">
-            <tag name="sylius.api.payment_request.command_provider" factory="offline" type="capture" priority="-100" />
-        </service>
-
-        <service id="sylius.api.payment_request.offline.capture" class="Sylius\Bundle\ApiBundle\CommandHandler\Payment\Offline\CapturePaymentRequestHandler">
-            <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestProcessorInterface" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicatorInterface" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" />
-        </service>
-
-        <service id="Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestProcessorInterface" class="Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestProcessor" />
-
-    </services>
-</container>
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationChecker.php b/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php
similarity index 61%
rename from src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationChecker.php
rename to src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php
index bf7cb23a97..1fd79df091 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationChecker.php
+++ b/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php
@@ -2,15 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Checker;
+namespace Sylius\Bundle\PaymentBundle\Checker;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
-use Webmozart\Assert\Assert;
 
 final class PaymentRequestDuplicationChecker implements PaymentRequestDuplicationCheckerInterface
 {
-
     public function __construct(
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
     ) {
@@ -18,17 +16,7 @@ final class PaymentRequestDuplicationChecker implements PaymentRequestDuplicatio
 
     public function hasDuplicates(PaymentRequestInterface $paymentRequest): bool
     {
-        $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment);
-
-        $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod);
-
-        $paymentRequests = $this->paymentRequestRepository->findExisting(
-            $payment,
-            $paymentMethod,
-            $paymentRequest->getType()
-        );
+        $paymentRequests = $this->paymentRequestRepository->findOtherExisting($paymentRequest);
 
         return count($paymentRequests) > 0;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationCheckerInterface.php b/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php
similarity index 82%
rename from src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationCheckerInterface.php
rename to src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php
index 78526585bb..ace56e7e47 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Checker/PaymentRequestDuplicationCheckerInterface.php
+++ b/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Checker;
+namespace Sylius\Bundle\PaymentBundle\Checker;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/CapturePaymentRequest.php b/src/Sylius/Bundle/PaymentBundle/Command/Offline/CapturePaymentRequest.php
similarity index 81%
rename from src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/CapturePaymentRequest.php
rename to src/Sylius/Bundle/PaymentBundle/Command/Offline/CapturePaymentRequest.php
index 5b1b3c3ee6..215cad448c 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/CapturePaymentRequest.php
+++ b/src/Sylius/Bundle/PaymentBundle/Command/Offline/CapturePaymentRequest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command\Payment\Offline;
+namespace Sylius\Bundle\PaymentBundle\Command\Offline;
 
-use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
 
 class CapturePaymentRequest implements PaymentRequestHashAwareInterface
 {
diff --git a/src/Sylius/Bundle/PaymentBundle/Command/Offline/StatusPaymentRequest.php b/src/Sylius/Bundle/PaymentBundle/Command/Offline/StatusPaymentRequest.php
new file mode 100644
index 0000000000..b63267e30e
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Command/Offline/StatusPaymentRequest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Command\Offline;
+
+use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+
+class StatusPaymentRequest implements PaymentRequestHashAwareInterface
+{
+    public function __construct(
+        protected string $hash,
+    ) {
+    }
+
+    public function getHash(): string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(string $hash): void
+    {
+        $this->hash = $hash;
+    }
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/Command/PaymentRequestHashAwareInterface.php b/src/Sylius/Bundle/PaymentBundle/Command/PaymentRequestHashAwareInterface.php
new file mode 100644
index 0000000000..51444ee898
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Command/PaymentRequestHashAwareInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Command;
+
+/** @experimental */
+interface PaymentRequestHashAwareInterface
+{
+    public function getHash(): string;
+
+    public function setHash(string $hash): void;
+}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php
similarity index 69%
rename from src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
rename to src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php
index cf62579c1c..d7ffdfd671 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -11,13 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment\Offline;
+namespace Sylius\Bundle\PaymentBundle\CommandHandler\Offline;
 
-use Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicatorInterface;
-use Sylius\Bundle\ApiBundle\Command\Payment\Offline\CapturePaymentRequest;
-use Sylius\Bundle\ApiBundle\Payment\Offline\CapturePaymentRequestProcessorInterface;
+use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
+use Sylius\Bundle\PaymentBundle\Command\Offline\CapturePaymentRequest;
+use Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\PaymentTransitions;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
@@ -28,9 +29,9 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
     public const FACTORY_NAME = 'offline';
 
     public function __construct(
-        private RepositoryInterface $paymentRequestRepository,
-        private CapturePaymentRequestProcessorInterface $capturePaymentRequestProcessor,
-        private PaymentStateMachineTransitionApplicatorInterface $paymentStateMachineTransitionApplicator,
+        private RepositoryInterface              $paymentRequestRepository,
+        private OfflineCaptureProcessorInterface $capturePaymentRequestProcessor,
+        private StateMachineFactoryInterface     $stateMachineFactory,
     ) {
     }
 
@@ -56,10 +57,11 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
 
         // @todo modify Payment->getDetails() to retrieve last payment request `responseData`
 
+        $stateMachine = $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH);
         if ($paymentRequest->getResponseData()['paid']) {
-            $this->paymentStateMachineTransitionApplicator->complete($payment);
+            $stateMachine->apply(PaymentTransitions::TRANSITION_COMPLETE);
         } else {
-            $this->paymentStateMachineTransitionApplicator->process($payment);
+            $stateMachine->apply(PaymentTransitions::TRANSITION_PROCESS);
         }
     }
 }
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index cde996394a..77b2a5fe4d 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -14,25 +14,26 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PaymentBundle\Doctrine\ORM;
 
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
-use Sylius\Component\Payment\Model\PaymentInterface;
-use Sylius\Component\Payment\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 
 class PaymentRequestRepository extends EntityRepository implements PaymentRequestRepositoryInterface
 {
-    public function findExisting(PaymentInterface $payment, PaymentMethodInterface $paymentMethod, string $type): array
+    public function findOtherExisting(PaymentRequestInterface $paymentRequest): array
     {
-            return $this->createQueryBuilder('o')
-                ->innerJoin('o.payment', 'payment')
-                ->innerJoin('o.method', 'method')
-                ->andWhere('o.type = :type')
-                ->andWhere('o.payment = :payment')
-                ->andWhere('o.method = :method')
-                ->setParameter('type', $type)
-                ->setParameter('method', $paymentMethod)
-                ->setParameter('payment', $payment)
-                ->getQuery()
-                ->getResult()
-            ;
+        return $this->createQueryBuilder('o')
+            ->innerJoin('o.payment', 'payment')
+            ->innerJoin('o.method', 'method')
+            ->where('o != :paymentRequest')
+            ->andWhere('o.type = :type')
+            ->andWhere('o.payment = :payment')
+            ->andWhere('o.method = :method')
+            ->setParameter('paymentRequest', $paymentRequest)
+            ->setParameter('type', $paymentRequest->getType())
+            ->setParameter('method', $paymentRequest->getMethod())
+            ->setParameter('payment', $paymentRequest->getPayment())
+            ->getQuery()
+            ->getResult()
+        ;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessor.php b/src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessor.php
similarity index 86%
rename from src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessor.php
rename to src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessor.php
index eabf53ec1e..2c4e4d75ea 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessor.php
+++ b/src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessor.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Offline;
+namespace Sylius\Bundle\PaymentBundle\Processor;
 
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Webmozart\Assert\Assert;
 
-final class CapturePaymentRequestProcessor implements CapturePaymentRequestProcessorInterface
+final class OfflineCaptureProcessor implements OfflineCaptureProcessorInterface
 {
     public function process(PaymentRequestInterface $paymentRequest): void
     {
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessorInterface.php b/src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessorInterface.php
similarity index 79%
rename from src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessorInterface.php
rename to src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessorInterface.php
index 5d66d98c18..48d24006b6 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessorInterface.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Offline;
+namespace Sylius\Bundle\PaymentBundle\Processor;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface CapturePaymentRequestProcessorInterface
+interface OfflineCaptureProcessorInterface
 {
     public function process(PaymentRequestInterface $paymentRequest): void;
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/PaymentBundle/Provider/Offline/CapturePaymentRequestCommandProvider.php
similarity index 70%
rename from src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PaymentBundle/Provider/Offline/CapturePaymentRequestCommandProvider.php
index 28cd3d83fe..2445f6d253 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Offline/CapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PaymentBundle/Provider/Offline/CapturePaymentRequestCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Offline;
+namespace Sylius\Bundle\PaymentBundle\Provider\Offline;
 
-use Sylius\Bundle\ApiBundle\Command\Payment\Offline\CapturePaymentRequest;
-use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PaymentBundle\Command\Offline\CapturePaymentRequest;
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class CapturePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
@@ -24,7 +24,7 @@ final class CapturePaymentRequestCommandProvider implements PaymentRequestComman
         return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
     }
 
-    public function handle(PaymentRequestInterface $paymentRequest): object
+    public function provide(PaymentRequestInterface $paymentRequest): object
     {
         return new CapturePaymentRequest($paymentRequest->getHash());
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/Offline/StatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/PaymentBundle/Provider/Offline/StatusPaymentRequestCommandProvider.php
similarity index 70%
rename from src/Sylius/Bundle/ApiBundle/Payment/Offline/StatusPaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PaymentBundle/Provider/Offline/StatusPaymentRequestCommandProvider.php
index 36bd2d92e8..51b1e01b26 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/Offline/StatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PaymentBundle/Provider/Offline/StatusPaymentRequestCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment\Offline;
+namespace Sylius\Bundle\PaymentBundle\Provider\Offline;
 
-use Sylius\Bundle\ApiBundle\Command\Payment\Offline\StatusPaymentRequest;
-use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PaymentBundle\Command\Offline\StatusPaymentRequest;
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class StatusPaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
@@ -24,7 +24,7 @@ final class StatusPaymentRequestCommandProvider implements PaymentRequestCommand
         return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
     }
 
-    public function handle(PaymentRequestInterface $paymentRequest): object
+    public function provide(PaymentRequestInterface $paymentRequest): object
     {
         return new StatusPaymentRequest($paymentRequest->getHash());
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
similarity index 74%
rename from src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
index 1a08a39887..1433be69e9 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment;
+namespace Sylius\Bundle\PaymentBundle\Provider;
 
-use Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationCheckerInterface;
+use Sylius\Bundle\PaymentBundle\Checker\PaymentRequestDuplicationCheckerInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
@@ -23,7 +23,7 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
 {
     public function __construct(
         private PaymentRequestDuplicationCheckerInterface $paymentRequestDuplicationChecker,
-        private ServiceProviderInterface $paymentRequestCommandProviderLocator,
+        private ServiceProviderInterface $locator,
     ) {
     }
 
@@ -38,9 +38,9 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
         return $this->getCommandProvider($paymentRequest)->supports($paymentRequest);
     }
 
-    public function handle(PaymentRequestInterface $paymentRequest): object
+    public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        return $this->getCommandProvider($paymentRequest)->handle($paymentRequest);
+        return $this->getCommandProvider($paymentRequest)->provide($paymentRequest);
     }
 
     private function getCommandProvider(PaymentRequestInterface $paymentRequest): PaymentRequestCommandProviderInterface
@@ -54,11 +54,8 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
         /** @var PaymentRequestCommandProviderInterface $service */
         $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
 
-        /** @todo consider founding better nested service provider */
-        $id = sprintf('%s::%s', $factoryName, $paymentRequest->getType());
-
         /** @var PaymentRequestCommandProviderInterface $provider */
-        $provider = $this->paymentRequestCommandProviderLocator->get($id);
+        $provider = $this->locator->get($factoryName);
 
         return $provider;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProviderInterface.php b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php
similarity index 64%
rename from src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProviderInterface.php
rename to src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php
index a6927abd74..15f4f49140 100644
--- a/src/Sylius/Bundle/ApiBundle/Payment/PaymentRequestCommandProviderInterface.php
+++ b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Payment;
+namespace Sylius\Bundle\PaymentBundle\Provider;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
@@ -10,5 +10,5 @@ interface PaymentRequestCommandProviderInterface
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool;
 
-    public function handle(PaymentRequestInterface $paymentRequest): object;
+    public function provide(PaymentRequestInterface $paymentRequest): object;
 }
diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
new file mode 100644
index 0000000000..6e5d222f0a
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Provider;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+
+final class PaymentRequestTypeCommandProvider implements PaymentRequestCommandProviderInterface
+{
+    public function __construct(
+        private ServiceProviderInterface $locator,
+    ) {
+    }
+
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        /** @var PaymentRequestCommandProviderInterface $provider */
+        $provider = $this->locator->get($paymentRequest->getType());
+
+        return $provider->supports($paymentRequest);
+    }
+
+    public function provide(PaymentRequestInterface $paymentRequest): object
+    {
+        /** @var PaymentRequestCommandProviderInterface $provider */
+        $provider = $this->locator->get($paymentRequest->getType());
+
+        return $provider->provide($paymentRequest);
+    }
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
index 7748456355..619fe137f6 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
@@ -7,7 +7,7 @@ parameters:
 doctrine:
     dbal:
         types:
-            sylius_uuid: "%sylius.uuid_type%"
+            uuid: "%sylius.uuid_type%"
 
 jms_serializer:
     metadata:
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index 34ea8cbf19..7617b94729 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -15,8 +15,8 @@
                   xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping">
 
     <mapped-superclass name="Sylius\Component\Payment\Model\PaymentRequest" table="sylius_payment_request">
-        <id name="hash" column="hash" type="sylius_uuid">
-            <generator strategy="AUTO" />
+        <id name="hash" column="hash" type="uuid">
+            <generator strategy="CUSTOM" />
             <custom-id-generator class="Ramsey\Uuid\Doctrine\UuidGenerator"/>
         </id>
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index fb9fadbbe9..ed7edb88a9 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -13,7 +13,10 @@
 
 <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">
     <imports>
+        <import resource="services/checker.xml" />
         <import resource="services/form.xml" />
+        <import resource="services/offline.xml" />
+        <import resource="services/provider.xml" />
     </imports>
 
     <parameters>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/checker.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/checker.xml
new file mode 100644
index 0000000000..66c47db6cb
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/checker.xml
@@ -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\Bundle\PaymentBundle\Checker\PaymentRequestDuplicationCheckerInterface" class="Sylius\Bundle\PaymentBundle\Checker\PaymentRequestDuplicationChecker">
+            <argument type="service" id="sylius.repository.payment_request" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
new file mode 100644
index 0000000000..d81f5f7a86
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
@@ -0,0 +1,45 @@
+<?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.command_provider.offline" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="type" />
+            <tag name="sylius.payment_request.command_provider" factory="offline" priority="-100" />
+        </service>
+
+        <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\PaymentBundle\Provider\Offline\CapturePaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.offline" type="capture" />
+        </service>
+
+        <service id="sylius.payment_request.command_provider.offline.status" class="Sylius\Bundle\PaymentBundle\Provider\Offline\StatusPaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.offline" type="status" />
+        </service>
+
+        <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\PaymentBundle\CommandHandler\Offline\CapturePaymentRequestHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface" />
+            <argument type="service" id="sm.factory" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+        <service id="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface" class="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessor" />
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml
new file mode 100644
index 0000000000..8c5c5c48d5
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml
@@ -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\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProvider">
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\Checker\PaymentRequestDuplicationCheckerInterface" />
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="factory" />
+        </service>
+
+    </services>
+</container>

From 84a02100d8c317a97b755acd367c7b9624695716 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:12:25 +0100
Subject: [PATCH 009/200] Move services from ApiBundle to PayumBundle

---
 .../SyliusGetHttpRequestAction.php}           | 21 +++---
 .../SyliusRenderTemplateAction.php}           |  8 +--
 .../PayumBundle/Api/PayumRequestProcessor.php | 47 ------------
 .../Command/AuthorizePaymentRequest.php       | 34 +++++++++
 .../Command/CapturePaymentRequest.php         |  2 +-
 .../Command/StatusPaymentRequest.php          |  2 +-
 ...php => AuthorizePaymentRequestHandler.php} | 26 +++----
 .../CapturePaymentRequestHandler.php          | 50 +++++++++++++
 .../StatusPaymentRequestHandler.php           | 57 +++++++++++++++
 .../SyliusPayumExtension.php                  | 13 +---
 .../PayumBundle/Factory/AuthorizeFactory.php  | 17 +++++
 .../AuthorizeRequestFactoryInterface.php      | 13 ++++
 .../PayumBundle/Factory/CaptureFactory.php    | 17 +++++
 .../CaptureRequestFactoryInterface.php        | 13 ++++
 .../Factory}/PayumTokenFactory.php            |  9 ++-
 .../Factory}/PayumTokenFactoryInterface.php   |  2 +-
 .../PayumPaymentRequestContext.php}           |  4 +-
 .../PayumPaymentRequestContextInterface.php}  |  4 +-
 .../Processor/PayumRequestProcessor.php       | 60 ++++++++++++++++
 .../PayumRequestProcessorInterface.php        |  8 ++-
 ...AuthorizePaymentRequestCommandProvider.php | 22 ++++++
 ...umCapturePaymentRequestCommandProvider.php |  6 +-
 ...yumStatusPaymentRequestCommandProvider.php |  6 +-
 .../Resources/config/integrations/offline.xml | 13 ++--
 .../config/integrations/payment_request.xml   | 71 +++++++++++++++++++
 .../Resources/config/integrations/paypal.xml  | 30 --------
 .../integrations/paypal_express_checkout.xml  | 39 ++++++++++
 .../Resources/config/integrations/stripe.xml  | 17 +++--
 .../config/integrations/sylius_api.xml        | 67 -----------------
 .../Resources/config/services/factory.xml     |  6 ++
 30 files changed, 475 insertions(+), 209 deletions(-)
 rename src/Sylius/Bundle/PayumBundle/Action/{SyliusApiGetHttpRequestAction.php => PaymentRequest/SyliusGetHttpRequestAction.php} (67%)
 rename src/Sylius/Bundle/PayumBundle/Action/{SyliusApiRenderTemplateAction.php => PaymentRequest/SyliusRenderTemplateAction.php} (79%)
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessor.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/Command/AuthorizePaymentRequest.php
 rename src/Sylius/Bundle/PayumBundle/CommandHandler/{PaymentRequestHandler.php => AuthorizePaymentRequestHandler.php} (57%)
 create mode 100644 src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/Factory/AuthorizeFactory.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/Factory/AuthorizeRequestFactoryInterface.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/Factory/CaptureFactory.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/Factory/CaptureRequestFactoryInterface.php
 rename src/Sylius/Bundle/PayumBundle/{Api => PaymentRequest/Factory}/PayumTokenFactory.php (83%)
 rename src/Sylius/Bundle/PayumBundle/{Api => PaymentRequest/Factory}/PayumTokenFactoryInterface.php (88%)
 rename src/Sylius/Bundle/PayumBundle/{Api/PayumApiContext.php => PaymentRequest/PayumPaymentRequestContext.php} (85%)
 rename src/Sylius/Bundle/PayumBundle/{Api/PayumApiContextInterface.php => PaymentRequest/PayumPaymentRequestContextInterface.php} (84%)
 create mode 100644 src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessor.php
 rename src/Sylius/Bundle/PayumBundle/{Api => PaymentRequest/Processor}/PayumRequestProcessorInterface.php (64%)
 create mode 100644 src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumAuthorizePaymentRequestCommandProvider.php
 rename src/Sylius/Bundle/PayumBundle/{Api => PaymentRequest/Provider}/PayumCapturePaymentRequestCommandProvider.php (70%)
 rename src/Sylius/Bundle/PayumBundle/{Api => PaymentRequest/Provider}/PayumStatusPaymentRequestCommandProvider.php (70%)
 create mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal.xml
 create mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_api.xml

diff --git a/src/Sylius/Bundle/PayumBundle/Action/SyliusApiGetHttpRequestAction.php b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
similarity index 67%
rename from src/Sylius/Bundle/PayumBundle/Action/SyliusApiGetHttpRequestAction.php
rename to src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
index 882486714f..e74a88733f 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/SyliusApiGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
@@ -11,18 +11,18 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Action;
+namespace Sylius\Bundle\PayumBundle\Action\PaymentRequest;
 
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\GetHttpRequest;
-use Sylius\Bundle\PayumBundle\Api\PayumApiContextInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\PayumPaymentRequestContextInterface;
 use Webmozart\Assert\Assert;
 
-final class SyliusApiGetHttpRequestAction implements ActionInterface
+final class SyliusGetHttpRequestAction implements ActionInterface
 {
     public function __construct(
-        private PayumApiContextInterface $payumApiContext,
+        private PayumPaymentRequestContextInterface $payumApiContext,
     ) {
     }
 
@@ -43,15 +43,16 @@ final class SyliusApiGetHttpRequestAction implements ActionInterface
         $payload = $paymentRequest->getRequestPayload();
         $httpRequest = $payload['http_request'] ?? [];
 
-        $request->query = $httpRequest['query'];
-        $request->request = $httpRequest['request'];
-        // Not existing property
-        $request->headers = $httpRequest['headers'];
+        $request->query = $httpRequest['query'] ?? [];
+        $request->request = $httpRequest['request'] ?? [];
         $request->method = $httpRequest['method'] ?? 'POST';
         $request->uri = $httpRequest['uri'] ?? '';
         $request->clientIp = $httpRequest['client_ip'] ?? '';
-        $request->userAgent = $httpRequest['user_agent'];
-        $request->content = $httpRequest['content'];
+        $request->userAgent = $httpRequest['user_agent'] ?? '';
+        $request->content = $httpRequest['content'] ?? '';
+
+        // Not existing property but used by the Symfony bridge
+        $request->headers = $httpRequest['headers'] ?? [];
     }
 
     public function supports($request): bool
diff --git a/src/Sylius/Bundle/PayumBundle/Action/SyliusApiRenderTemplateAction.php b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
similarity index 79%
rename from src/Sylius/Bundle/PayumBundle/Action/SyliusApiRenderTemplateAction.php
rename to src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
index 4e4d58a849..ebc259c145 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/SyliusApiRenderTemplateAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
@@ -11,18 +11,18 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Action;
+namespace Sylius\Bundle\PayumBundle\Action\PaymentRequest;
 
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\RenderTemplate;
-use Sylius\Bundle\PayumBundle\Api\PayumApiContextInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\PayumPaymentRequestContextInterface;
 use Webmozart\Assert\Assert;
 
-final class SyliusApiRenderTemplateAction implements ActionInterface
+final class SyliusRenderTemplateAction implements ActionInterface
 {
     public function __construct(
-        private PayumApiContextInterface $payumApiContext,
+        private PayumPaymentRequestContextInterface $payumApiContext,
     ) {
     }
     public function execute($request): void
diff --git a/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessor.php b/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessor.php
deleted file mode 100644
index 45f56ec449..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessor.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\PayumBundle\Api;
-
-use Payum\Core\Payum;
-use Payum\Core\Security\TokenAggregateInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Webmozart\Assert\Assert;
-
-final class PayumRequestProcessor implements PayumRequestProcessorInterface
-{
-    public function __construct(
-        private Payum $payum,
-        private PayumApiContextInterface $payumApiContext,
-    ) {
-    }
-
-    public function process( PaymentRequestInterface $paymentRequest, TokenAggregateInterface $request): void
-    {
-        $token = $request->getToken();
-        Assert::notNull($token);
-
-        $gateway = $this->payum->getGateway($token->getGatewayName());
-
-        $this->payumApiContext->enable($paymentRequest);
-        $reply = $gateway->execute($request, true);
-        $this->payumApiContext->disable();
-
-        $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment);
-
-        if (null === $reply) {
-            $details['after_url'] = $token->getAfterUrl();
-        }
-    }
-}
diff --git a/src/Sylius/Bundle/PayumBundle/Command/AuthorizePaymentRequest.php b/src/Sylius/Bundle/PayumBundle/Command/AuthorizePaymentRequest.php
new file mode 100644
index 0000000000..2d822ac594
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Command/AuthorizePaymentRequest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\Command;
+
+use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+
+class AuthorizePaymentRequest implements PaymentRequestHashAwareInterface
+{
+    public function __construct(
+        protected string $hash,
+    ) {
+    }
+
+    public function getHash(): string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(string $hash): void
+    {
+        $this->hash = $hash;
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php b/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php
index 8e9f1a9765..b19e742b54 100644
--- a/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php
+++ b/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\Command;
 
-use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
 
 class CapturePaymentRequest implements PaymentRequestHashAwareInterface
 {
diff --git a/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php b/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php
index df9e91683e..2a367101ee 100644
--- a/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php
+++ b/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\Command;
 
-use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
 
 class StatusPaymentRequest implements PaymentRequestHashAwareInterface
 {
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/PaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php
similarity index 57%
rename from src/Sylius/Bundle/PayumBundle/CommandHandler/PaymentRequestHandler.php
rename to src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php
index 94e70c4a2b..27bf23916a 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/PaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php
@@ -13,36 +13,38 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\CommandHandler;
 
-use Payum\Core\Security\TokenAggregateInterface;
-use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\PayumBundle\Api\PayumRequestProcessorInterface;
-use Sylius\Bundle\PayumBundle\Api\PayumTokenFactoryInterface;
+use Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest;
+use Sylius\Bundle\PayumBundle\Factory\AuthorizeRequestFactoryInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
-/** @experimental */
-final class PaymentRequestHandler implements MessageHandlerInterface
+final class AuthorizePaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private RepositoryInterface $paymentRequestRepository,
         private PayumTokenFactoryInterface $payumTokenFactory,
         private PayumRequestProcessorInterface $payumReplyProcessor,
-        /** @var class-string<TokenAggregateInterface> */
-        private string $payumRequestClass,
+        private AuthorizeRequestFactoryInterface $factory,
     ) {
     }
 
-    public function __invoke(PaymentRequestHashAwareInterface $payumRequest): void
+    public function __invoke(AuthorizePaymentRequest $command): void
     {
         /** @var PaymentRequestInterface|null $paymentRequest */
-        $paymentRequest = $this->paymentRequestRepository->find($payumRequest->getHash());
+        $paymentRequest = $this->paymentRequestRepository->find($command->getHash());
         Assert::notNull($paymentRequest);
 
         $token = $this->payumTokenFactory->createNew($paymentRequest);
 
-        $captureRequest = new $this->payumRequestClass($token);
-        $this->payumReplyProcessor->process($paymentRequest, $captureRequest);
+        $request = $this->factory->createNewWithToken($token);
+
+        $token = $request->getToken();
+        Assert::notNull($token);
+
+        $this->payumReplyProcessor->process($paymentRequest, $request, $token->getGatewayName());
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
new file mode 100644
index 0000000000..13df4e965a
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\CommandHandler;
+
+use Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest;
+use Sylius\Bundle\PayumBundle\Factory\CaptureRequestFactoryInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Webmozart\Assert\Assert;
+
+final class CapturePaymentRequestHandler implements MessageHandlerInterface
+{
+    public function __construct(
+        private RepositoryInterface            $paymentRequestRepository,
+        private PayumTokenFactoryInterface     $payumTokenFactory,
+        private PayumRequestProcessorInterface $payumReplyProcessor,
+        private CaptureRequestFactoryInterface $factory,
+    ) {
+    }
+
+    public function __invoke(CapturePaymentRequest $command): void
+    {
+        /** @var PaymentRequestInterface|null $paymentRequest */
+        $paymentRequest = $this->paymentRequestRepository->find($command->getHash());
+        Assert::notNull($paymentRequest);
+
+        $token = $this->payumTokenFactory->createNew($paymentRequest);
+
+        $request = $this->factory->createNewWithToken($token);
+
+        $token = $request->getToken();
+        Assert::notNull($token);
+
+        $this->payumReplyProcessor->process($paymentRequest, $request, $token->getGatewayName());
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php
new file mode 100644
index 0000000000..0f0255f519
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\CommandHandler;
+
+use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest;
+use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Webmozart\Assert\Assert;
+
+final class StatusPaymentRequestHandler implements MessageHandlerInterface
+{
+    public function __construct(
+        private RepositoryInterface $paymentRequestRepository,
+        private PayumRequestProcessorInterface $payumReplyProcessor,
+        private GetStatusFactoryInterface $factory,
+    ) {
+    }
+
+    public function __invoke(StatusPaymentRequest $command): void
+    {
+        /** @var PaymentRequestInterface|null $paymentRequest */
+        $paymentRequest = $this->paymentRequestRepository->find($command->getHash());
+        Assert::notNull($paymentRequest);
+
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment);
+
+        $request = $this->factory->createNewWithModel($payment);
+
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+        Assert::notNull($paymentMethod);
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        Assert::notNull($gatewayConfig);
+
+        $gatewayName = $gatewayConfig->getGatewayName();
+
+        $this->payumReplyProcessor->process($paymentRequest, $request, $gatewayName);
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
index 96863230e7..5c54f28244 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -52,7 +52,6 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
     public function prepend(ContainerBuilder $container): void
     {
         $this->prependSyliusPayment($container);
-        $this->prependSyliusApi($container);
     }
 
     private function registerAutoconfiguration(ContainerBuilder $container): void
@@ -89,24 +88,16 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
         }
 
         $container->prependExtensionConfig('sylius_payment', ['gateways' => $gateways]);
-    }
-
-    private function prependSyliusApi(ContainerBuilder $container): void
-    {
-        if (!$container->hasExtension('sylius_api')) {
-            return;
-        }
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-
-        $loader->load('integrations/sylius_api.xml');
+        $loader->load('integrations/payment_request.xml');
 
         if (class_exists(OfflineGatewayFactory::class)) {
             $loader->load('integrations/offline.xml');
         }
 
         if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) {
-            $loader->load('integrations/paypal.xml');
+            $loader->load('integrations/paypal_express_checkout.xml');
         }
 
         if (class_exists(StripeCheckoutGatewayFactory::class)) {
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeFactory.php b/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeFactory.php
new file mode 100644
index 0000000000..97a1faf7ce
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeFactory.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\Factory;
+
+use Payum\Core\Request\Authorize;
+use Payum\Core\Security\TokenAggregateInterface;
+use Payum\Core\Security\TokenInterface;
+
+final class AuthorizeFactory implements AuthorizeRequestFactoryInterface
+{
+    public function createNewWithToken(TokenInterface $token): TokenAggregateInterface
+    {
+        return new Authorize($token);
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeRequestFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeRequestFactoryInterface.php
new file mode 100644
index 0000000000..9a71098489
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeRequestFactoryInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\Factory;
+
+use Payum\Core\Security\TokenAggregateInterface;
+use Payum\Core\Security\TokenInterface;
+
+interface AuthorizeRequestFactoryInterface
+{
+    public function createNewWithToken(TokenInterface $token): TokenAggregateInterface;
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/CaptureFactory.php b/src/Sylius/Bundle/PayumBundle/Factory/CaptureFactory.php
new file mode 100644
index 0000000000..78c6e23386
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Factory/CaptureFactory.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\Factory;
+
+use Payum\Core\Request\Capture;
+use Payum\Core\Security\TokenAggregateInterface;
+use Payum\Core\Security\TokenInterface;
+
+final class CaptureFactory implements CaptureRequestFactoryInterface
+{
+    public function createNewWithToken(TokenInterface $token): TokenAggregateInterface
+    {
+        return new Capture($token);
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/CaptureRequestFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/CaptureRequestFactoryInterface.php
new file mode 100644
index 0000000000..5f2d0cb36f
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Factory/CaptureRequestFactoryInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\Factory;
+
+use Payum\Core\Security\TokenAggregateInterface;
+use Payum\Core\Security\TokenInterface;
+
+interface CaptureRequestFactoryInterface
+{
+    public function createNewWithToken(TokenInterface $token): TokenAggregateInterface;
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactory.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
similarity index 83%
rename from src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactory.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
index adaeddc619..7a0bfa62ec 100644
--- a/src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Api;
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Factory;
 
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenInterface;
@@ -21,7 +21,6 @@ use Webmozart\Assert\Assert;
 
 final class PayumTokenFactory implements PayumTokenFactoryInterface
 {
-
     public function __construct(private Payum $payum)
     {
     }
@@ -42,15 +41,15 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
 
         /** @var array|null $payload */
         $payload = $paymentRequest->getRequestPayload();
-        Assert::notNull($payload);
+        Assert::notNull($payload, 'The request payload need to be not null!');
 
         $targetPath = $payload['target_path'] ?? null;
-        Assert::notNull($targetPath);
+        Assert::notNull($targetPath, 'The request payload must have a "target_path" field!');
 
         $targetPathParameters = $payload['target_path_parameters'] ?? [];
 
         $afterPath = $payload['after_path'] ?? null;
-        Assert::notNull($afterPath);
+        Assert::notNull($afterPath, 'The request payload must have an "after_path" field!');
 
         $afterPathParameters = $payload['after_path_parameters'] ?? [];
 
diff --git a/src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactoryInterface.php
similarity index 88%
rename from src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactoryInterface.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactoryInterface.php
index 8413ce4a54..16a21c8761 100644
--- a/src/Sylius/Bundle/PayumBundle/Api/PayumTokenFactoryInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactoryInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Api;
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Factory;
 
 use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
diff --git a/src/Sylius/Bundle/PayumBundle/Api/PayumApiContext.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContext.php
similarity index 85%
rename from src/Sylius/Bundle/PayumBundle/Api/PayumApiContext.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContext.php
index f34058ef22..e4f5ae409f 100644
--- a/src/Sylius/Bundle/PayumBundle/Api/PayumApiContext.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContext.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Api;
+namespace Sylius\Bundle\PayumBundle\PaymentRequest;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-final class PayumApiContext implements PayumApiContextInterface
+final class PayumPaymentRequestContext implements PayumPaymentRequestContextInterface
 {
     private ?PaymentRequestInterface $paymentRequest = null;
 
diff --git a/src/Sylius/Bundle/PayumBundle/Api/PayumApiContextInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContextInterface.php
similarity index 84%
rename from src/Sylius/Bundle/PayumBundle/Api/PayumApiContextInterface.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContextInterface.php
index bedf49622e..1f5aad664d 100644
--- a/src/Sylius/Bundle/PayumBundle/Api/PayumApiContextInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContextInterface.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Api;
+namespace Sylius\Bundle\PayumBundle\PaymentRequest;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface PayumApiContextInterface
+interface PayumPaymentRequestContextInterface
 {
     public function isEnabled(): bool;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessor.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessor.php
new file mode 100644
index 0000000000..b78e591828
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessor.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
+
+use Payum\Core\Payum;
+use Payum\Core\Security\TokenAggregateInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\PayumPaymentRequestContextInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Webmozart\Assert\Assert;
+
+final class PayumRequestProcessor implements PayumRequestProcessorInterface
+{
+    public function __construct(
+        private Payum $payum,
+        private PayumPaymentRequestContextInterface $payumApiContext,
+    ) {
+    }
+
+    public function process(
+        PaymentRequestInterface $paymentRequest,
+        mixed $request,
+        string $gatewayName,
+    ): void {
+        $gateway = $this->payum->getGateway($gatewayName);
+
+        $this->payumApiContext->enable($paymentRequest);
+        $reply = $gateway->execute($request, true);
+        $this->payumApiContext->disable();
+
+        if (null !== $reply) {
+            return;
+        }
+
+        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED);
+
+        if (false === $request instanceof TokenAggregateInterface) {
+            return;
+        }
+
+        $token = $request->getToken();
+        if (null === $token) {
+            return;
+        }
+
+        $details = $paymentRequest->getResponseData();
+        $details['after_url'] = $token->getAfterUrl();
+        $paymentRequest->setResponseData($details);
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessorInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessorInterface.php
similarity index 64%
rename from src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessorInterface.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessorInterface.php
index 7d704b4368..4d44304768 100644
--- a/src/Sylius/Bundle/PayumBundle/Api/PayumRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessorInterface.php
@@ -11,12 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Api;
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
 
 use Payum\Core\Security\TokenAggregateInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 interface PayumRequestProcessorInterface
 {
-    public function process( PaymentRequestInterface $paymentRequest, TokenAggregateInterface $request): void;
+    public function process(
+        PaymentRequestInterface $paymentRequest,
+        TokenAggregateInterface $request,
+        string $gatewayName
+    ): void;
 }
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumAuthorizePaymentRequestCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumAuthorizePaymentRequestCommandProvider.php
new file mode 100644
index 0000000000..fb79eae89c
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumAuthorizePaymentRequestCommandProvider.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
+
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class PayumAuthorizePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+{
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_AUTHORIZE;
+    }
+
+    public function provide(PaymentRequestInterface $paymentRequest): object
+    {
+        return new AuthorizePaymentRequest($paymentRequest->getHash());
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Api/PayumCapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumCapturePaymentRequestCommandProvider.php
similarity index 70%
rename from src/Sylius/Bundle/PayumBundle/Api/PayumCapturePaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumCapturePaymentRequestCommandProvider.php
index 20ad74ec82..b56c99e53c 100644
--- a/src/Sylius/Bundle/PayumBundle/Api/PayumCapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumCapturePaymentRequestCommandProvider.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Api;
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
 
-use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
@@ -15,7 +15,7 @@ final class PayumCapturePaymentRequestCommandProvider implements PaymentRequestC
         return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
     }
 
-    public function handle(PaymentRequestInterface $paymentRequest): object
+    public function provide(PaymentRequestInterface $paymentRequest): object
     {
         return new CapturePaymentRequest($paymentRequest->getHash());
     }
diff --git a/src/Sylius/Bundle/PayumBundle/Api/PayumStatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumStatusPaymentRequestCommandProvider.php
similarity index 70%
rename from src/Sylius/Bundle/PayumBundle/Api/PayumStatusPaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumStatusPaymentRequestCommandProvider.php
index bd60b82147..6a0b6add22 100644
--- a/src/Sylius/Bundle/PayumBundle/Api/PayumStatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumStatusPaymentRequestCommandProvider.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Api;
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
 
-use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
@@ -15,7 +15,7 @@ final class PayumStatusPaymentRequestCommandProvider implements PaymentRequestCo
         return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_STATUS;
     }
 
-    public function handle(PaymentRequestInterface $paymentRequest): object
+    public function provide(PaymentRequestInterface $paymentRequest): object
     {
         return new StatusPaymentRequest($paymentRequest->getHash());
     }
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml
index 4f5b8fc87a..31bfbffb8b 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml
@@ -18,12 +18,17 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.api.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumCapturePaymentRequestCommandProvider">
-            <tag name="sylius.api.payment_request.command_provider" factory="offline" type="capture" priority="-200" />
+        <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.offline" index-by="type" />
+            <tag name="sylius.payment_request.command_provider" factory="offline" />
         </service>
 
-        <service id="sylius.api.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumStatusPaymentRequestCommandProvider">
-            <tag name="sylius.api.payment_request.command_provider" factory="offline" type="status" priority="-200" />
+        <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumCapturePaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.offline" type="capture" />
+        </service>
+
+        <service id="sylius.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumStatusPaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.offline" type="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
new file mode 100644
index 0000000000..f9257b4925
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
@@ -0,0 +1,71 @@
+<?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\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessor">
+            <argument type="service" id="payum" />
+            <argument type="service" id="sylius.payment_request.payum.context" />
+        </service>
+
+        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactory">
+            <argument type="service" id="payum" />
+        </service>
+
+        <service id="sylius.payment_request.payum.capture" class="Sylius\Bundle\PayumBundle\CommandHandler\CapturePaymentRequestHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface" />
+            <argument type="service" id="sylius.factory.payum_capture" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+        <service id="sylius.payment_request.payum.authorize" class="Sylius\Bundle\PayumBundle\CommandHandler\AuthorizePaymentRequestHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface" />
+            <argument type="service" id="sylius.factory.payum_authorize" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+        <service id="sylius.payment_request.payum.status" class="Sylius\Bundle\PayumBundle\CommandHandler\StatusPaymentRequestHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface" />
+            <argument type="service" id="sylius.factory.payum_get_status_action" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+        <service id="sylius.payment_request.payum.context" class="Sylius\Bundle\PayumBundle\PaymentRequest\PayumPaymentRequestContext" />
+
+        <service id="sylius_payment_request.action.get_http_request" class="Sylius\Bundle\PayumBundle\Action\PaymentRequest\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\PayumBundle\Action\PaymentRequest\SyliusRenderTemplateAction">
+            <argument type="service" id="sylius.payment_request.payum.context" />
+
+            <tag name="payum.action" all="true" prepend="true" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal.xml
deleted file mode 100644
index 4b8a93dd56..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal.xml
+++ /dev/null
@@ -1,30 +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.api.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumCapturePaymentRequestCommandProvider">
-            <tag name="sylius.api.payment_request.command_provider" factory="paypal_express_checkout_nvp" type="capture" />
-        </service>
-
-        <service id="sylius.api.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumStatusPaymentRequestCommandProvider">
-            <tag name="sylius.api.payment_request.command_provider" factory="paypal_express_checkout_nvp" type="status" />
-        </service>
-
-    </services>
-</container>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml
new file mode 100644
index 0000000000..f3aa832f81
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml
@@ -0,0 +1,39 @@
+<?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.command_provider.payum.paypal_express_checkout" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.paypal_express_checkout" index-by="type" />
+            <tag name="sylius.payment_request.command_provider" factory="paypal_express_checkout" />
+        </service>
+
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumCapturePaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="capture" />
+        </service>
+
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumAuthorizePaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="authorize" />
+        </service>
+
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumStatusPaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="status" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml
index 6fae63e2e2..27b0a32360 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml
@@ -18,12 +18,21 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.api.payment_request.command_provider.payum.stripe.capture" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumCapturePaymentRequestCommandProvider">
-            <tag name="sylius.api.payment_request.command_provider" factory="stripe" type="capture" />
+        <service id="sylius.payment_request.command_provider.payum.stripe" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.stripe" index-by="type" />
+            <tag name="sylius.payment_request.command_provider" factory="stripe" />
         </service>
 
-        <service id="sylius.api.payment_request.command_provider.payum.stripe.status" class="Sylius\Bundle\ApiBundle\Payment\Payum\PayumStatusPaymentRequestCommandProvider">
-            <tag name="sylius.api.payment_request.command_provider" factory="stripe" type="status" />
+        <service id="sylius.payment_request.command_provider.payum.stripe.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumCapturePaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.stripe" type="capture" />
+        </service>
+
+        <service id="sylius.payment_request.command_provider.payum.stripe.authorize" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumAuthorizePaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.stripe" type="authorize" />
+        </service>
+
+        <service id="sylius.payment_request.command_provider.payum.stripe.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumStatusPaymentRequestCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.stripe" type="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_api.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_api.xml
deleted file mode 100644
index 15a744d9eb..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_api.xml
+++ /dev/null
@@ -1,67 +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"
->
-    <parameters>
-        <parameter key="sylius_api.payment_request.payum.capture.class">Payum\Core\Request\Capture</parameter>
-        <parameter key="sylius_api.payment_request.payum.status.class">Sylius\Bundle\PayumBundle\Request\GetStatus</parameter>
-    </parameters>
-    <services>
-        <defaults public="true" />
-
-        <service id="Sylius\Bundle\PayumBundle\Api\PayumRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\Api\PayumRequestProcessor">
-            <argument type="service" id="payum" />
-            <argument type="service" id="sylius.api.payment.payum.context" />
-        </service>
-
-        <service id="Sylius\Bundle\PayumBundle\Api\PayumTokenFactoryInterface" class="Sylius\Bundle\PayumBundle\Api\PayumTokenFactory">
-            <argument type="service" id="payum" />
-        </service>
-
-        <service id="sylius.api.payment_request.payum.capture" class="Sylius\Bundle\PayumBundle\CommandHandler\PaymentRequestHandler">
-            <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\Api\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\Api\PayumRequestProcessorInterface" />
-            <argument type="string">%sylius_api.payment_request.payum.capture.class%</argument>
-            <tag name="messenger.message_handler" bus="sylius.command_bus" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" />
-        </service>
-
-        <service id="sylius.api.payment_request.payum.status" class="Sylius\Bundle\PayumBundle\CommandHandler\PaymentRequestHandler">
-            <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\Api\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\Api\PayumRequestProcessorInterface" />
-            <argument type="string">%sylius_api.payment_request.payum.status.class%</argument>
-            <tag name="messenger.message_handler" bus="sylius.command_bus" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" />
-        </service>
-
-        <service id="sylius.api.payment.payum.context" class="Sylius\Bundle\PayumBundle\Api\PayumApiContext" />
-
-        <service id="sylius_api.action.get_http_request" class="Sylius\Bundle\PayumBundle\Action\SyliusApiGetHttpRequestAction">
-            <argument type="service" id="sylius.api.payment.payum.context" />
-
-            <tag name="payum.action" all="true" prepend="true" />
-        </service>
-
-        <service id="sylius_api.action.render_template" class="Sylius\Bundle\PayumBundle\Action\SyliusApiRenderTemplateAction">
-            <argument type="service" id="sylius.api.payment.payum.context" />
-
-            <tag name="payum.action" all="true" prepend="true" />
-        </service>
-
-    </services>
-</container>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
index f194ce1a53..ce30756b56 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
@@ -12,5 +12,11 @@
 
         <service id="sylius.factory.payum_resolve_next_route" class="Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactory" />
         <service id="Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactoryInterface" alias="sylius.factory.payum_resolve_next_route" />
+
+        <service id="sylius.factory.payum_capture" class="Sylius\Bundle\PayumBundle\Factory\CaptureFactory" />
+        <service id="Sylius\Bundle\PayumBundle\Factory\CaptureRequestFactoryInterface" alias="sylius.factory.payum_capture" />
+
+        <service id="sylius.factory.payum_authorize" class="Sylius\Bundle\PayumBundle\Factory\AuthorizeFactory" />
+        <service id="Sylius\Bundle\PayumBundle\Factory\AuthorizeRequestFactoryInterface" alias="sylius.factory.payum_authorize" />
     </services>
 </container>

From 75f028bda1f2902fd38591b0a73cb0e97b27bd66 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:14:26 +0100
Subject: [PATCH 010/200] Update field in migration

---
 .../Bundle/CoreBundle/Migrations/Version20231106190918.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
index a38141a0cc..d226a42118 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
@@ -25,7 +25,7 @@ final class Version20231106190918 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE sylius_payment_request (hash CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, data LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', details JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE sylius_payment_request (hash CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, request_payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id)');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id)');
     }

From 7ee2363dc1a12316000d988bfe7584e3e9c0ded0 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:15:13 +0100
Subject: [PATCH 011/200] Add validation on adding payment request

---
 .../config/validation/AddPaymentRequest.xml   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
new file mode 100644
index 0000000000..0010c3cc42
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
@@ -0,0 +1,38 @@
+<?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.
+
+-->
+
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
+    <class name="Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest">
+        <property name="paymentId">
+            <constraint name="NotBlank">
+                <option name="groups">
+                    <value>sylius</value>
+                </option>
+            </constraint>
+        </property>
+        <property name="paymentMethodCode">
+            <constraint name="NotBlank">
+                <option name="groups">
+                    <value>sylius</value>
+                </option>
+            </constraint>
+        </property>
+        <property name="type">
+            <constraint name="NotBlank">
+                <option name="groups">
+                    <value>sylius</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>

From 4be681c83158055c4950bf26534d90dc36bab6f8 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:16:19 +0100
Subject: [PATCH 012/200] Behat api scenario for PayPal

---
 ...paying_with_paypal_during_checkout.feature |  10 +-
 .../Behat/Context/Api/PaypalContext.php       | 183 ++++++++++++++++++
 src/Sylius/Behat/Context/Api/Resources.php    |   2 +
 .../Checkout/CheckoutOrderDetailsContext.php  | 118 +++++++++++
 .../Behat/Context/Setup/PaymentContext.php    |   2 +
 src/Sylius/Behat/Context/Ui/PaypalContext.php |  19 +-
 .../config/services/contexts/api/shop.xml     |  15 ++
 .../suites/api/checkout/paying_for_order.yml  |   5 +
 .../Behat/Service/Mocker/PaypalApiMocker.php  |  40 ++--
 .../Command/Payment/AddPaymentRequest.php     |  30 ++-
 .../Payment/Offline/StatusPaymentRequest.php  |  34 ----
 .../Command/Payment/UpdatePaymentRequest.php  |  43 ++++
 .../PaymentRequestHashAwareInterface.php      |   6 +-
 .../Payment/AddPaymentRequestHandler.php      |  28 +--
 .../Payment/UpdatePaymentRequestHandler.php   |  54 ++++++
 ...stHashAwareInputCommandDataTransformer.php |  36 ++++
 .../config/api_resources/PaymentRequest.xml   |  19 +-
 .../Commands/Payment/AddPaymentRequest.xml    |  11 +-
 .../Commands/Payment/UpdatePaymentRequest.xml |  23 +++
 .../ApiBundle/Resources/config/services.xml   |   4 +
 .../config/services/command_handlers.xml      |  13 +-
 .../Resources/config/services/payments.xml    |  13 --
 .../Bundle/ApiBundle/SyliusApiBundle.php      |   2 -
 .../PaymentRequestRepositoryInterface.php     |   5 +-
 24 files changed, 590 insertions(+), 125 deletions(-)
 create mode 100644 src/Sylius/Behat/Context/Api/PaypalContext.php
 create mode 100644 src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/StatusPaymentRequest.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml

diff --git a/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature b/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
index 5f6d8c2d39..35f9536287 100644
--- a/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
+++ b/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
@@ -12,7 +12,7 @@ Feature: Paying with paypal during checkout
         And the store ships everywhere for Free
         And I am logged in as "john@example.com"
 
-    @ui
+    @ui @api
     Scenario: Successfully authorize payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -23,7 +23,7 @@ Feature: Paying with paypal during checkout
         And I should see the thank you page
         And the latest order should have a payment with state "completed"
 
-    @ui
+    @ui @api
     Scenario: Successful payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -32,7 +32,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been completed
         And I should see the thank you page
 
-    @ui
+    @ui @api
     Scenario: Cancelling the payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -41,7 +41,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been cancelled
         And I should be able to pay again
 
-    @ui
+    @ui @api
     Scenario: Retrying the payment with success
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -52,7 +52,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been completed
         And I should see the thank you page
 
-    @ui
+    @ui @api
     Scenario: Retrying the payment and failing
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
diff --git a/src/Sylius/Behat/Context/Api/PaypalContext.php b/src/Sylius/Behat/Context/Api/PaypalContext.php
new file mode 100644
index 0000000000..b72f57e4eb
--- /dev/null
+++ b/src/Sylius/Behat/Context/Api/PaypalContext.php
@@ -0,0 +1,183 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Context\Api;
+
+use Behat\Behat\Context\Context;
+use Sylius\Behat\Client\ApiClientInterface;
+use Sylius\Behat\Client\RequestFactoryInterface;
+use Sylius\Behat\Client\ResponseCheckerInterface;
+use Sylius\Behat\Service\Mocker\PaypalApiMocker;
+use Sylius\Behat\Service\SharedStorageInterface;
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\HttpFoundation\Request as HTTPRequest;
+use Webmozart\Assert\Assert;
+
+final class PaypalContext implements Context
+{
+    public function __construct(
+        private ApiClientInterface $client,
+        private ResponseCheckerInterface $responseChecker,
+        private SharedStorageInterface $sharedStorage,
+        private RequestFactoryInterface $requestFactory,
+        private PaypalApiMocker $paypalApiMocker,
+        private PaymentMethodRepositoryInterface $paymentMethodRepository,
+    ) {
+    }
+
+    /**
+     * @When /^I confirm my order with paypal payment$/
+     * @Given /^I have confirmed my order with paypal payment$/
+     */
+    public function iConfirmMyOrderWithPaypalPayment(): void
+    {
+        $this->completeOrder();
+
+        $this->paypalApiMocker->performActionInApiInitializeScope(function () {
+            $payment = $this->responseChecker->getValue($this->client->getLastResponse(), 'payments')[0];
+            $this->postPaymentRequest($payment);
+
+            $uri = $this->responseChecker->getValue($this->client->getLastResponse(), '@id');
+            $this->sharedStorage->set('payment_request_uri', $uri);
+        });
+    }
+
+    /**
+     * @When I sign in to PayPal and authorize successfully
+     */
+    public function iSignInToPaypalAndAuthorizeSuccessfully(): void
+    {
+        $this->paypalApiMocker->performActionInApiSuccessfulScope(function () {
+            $uri = $this->sharedStorage->get('payment_request_uri');
+            $request = $this->requestFactory->custom(
+                $uri,
+                HttpRequest::METHOD_PUT,
+                [],
+                $this->client->getToken(),
+            );
+
+            $request->setContent([
+                'requestPayload' => [
+                    'target_path' => 'https://myshop.tld/target-path',
+                    'after_path' => 'https://myshop.tld/after-path',
+                    'http_request' => [
+                        'query' => [
+                            'token'=>'EC-2d9EV13959UR209410U',
+                            'PayerID'=>'UX8WBNYWGBVMG',
+                        ]
+                    ],
+                ],
+            ]);
+
+            $this->client->executeCustomRequest($request);
+        });
+    }
+
+    /**
+     * @When I sign in to PayPal and pay successfully
+     */
+    public function iSignInToPaypalAndPaySuccessfully(): void
+    {
+        $this->paypalApiMocker->performActionInApiSuccessfulScope(function () {
+            $this->paypalExpressCheckoutPage->pay();
+        });
+    }
+
+    /**
+     * @Given /^I have cancelled (?:|my )PayPal payment$/
+     * @When /^I cancel (?:|my )PayPal payment$/
+     */
+    public function iCancelMyPaypalPayment(): void
+    {
+        $this->paypalExpressCheckoutPage->cancel();
+    }
+
+    /**
+     * @When /^I try to pay(?:| again)$/
+     */
+    public function iTryToPayAgain(): void
+    {
+        $this->paypalApiMocker->performActionInApiInitializeScope(function () {
+            $this->orderDetails->pay();
+        });
+    }
+
+    /**
+     * @Then I should be notified that my payment has been cancelled
+     */
+    public function iShouldBeNotifiedThatMyPaymentHasBeenCancelled(): void
+    {
+        $this->assertNotification('Payment has been cancelled.');
+    }
+
+    /**
+     * @Then I should be notified that my payment has been completed
+     */
+    public function iShouldBeNotifiedThatMyPaymentHasBeenCompleted(): void
+    {
+        Assert::true(
+            $this->responseChecker->isUpdateSuccessful($this->client->getLastResponse()),
+            sprintf(
+                'Payment request could not be edited: %s',
+                $this->responseChecker->getError($this->client->getLastResponse()),
+            ),
+        );
+    }
+
+    private function completeOrder(): void
+    {
+        $request = $this->requestFactory->customItemAction(
+            'shop',
+            Resources::ORDERS,
+            $this->sharedStorage->get('cart_token'),
+            HTTPRequest::METHOD_PATCH,
+            'complete',
+        );
+
+        $this->client->executeCustomRequest($request);
+    }
+
+    private function postPaymentRequest(array $payment): void
+    {
+        $request = $this->requestFactory->create(
+            'shop',
+            Resources::PAYMENT_REQUESTS,
+            'Authorization',
+            $this->client->getToken(),
+        );
+
+        /** @var PaymentMethodInterface $paymentMethod */
+        $paymentMethod = $this->paymentMethodRepository->findOneBy([]);
+        /** @var GatewayConfigInterface $gatewayConfig */
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        $authorize = $gatewayConfig->getConfig()['use_authorize'] ?? false;
+
+        $request->setContent([
+            'paymentId' => $payment['@id'],
+            'paymentMethodCode' => $payment['method'],
+            'type' => $authorize
+                ? PaymentRequestInterface::DATA_TYPE_AUTHORIZE
+                : PaymentRequestInterface::DATA_TYPE_CAPTURE
+            ,
+            'requestPayload' => [
+                'target_path' => 'https://myshop.tld/target-path',
+                'after_path' => 'https://myshop.tld/after-path',
+            ],
+        ]);
+
+        $this->client->executeCustomRequest($request);
+    }
+}
diff --git a/src/Sylius/Behat/Context/Api/Resources.php b/src/Sylius/Behat/Context/Api/Resources.php
index d17212bbca..c0cbca789a 100644
--- a/src/Sylius/Behat/Context/Api/Resources.php
+++ b/src/Sylius/Behat/Context/Api/Resources.php
@@ -55,6 +55,8 @@ final class Resources
 
     public const PAYMENTS = 'payments';
 
+    public const PAYMENT_REQUESTS = 'payment-requests';
+
     public const PRODUCT_ASSOCIATION_TYPES = 'product-association-types';
 
     public const PRODUCT_ASSOCIATIONS = 'product-associations';
diff --git a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
new file mode 100644
index 0000000000..744e06c7cc
--- /dev/null
+++ b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Context\Api\Shop\Checkout;
+
+use Behat\Behat\Context\Context;
+use Sylius\Behat\Client\ApiClientInterface;
+use Sylius\Behat\Client\RequestFactoryInterface;
+use Sylius\Behat\Page\Shop\Order\ShowPageInterface;
+use Sylius\Behat\Page\Shop\Order\ThankYouPageInterface;
+use Sylius\Behat\Service\SharedStorageInterface;
+use Sylius\Component\Core\Model\OrderInterface;
+use Webmozart\Assert\Assert;
+
+final class CheckoutOrderDetailsContext implements Context
+{
+    public function __construct(
+        private RequestFactoryInterface $requestFactory,
+        private SharedStorageInterface $sharedStorage,
+        private ApiClientInterface $client,
+    ) {
+    }
+
+    /**
+     * @When /^I want to browse order details for (this order)$/
+     */
+    public function iWantToBrowseOrderDetailsForThisOrder(OrderInterface $order): void
+    {
+        $this->orderDetails->open(['tokenValue' => $order->getTokenValue()]);
+    }
+
+    /**
+     * @When I try to pay with :paymentMethodName payment method
+     */
+    public function iChangePaymentMethodTo(string $paymentMethodName): void
+    {
+        $this->orderDetails->choosePaymentMethod($paymentMethodName);
+        $this->orderDetails->pay();
+    }
+
+    /**
+     * @When I retry the payment with :paymentMethodName payment method
+     */
+    public function iChangePaymentMethodAfterCheckout(string $paymentMethodName): void
+    {
+        $this->thankYouPage->goToTheChangePaymentMethodPage();
+        $this->orderDetails->choosePaymentMethod($paymentMethodName);
+        $this->orderDetails->pay();
+    }
+
+    /**
+     * @When I want to pay for my order
+     */
+    public function iWantToPayForMyOrder(): void
+    {
+        $this->thankYouPage->goToTheChangePaymentMethodPage();
+    }
+
+    /**
+     * @When I try to pay for my order
+     */
+    public function iTryToPayForMyOrder(): void
+    {
+        $this->thankYouPage->goToTheChangePaymentMethodPage();
+        $this->orderDetails->pay();
+    }
+
+    /**
+     * @Then I should be able to pay (again)
+     */
+    public function iShouldBeAbleToPay(): void
+    {
+        Assert::true($this->orderDetails->hasPayAction());
+    }
+
+    /**
+     * @Then I should not be able to pay (again)
+     */
+    public function iShouldNotBeAbleToPay(): void
+    {
+        Assert::false($this->orderDetails->canBePaid());
+    }
+
+    /**
+     * @Then I should see :quantity as number of items
+     */
+    public function iShouldSeeAsNumberOfItems(int $quantity): void
+    {
+        Assert::same($this->orderDetails->getAmountOfItems(), $quantity);
+    }
+
+    /**
+     * @Then I should have chosen :paymentMethodName payment method
+     */
+    public function iShouldHaveChosenPaymentMethod(string $paymentMethodName): void
+    {
+        $this->thankYouPage->goToTheChangePaymentMethodPage();
+        Assert::same($this->orderDetails->getChosenPaymentMethod(), $paymentMethodName);
+    }
+
+    /**
+     * @Then I should be notified to choose a payment method
+     */
+    public function iShouldBeNotifiedToChooseAPaymentMethod(): void
+    {
+        Assert::contains($this->orderDetails->getPaymentValidationMessage(), 'Please select a payment method.');
+    }
+}
diff --git a/src/Sylius/Behat/Context/Setup/PaymentContext.php b/src/Sylius/Behat/Context/Setup/PaymentContext.php
index 9fa1a569e2..fc677d192a 100644
--- a/src/Sylius/Behat/Context/Setup/PaymentContext.php
+++ b/src/Sylius/Behat/Context/Setup/PaymentContext.php
@@ -17,6 +17,7 @@ use Behat\Behat\Context\Context;
 use Doctrine\Persistence\ObjectManager;
 use Sylius\Behat\Service\SharedStorageInterface;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Component\Core\Formatter\StringInflector;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -161,6 +162,7 @@ final readonly class PaymentContext implements Context
      */
     public function thePaymentMethodRequiresAuthorizationBeforeCapturing(PaymentMethodInterface $paymentMethod)
     {
+        /** @var GatewayConfigInterface $config */
         $config = $paymentMethod->getGatewayConfig();
         $config->setConfig(array_merge($config->getConfig(), ['use_authorize' => true]));
         $paymentMethod->setGatewayConfig($config);
diff --git a/src/Sylius/Behat/Context/Ui/PaypalContext.php b/src/Sylius/Behat/Context/Ui/PaypalContext.php
index e3d45ba0c8..760d461551 100644
--- a/src/Sylius/Behat/Context/Ui/PaypalContext.php
+++ b/src/Sylius/Behat/Context/Ui/PaypalContext.php
@@ -33,7 +33,7 @@ final class PaypalContext implements Context
      * @When /^I confirm my order with paypal payment$/
      * @Given /^I have confirmed my order with paypal payment$/
      */
-    public function iConfirmMyOrderWithPaypalPayment()
+    public function iConfirmMyOrderWithPaypalPayment(): void
     {
         $this->paypalApiMocker->performActionInApiInitializeScope(function () {
             $this->summaryPage->confirmOrder();
@@ -43,7 +43,7 @@ final class PaypalContext implements Context
     /**
      * @When I sign in to PayPal and authorize successfully
      */
-    public function iSignInToPaypalAndAuthorizeSuccessfully()
+    public function iSignInToPaypalAndAuthorizeSuccessfully(): void
     {
         $this->paypalApiMocker->performActionInApiSuccessfulScope(function () {
             $this->paypalExpressCheckoutPage->authorize();
@@ -53,7 +53,7 @@ final class PaypalContext implements Context
     /**
      * @When I sign in to PayPal and pay successfully
      */
-    public function iSignInToPaypalAndPaySuccessfully()
+    public function iSignInToPaypalAndPaySuccessfully(): void
     {
         $this->paypalApiMocker->performActionInApiSuccessfulScope(function () {
             $this->paypalExpressCheckoutPage->pay();
@@ -64,7 +64,7 @@ final class PaypalContext implements Context
      * @Given /^I have cancelled (?:|my )PayPal payment$/
      * @When /^I cancel (?:|my )PayPal payment$/
      */
-    public function iCancelMyPaypalPayment()
+    public function iCancelMyPaypalPayment(): void
     {
         $this->paypalExpressCheckoutPage->cancel();
     }
@@ -72,7 +72,7 @@ final class PaypalContext implements Context
     /**
      * @When /^I try to pay(?:| again)$/
      */
-    public function iTryToPayAgain()
+    public function iTryToPayAgain(): void
     {
         $this->paypalApiMocker->performActionInApiInitializeScope(function () {
             $this->orderDetails->pay();
@@ -82,7 +82,7 @@ final class PaypalContext implements Context
     /**
      * @Then I should be notified that my payment has been cancelled
      */
-    public function iShouldBeNotifiedThatMyPaymentHasBeenCancelled()
+    public function iShouldBeNotifiedThatMyPaymentHasBeenCancelled(): void
     {
         $this->assertNotification('Payment has been cancelled.');
     }
@@ -90,15 +90,12 @@ final class PaypalContext implements Context
     /**
      * @Then I should be notified that my payment has been completed
      */
-    public function iShouldBeNotifiedThatMyPaymentHasBeenCompleted()
+    public function iShouldBeNotifiedThatMyPaymentHasBeenCompleted(): void
     {
         $this->assertNotification('Payment has been completed.');
     }
 
-    /**
-     * @param string $expectedNotification
-     */
-    private function assertNotification($expectedNotification)
+    private function assertNotification(string $expectedNotification): void
     {
         $notifications = $this->orderDetails->getNotifications();
         $hasNotifications = '';
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
index c6d117e1c2..cec644c8ee 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
@@ -166,6 +166,15 @@
             <argument type="service" id="sylius.behat.shared_storage" />
         </service>
 
+        <service id="sylius.behat.context.api.paypal" class="Sylius\Behat\Context\Api\PaypalContext">
+            <argument type="service" id="sylius.behat.api_platform_client.shop" />
+            <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
+            <argument type="service" id="sylius.behat.shared_storage" />
+            <argument type="service" id="sylius.behat.request_factory" />
+            <argument type="service" id="sylius.behat.paypal_api_mocker" />
+            <argument type="service" id="sylius.repository.payment_method" />
+        </service>
+
         <service id="sylius.behat.context.api.shop.shipment" class="Sylius\Behat\Context\Api\Shop\ShipmentContext">
             <argument type="service" id="sylius.behat.api_platform_client.shop" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
@@ -190,6 +199,12 @@
             <argument type="service" id="sylius.behat.api_platform_client.shop" />
         </service>
 
+        <service id="sylius.behat.context.api.shop.checkout.order_details" class="Sylius\Behat\Context\Api\Shop\Checkout\CheckoutOrderDetailsContext">
+            <argument type="service" id="sylius.behat.request_factory" />
+            <argument type="service" id="sylius.behat.shared_storage" />
+            <argument type="service" id="sylius.behat.api_platform_client.shop" />
+        </service>
+
         <service id="Sylius\Behat\Context\Api\Shop\TaxonContext">
             <argument type="service" id="sylius.behat.api_platform_client.shop" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
diff --git a/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml b/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
index 7918de3352..8a29cd9251 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
@@ -11,8 +11,10 @@ default:
                 - sylius.behat.context.transform.cart
                 - sylius.behat.context.transform.channel
                 - sylius.behat.context.transform.country
+                - sylius.behat.context.transform.customer
                 - sylius.behat.context.transform.lexical
                 - sylius.behat.context.transform.locale
+                - sylius.behat.context.transform.order
                 - sylius.behat.context.transform.payment
                 - sylius.behat.context.transform.product
                 - sylius.behat.context.transform.product_variant
@@ -25,6 +27,7 @@ default:
 
                 - sylius.behat.context.setup.cart
                 - sylius.behat.context.setup.channel
+                - sylius.behat.context.setup.currency
                 - sylius.behat.context.setup.checkout
                 - sylius.behat.context.setup.geographical
                 - sylius.behat.context.setup.locale
@@ -34,8 +37,10 @@ default:
                 - sylius.behat.context.setup.shipping
                 - sylius.behat.context.setup.shop_api_security
                 - sylius.behat.context.setup.taxation
+                - sylius.behat.context.setup.user
                 - sylius.behat.context.setup.zone
 
+                - sylius.behat.context.api.paypal
                 - sylius.behat.context.api.shop.cart
                 - sylius.behat.context.api.shop.checkout
                 - sylius.behat.context.api.shop.checkout.complete
diff --git a/src/Sylius/Behat/Service/Mocker/PaypalApiMocker.php b/src/Sylius/Behat/Service/Mocker/PaypalApiMocker.php
index 42282c2756..8d1e953830 100644
--- a/src/Sylius/Behat/Service/Mocker/PaypalApiMocker.php
+++ b/src/Sylius/Behat/Service/Mocker/PaypalApiMocker.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Behat\Service\Mocker;
 
-use Mockery\Mock;
+use Mockery\MockInterface;
 use Payum\Core\HttpClientInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
@@ -27,21 +27,21 @@ class PaypalApiMocker
     ) {
     }
 
-    public function performActionInApiInitializeScope(callable $action)
+    public function performActionInApiInitializeScope(callable $action): void
     {
         $this->mockApiPaymentInitializeResponse();
         $action();
         $this->mocker->unmockAll();
     }
 
-    public function performActionInApiSuccessfulScope(callable $action)
+    public function performActionInApiSuccessfulScope(callable $action): void
     {
         $this->mockApiSuccessfulPaymentResponse();
         $action();
         $this->mocker->unmockAll();
     }
 
-    private function mockApiSuccessfulPaymentResponse()
+    private function mockApiSuccessfulPaymentResponse(): void
     {
         $mockedResponse = $this->responseLoader->getMockedResponse('Paypal/paypal_api_successful_payment.json');
         $firstGetExpressCheckoutDetailsStream = $this->mockStream($mockedResponse['firstGetExpressCheckoutDetails']);
@@ -57,13 +57,13 @@ class PaypalApiMocker
         $getTransactionDetailsResponse = $this->mockHttpResponse(200, $getTransactionDetailsStream);
 
         $this->mocker->mockService('sylius.payum.http_client', HttpClientInterface::class)
-            ->shouldReceive('send')
+            ->expects('send')
             ->times(4)
-            ->andReturn($firstGetExpressCheckoutDetailsResponse, $doExpressCheckoutPaymentResponse, $secondGetExpressCheckoutDetailsResponse, $getTransactionDetailsResponse)
+            ->andReturns($firstGetExpressCheckoutDetailsResponse, $doExpressCheckoutPaymentResponse, $secondGetExpressCheckoutDetailsResponse, $getTransactionDetailsResponse)
         ;
     }
 
-    private function mockApiPaymentInitializeResponse()
+    private function mockApiPaymentInitializeResponse(): void
     {
         $mockedResponse = $this->responseLoader->getMockedResponse('Paypal/paypal_api_initialize_payment.json');
         $setExpressCheckoutStream = $this->mockStream($mockedResponse['setExpressCheckout']);
@@ -73,36 +73,26 @@ class PaypalApiMocker
         $getExpressCheckoutDetailsResponse = $this->mockHttpResponse(200, $getExpressCheckoutDetailsStream);
 
         $this->mocker->mockService('sylius.payum.http_client', HttpClientInterface::class)
-            ->shouldReceive('send')
+            ->expects('send')
             ->twice()
-            ->andReturn($setExpressCheckoutResponse, $getExpressCheckoutDetailsResponse)
+            ->andReturns($setExpressCheckoutResponse, $getExpressCheckoutDetailsResponse)
         ;
     }
 
-    /**
-     * @param string $content
-     *
-     * @return Mock
-     */
-    private function mockStream($content)
+    private function mockStream(string $content): MockInterface
     {
         $mockedStream = $this->mocker->mockCollaborator(StreamInterface::class);
-        $mockedStream->shouldReceive('getContents')->once()->andReturn($content);
-        $mockedStream->shouldReceive('close')->once()->andReturn();
+        $mockedStream->expects('getContents')->andReturns($content);
+        $mockedStream->expects('close')->andReturns();
 
         return $mockedStream;
     }
 
-    /**
-     * @param int $statusCode
-     *
-     * @return Mock
-     */
-    private function mockHttpResponse($statusCode, $streamMock)
+    private function mockHttpResponse(int $statusCode, MockInterface $streamMock): MockInterface
     {
         $mockedHttpResponse = $this->mocker->mockCollaborator(ResponseInterface::class);
-        $mockedHttpResponse->shouldReceive('getStatusCode')->once()->andReturn($statusCode);
-        $mockedHttpResponse->shouldReceive('getBody')->once()->andReturn($streamMock);
+        $mockedHttpResponse->expects('getStatusCode')->andReturns($statusCode);
+        $mockedHttpResponse->expects('getBody')->andReturns($streamMock);
 
         return $mockedHttpResponse;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index 6bc6d8243b..0acf1e7922 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -13,18 +13,36 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ApiBundle\Command\Payment;
 
-use Sylius\Bundle\ApiBundle\Command\CustomerEmailAwareInterface;
 use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
-use Sylius\Bundle\ApiBundle\Command\PaymentMethodCodeAwareInterface;
 
 /** @experimental */
 class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
 {
     public function __construct(
-        public string $type,
-        public mixed $requestPayload,
-        public ?string $paymentId,
-        public ?string $paymentMethodCode,
+        private string $paymentId,
+        private string $paymentMethodCode,
+        private string $type,
+        private mixed $requestPayload = null,
     ) {
     }
+
+    public function getPaymentId(): string
+    {
+        return $this->paymentId;
+    }
+
+    public function getPaymentMethodCode(): string
+    {
+        return $this->paymentMethodCode;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getRequestPayload(): mixed
+    {
+        return $this->requestPayload;
+    }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/StatusPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/StatusPaymentRequest.php
deleted file mode 100644
index f014a9fed4..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/Offline/StatusPaymentRequest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\Command\Payment\Offline;
-
-use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
-
-class StatusPaymentRequest implements PaymentRequestHashAwareInterface
-{
-    public function __construct(
-        protected string $hash,
-    ) {
-    }
-
-    public function getHash(): string
-    {
-        return $this->hash;
-    }
-
-    public function setHash(string $hash): void
-    {
-        $this->hash = $hash;
-    }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
new file mode 100644
index 0000000000..9250d43aa8
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Command\Payment;
+
+use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
+use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+
+/** @experimental */
+class UpdatePaymentRequest implements PaymentRequestHashAwareInterface, IriToIdentifierConversionAwareInterface
+{
+    protected ?string $hash = null;
+
+    public function __construct(
+        private mixed $requestPayload = null,
+    ) {
+    }
+
+    public function getRequestPayload(): mixed
+    {
+        return $this->requestPayload;
+    }
+
+    public function getHash(): ?string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(?string $hash): void
+    {
+        $this->hash = $hash;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php b/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
index f2e075002a..ca52ce4df7 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
@@ -14,9 +14,9 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\Command;
 
 /** @experimental */
-interface PaymentRequestHashAwareInterface
+interface PaymentRequestHashAwareInterface extends CommandAwareDataTransformerInterface
 {
-    public function getHash(): string;
+    public function getHash(): ?string;
 
-    public function setHash(string $hash): void;
+    public function setHash(?string $hash): void;
 }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index cb10665cc7..d6d86c537a 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -13,10 +13,9 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
-use Doctrine\Persistence\ObjectManager;
 use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
 use Sylius\Bundle\ApiBundle\Exception\PaymentRequestNotSupportedException;
-use Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
@@ -34,7 +33,6 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         private FactoryInterface $paymentRequestFactory,
         private PaymentMethodRepositoryInterface $paymentMethodRepository,
         private PaymentRepositoryInterface $paymentRepository,
-        private ObjectManager $paymentRequestManager,
         private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
         private MessageBusInterface $commandBus,
     ) {
@@ -47,7 +45,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
             throw new PaymentRequestNotSupportedException();
         }
 
-        $command = $this->paymentRequestCommandProvider->handle($paymentRequest);
+        $command = $this->paymentRequestCommandProvider->provide($paymentRequest);
 
         $this->commandBus->dispatch($command);
 
@@ -57,20 +55,28 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
     private function createPaymentRequest(AddPaymentRequest $addPaymentRequest): PaymentRequestInterface
     {
         /** @var PaymentMethodInterface|null $paymentMethod */
-        $paymentMethod = $this->paymentMethodRepository->findOneBy(['code' => $addPaymentRequest->paymentMethodCode]);
-        Assert::notNull($paymentMethod);
+        $paymentMethod = $this->paymentMethodRepository->findOneBy([
+            'code' => $addPaymentRequest->getPaymentMethodCode()
+        ]);
+        Assert::notNull($paymentMethod, sprintf(
+            'Payment method code "%s", can not be found!',
+            $addPaymentRequest->getPaymentMethodCode()
+        ));
         /** @var PaymentInterface|null $payment */
-        $payment = $this->paymentRepository->find($addPaymentRequest->paymentId);
-        Assert::notNull($payment);
+        $payment = $this->paymentRepository->find($addPaymentRequest->getPaymentId());
+        Assert::notNull(
+            $payment,
+            sprintf('Payment ID "%s" can not be found!', $addPaymentRequest->getPaymentId())
+        );
 
         /** @var PaymentRequestInterface $paymentRequest */
         $paymentRequest = $this->paymentRequestFactory->createNew();
         $paymentRequest->setPayment($payment);
         $paymentRequest->setMethod($paymentMethod);
-        $paymentRequest->setType($addPaymentRequest->type);
-        $paymentRequest->setRequestPayload($addPaymentRequest->requestPayload);
+        $paymentRequest->setType($addPaymentRequest->getType());
+        $paymentRequest->setRequestPayload($addPaymentRequest->getRequestPayload());
 
-        $this->paymentRequestManager->persist($paymentRequest);
+        $this->paymentRepository->add($paymentRequest);
         return $paymentRequest;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
new file mode 100644
index 0000000000..170e75a01b
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest;
+use Sylius\Bundle\ApiBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Webmozart\Assert\Assert;
+
+/** @experimental */
+final class UpdatePaymentRequestHandler implements MessageHandlerInterface
+{
+    public function __construct(
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
+        private MessageBusInterface $commandBus,
+    ) {
+    }
+
+    public function __invoke(UpdatePaymentRequest $updatePaymentRequest): PaymentRequestInterface
+    {
+        $hash = $updatePaymentRequest->getHash();
+        Assert::notNull($hash);
+        /** @var PaymentRequestInterface $paymentRequest */
+        $paymentRequest = $this->paymentRequestRepository->find($hash);
+
+        $paymentRequest->setRequestPayload($updatePaymentRequest->getRequestPayload());
+
+        if (!$this->paymentRequestCommandProvider->supports($paymentRequest)) {
+            throw new PaymentRequestNotSupportedException();
+        }
+
+        $command = $this->paymentRequestCommandProvider->provide($paymentRequest);
+
+        $this->commandBus->dispatch($command);
+
+        return $paymentRequest;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
new file mode 100644
index 0000000000..2b2591abc4
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\DataTransformer;
+
+use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+/** @experimental */
+final class PaymentRequestHashAwareInputCommandDataTransformer implements CommandDataTransformerInterface
+{
+    public function transform($object, string $to, array $context = [])
+    {
+        /** @var PaymentRequestInterface $paymentRequest */
+        $paymentRequest = $context['object_to_populate'];
+
+        $object->setHash($paymentRequest->getHash());
+
+        return $object;
+    }
+
+    public function supportsTransformation($object): bool
+    {
+        return $object instanceof PaymentRequestHashAwareInterface;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
index 9b05ee9b12..659ad5a262 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -40,10 +40,10 @@
                 <attribute name="messenger">input</attribute>
                 <attribute name="input">Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest</attribute>
                 <attribute name="denormalization_context">
-                    <attribute name="groups">shop:product_review:create</attribute>
+                    <attribute name="groups">shop:payment_request:create</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:product_review:read</attribute>
+                    <attribute name="groups">shop:payment_request:read</attribute>
                 </attribute>
             </collectionOperation>
         </collectionOperations>
@@ -56,6 +56,21 @@
                     <attribute name="groups">shop:payment_request:read</attribute>
                 </attribute>
             </itemOperation>
+
+            <itemOperation name="shop_put">
+                <attribute name="method">PUT</attribute>
+                <attribute name="path">/shop/payment-requests/{hash}</attribute>
+                <attribute name="messenger">input</attribute>
+                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest</attribute>
+                <attribute name="denormalization_context">
+                    <attribute name="groups">shop:payment_request:update</attribute>
+                </attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">
+                        <attribute>shop:payment_request:read</attribute>
+                    </attribute>
+                </attribute>
+            </itemOperation>
         </itemOperations>
 
         <property name="hash" identifier="true" writable="false" />
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
index ce75fb1877..62ce8a8c04 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
@@ -16,19 +16,16 @@
             xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
 >
     <class name="Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest">
-        <attribute name="type">
-            <group>shop:payment_request:create</group>
-        </attribute>
-        <attribute name="requestPayload">
-            <group>shop:payment_request:create</group>
-        </attribute>
         <attribute name="paymentId">
             <group>shop:payment_request:create</group>
         </attribute>
         <attribute name="paymentMethodCode">
             <group>shop:payment_request:create</group>
         </attribute>
-        <attribute name="">
+        <attribute name="type">
+            <group>shop:payment_request:create</group>
+        </attribute>
+        <attribute name="requestPayload">
             <group>shop:payment_request:create</group>
         </attribute>
     </class>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml
new file mode 100644
index 0000000000..65bd2e1abc
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+
+<!--
+
+ 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.
+
+-->
+
+<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
+>
+    <class name="Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest">
+        <attribute name="requestPayload">
+            <group>shop:payment_request:update</group>
+        </attribute>
+    </class>
+</serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml
index 0e37411843..b50b971f63 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml
@@ -69,6 +69,10 @@
             <tag name="sylius.api.command_data_transformer" />
         </service>
 
+        <service id="Sylius\Bundle\ApiBundle\DataTransformer\PaymentRequestHashAwareInputCommandDataTransformer">
+            <tag name="sylius.api.command_data_transformer" />
+        </service>
+
         <service id="Sylius\Bundle\ApiBundle\Changer\PaymentMethodChangerInterface" class="Sylius\Bundle\ApiBundle\Changer\PaymentMethodChanger">
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="sylius.repository.payment_method" />
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 5d7412ea2f..948afa00ad 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -240,11 +240,18 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\AddPaymentRequestHandler">
-            <argument type="service" id="sylius.factory.payment" />
+            <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.repository.payment" />
-            <argument type="service" id="sylius.manager.payment_request" />
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
+            <argument type="service" id="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+        <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\UpdatePaymentRequestHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
             <argument type="service" id="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
index 377da87e5f..18c92fc7ec 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/payments.xml
@@ -23,18 +23,5 @@
             <argument type="service" id="Sylius\Bundle\ApiBundle\Provider\CompositePaymentConfigurationProvider" />
         </service>
 
-        <service id="sylius.api.payment_request.command_provider.locator" class="Symfony\Component\DependencyInjection\ServiceLocator">
-            <tag name="container.service_locator" />
-        </service>
-
-        <service id="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationCheckerInterface" class="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationChecker">
-            <argument type="service" id="sylius.repository.payment_request" />
-        </service>
-
-        <service id="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\ApiBundle\Payment\PaymentRequestCommandProvider">
-            <argument type="service" id="Sylius\Bundle\ApiBundle\Payment\Checker\PaymentRequestDuplicationCheckerInterface" />
-            <argument type="service" id="sylius.api.payment_request.command_provider.locator" />
-        </service>
-
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php b/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
index 50bb0ca71a..f74852f938 100644
--- a/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
+++ b/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
@@ -17,7 +17,6 @@ use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\CommandDataTransformerP
 use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\ExtractorMergingCompilerPass;
 use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\FlattenExceptionNormalizerDecoratorCompilerPass;
 use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\LegacyErrorHandlingCompilerPass;
-use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\PaymentRequestCommandProviderPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -28,7 +27,6 @@ final class SyliusApiBundle extends Bundle
         $container->addCompilerPass(new CommandDataTransformerPass());
         $container->addCompilerPass(new FlattenExceptionNormalizerDecoratorCompilerPass());
         $container->addCompilerPass(new LegacyErrorHandlingCompilerPass());
-        $container->addCompilerPass(new PaymentRequestCommandProviderPass());
         $container->addCompilerPass(new ExtractorMergingCompilerPass());
     }
 }
diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
index 98797e75c1..42cb38aeaa 100644
--- a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -13,13 +13,12 @@ declare(strict_types=1);
 
 namespace Sylius\Component\Payment\Repository;
 
-use Sylius\Component\Payment\Model\PaymentInterface;
-use Sylius\Component\Payment\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
 interface PaymentRequestRepositoryInterface
 {
     /**
      * @return PaymentRequestInterface[]
      */
-    public function findExisting(PaymentInterface $payment, PaymentMethodInterface $paymentMethod, string $type): array;
+    public function findOtherExisting(PaymentRequestInterface $paymentRequest): array;
 }

From a7154bdbaf5d43c50af83a31654ad22fc57da99b Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:22:05 +0100
Subject: [PATCH 013/200] Attempt to get a real object instead of proxy one

---
 .../Payment/UpdatePaymentRequestHandler.php        |  5 +++--
 .../Doctrine/ORM/PaymentRequestRepository.php      | 14 ++++++++++++++
 .../PaymentRequestRepositoryInterface.php          |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 170e75a01b..4a6eec2f7f 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -36,8 +36,9 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
     {
         $hash = $updatePaymentRequest->getHash();
         Assert::notNull($hash);
-        /** @var PaymentRequestInterface $paymentRequest */
-        $paymentRequest = $this->paymentRequestRepository->find($hash);
+
+        $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
+        Assert::notNull($paymentRequest);
 
         $paymentRequest->setRequestPayload($updatePaymentRequest->getRequestPayload());
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index 77b2a5fe4d..25a6cabc0a 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -36,4 +36,18 @@ class PaymentRequestRepository extends EntityRepository implements PaymentReques
             ->getResult()
         ;
     }
+
+    public function findOneByHash(string $hash): ?PaymentRequestInterface
+    {
+        return $this->createQueryBuilder('o')
+            ->addSelect('payment')
+            ->addSelect('method')
+            ->innerJoin('o.payment', 'payment')
+            ->innerJoin('o.method', 'method')
+            ->where('o.hash = :hash')
+            ->setParameter('hash', $hash)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
 }
diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
index 42cb38aeaa..9c7c5381e0 100644
--- a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -21,4 +21,6 @@ interface PaymentRequestRepositoryInterface
      * @return PaymentRequestInterface[]
      */
     public function findOtherExisting(PaymentRequestInterface $paymentRequest): array;
+
+    public function findOneByHash(string $hash): ?PaymentRequestInterface;
 }

From df7111d773ca43348e9beae739df39d15ff81afb Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 1 Feb 2024 20:03:52 +0100
Subject: [PATCH 014/200] Pay with PayPal via authorize working

---
 .../Behat/Context/Api/PaypalContext.php       | 48 +++++++++--------
 .../Payment/AddPaymentRequestHandler.php      |  8 ++-
 .../config/services/command_handlers.xml      |  2 +-
 .../config/services/fixtures_factories.xml    |  2 +-
 .../Doctrine/ORM/PaymentRequestRepository.php |  5 ++
 .../Resources/config/services.xml             |  5 ++
 .../SyliusGetHttpRequestAction.php            |  4 +-
 .../SyliusRenderTemplateAction.php            |  4 +-
 .../AuthorizePaymentRequestHandler.php        | 18 ++++---
 .../CapturePaymentRequestHandler.php          | 16 +++---
 .../StatusPaymentRequestHandler.php           | 15 +++---
 ...tContext.php => PaymentRequestContext.php} |  2 +-
 ...php => PaymentRequestContextInterface.php} |  2 +-
 .../AfterTokenizedRequestProcessor.php        | 50 +++++++++++++++++
 ...fterTokenizedRequestProcessorInterface.php | 16 ++++++
 ...uestProcessor.php => RequestProcessor.php} | 21 ++------
 ...face.php => RequestProcessorInterface.php} |  2 +-
 ...vider.php => AuthorizeCommandProvider.php} |  2 +-
 ...rovider.php => CaptureCommandProvider.php} |  2 +-
 .../Provider/PaymentRequestProvider.php       | 49 +++++++++++++++++
 .../PaymentRequestProviderInterface.php       | 12 +++++
 ...Provider.php => StatusCommandProvider.php} |  2 +-
 .../Resources/config/integrations/offline.xml |  4 +-
 .../config/integrations/payment_request.xml   | 30 ++++++++---
 .../integrations/paypal_express_checkout.xml  |  6 +--
 .../Resources/config/integrations/stripe.xml  |  6 +--
 .../Payment/Factory/PaymentRequestFactory.php | 54 +++++++++++++++++++
 .../PaymentRequestFactoryInterface.php        | 31 +++++++++++
 .../PaymentRequestRepositoryInterface.php     |  8 ++-
 29 files changed, 327 insertions(+), 99 deletions(-)
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/{PayumPaymentRequestContext.php => PaymentRequestContext.php} (90%)
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/{PayumPaymentRequestContextInterface.php => PaymentRequestContextInterface.php} (92%)
 create mode 100644 src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/{PayumRequestProcessor.php => RequestProcessor.php} (59%)
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/{PayumRequestProcessorInterface.php => RequestProcessorInterface.php} (93%)
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/{PayumAuthorizePaymentRequestCommandProvider.php => AuthorizeCommandProvider.php} (85%)
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/{PayumCapturePaymentRequestCommandProvider.php => CaptureCommandProvider.php} (86%)
 create mode 100644 src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProvider.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/{PayumStatusPaymentRequestCommandProvider.php => StatusCommandProvider.php} (86%)
 create mode 100644 src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
 create mode 100644 src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php

diff --git a/src/Sylius/Behat/Context/Api/PaypalContext.php b/src/Sylius/Behat/Context/Api/PaypalContext.php
index b72f57e4eb..06645c1654 100644
--- a/src/Sylius/Behat/Context/Api/PaypalContext.php
+++ b/src/Sylius/Behat/Context/Api/PaypalContext.php
@@ -61,28 +61,7 @@ final class PaypalContext implements Context
     public function iSignInToPaypalAndAuthorizeSuccessfully(): void
     {
         $this->paypalApiMocker->performActionInApiSuccessfulScope(function () {
-            $uri = $this->sharedStorage->get('payment_request_uri');
-            $request = $this->requestFactory->custom(
-                $uri,
-                HttpRequest::METHOD_PUT,
-                [],
-                $this->client->getToken(),
-            );
-
-            $request->setContent([
-                'requestPayload' => [
-                    'target_path' => 'https://myshop.tld/target-path',
-                    'after_path' => 'https://myshop.tld/after-path',
-                    'http_request' => [
-                        'query' => [
-                            'token'=>'EC-2d9EV13959UR209410U',
-                            'PayerID'=>'UX8WBNYWGBVMG',
-                        ]
-                    ],
-                ],
-            ]);
-
-            $this->client->executeCustomRequest($request);
+            $this->putPaymentRequest($this->sharedStorage->get('payment_request_uri'));
         });
     }
 
@@ -180,4 +159,29 @@ final class PaypalContext implements Context
 
         $this->client->executeCustomRequest($request);
     }
+
+    function putPaymentRequest(string $paymentRequestUri): void
+    {
+        $request = $this->requestFactory->custom(
+            $paymentRequestUri,
+            HttpRequest::METHOD_PUT,
+            [],
+            $this->client->getToken(),
+        );
+
+        $request->setContent([
+            'requestPayload' => [
+                'target_path' => 'https://myshop.tld/target-path',
+                'after_path' => 'https://myshop.tld/after-path',
+                'http_request' => [
+                    'query' => [
+                        'token' => 'EC-2d9EV13959UR209410U',
+                        'PayerID' => 'UX8WBNYWGBVMG',
+                    ]
+                ],
+            ],
+        ]);
+
+        $this->client->executeCustomRequest($request);
+    }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index d6d86c537a..177753c0c0 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -20,6 +20,7 @@ use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
 use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
+use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
@@ -30,7 +31,7 @@ use Webmozart\Assert\Assert;
 final class AddPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private FactoryInterface $paymentRequestFactory,
+        private PaymentRequestFactoryInterface $paymentRequestFactory,
         private PaymentMethodRepositoryInterface $paymentMethodRepository,
         private PaymentRepositoryInterface $paymentRepository,
         private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
@@ -69,10 +70,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
             sprintf('Payment ID "%s" can not be found!', $addPaymentRequest->getPaymentId())
         );
 
-        /** @var PaymentRequestInterface $paymentRequest */
-        $paymentRequest = $this->paymentRequestFactory->createNew();
-        $paymentRequest->setPayment($payment);
-        $paymentRequest->setMethod($paymentMethod);
+        $paymentRequest = $this->paymentRequestFactory->createWithPaymentAndPaymentMethod($payment, $paymentMethod);
         $paymentRequest->setType($addPaymentRequest->getType());
         $paymentRequest->setRequestPayload($addPaymentRequest->getRequestPayload());
 
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 948afa00ad..2c2eb8facb 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -240,7 +240,7 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\AddPaymentRequestHandler">
-            <argument type="service" id="sylius.factory.payment_request" />
+            <argument type="service" id="sylius.custom_factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml
index 90c9ca561a..bcc182fde8 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml
@@ -32,7 +32,7 @@
         </service>
 
         <service id="sylius.fixture.example_factory.payment_method" class="Sylius\Bundle\CoreBundle\Fixture\Factory\PaymentMethodExampleFactory">
-            <argument type="service" id="sylius.factory.payment_method" />
+            <argument type="service" id="sylius.custom_factory.payment_method" />
             <argument type="service" id="sylius.repository.locale" />
             <argument type="service" id="sylius.repository.channel" />
         </service>
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index 25a6cabc0a..af750bf70f 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -17,6 +17,11 @@ use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 
+/**
+ * @template T of PaymentRequestInterface
+ *
+ * @implements PaymentRequestRepositoryInterface<T>
+ */
 class PaymentRequestRepository extends EntityRepository implements PaymentRequestRepositoryInterface
 {
     public function findOtherExisting(PaymentRequestInterface $paymentRequest): array
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index ed7edb88a9..6bb5900350 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -31,6 +31,11 @@
         </service>
         <service id="Sylius\Component\Payment\Factory\PaymentFactoryInterface" alias="sylius.factory.payment" />
 
+        <service id="sylius.custom_factory.payment_request" class="Sylius\Component\Payment\Factory\PaymentRequestFactory" decorates="sylius.factory.payment_request" decoration-priority="256" public="false">
+            <argument type="service" id="sylius.custom_factory.payment_request.inner" />
+        </service>
+        <service id="Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface" alias="sylius.factory.payment_request" />
+
         <service id="sylius.registry.payment_methods_resolver" class="Sylius\Component\Registry\PrioritizedServiceRegistry">
             <argument>%sylius.payment_methods_resolver.interface%</argument>
             <argument>Payment methods resolver</argument>
diff --git a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
index e74a88733f..add075ffac 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
@@ -16,13 +16,13 @@ namespace Sylius\Bundle\PayumBundle\Action\PaymentRequest;
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\GetHttpRequest;
-use Sylius\Bundle\PayumBundle\PaymentRequest\PayumPaymentRequestContextInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface;
 use Webmozart\Assert\Assert;
 
 final class SyliusGetHttpRequestAction implements ActionInterface
 {
     public function __construct(
-        private PayumPaymentRequestContextInterface $payumApiContext,
+        private PaymentRequestContextInterface $payumApiContext,
     ) {
     }
 
diff --git a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
index ebc259c145..759c286539 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
@@ -16,13 +16,13 @@ namespace Sylius\Bundle\PayumBundle\Action\PaymentRequest;
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\RenderTemplate;
-use Sylius\Bundle\PayumBundle\PaymentRequest\PayumPaymentRequestContextInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface;
 use Webmozart\Assert\Assert;
 
 final class SyliusRenderTemplateAction implements ActionInterface
 {
     public function __construct(
-        private PayumPaymentRequestContextInterface $payumApiContext,
+        private PaymentRequestContextInterface $payumApiContext,
     ) {
     }
     public function execute($request): void
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php
index 27bf23916a..3e5db4a1fc 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php
@@ -13,29 +13,31 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\CommandHandler;
 
+use Payum\Core\Security\TokenAggregateInterface;
 use Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest;
 use Sylius\Bundle\PayumBundle\Factory\AuthorizeRequestFactoryInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
 final class AuthorizePaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private RepositoryInterface $paymentRequestRepository,
+        private PaymentRequestProviderInterface $paymentRequestProvider,
         private PayumTokenFactoryInterface $payumTokenFactory,
-        private PayumRequestProcessorInterface $payumReplyProcessor,
+        private RequestProcessorInterface $requestProcessor,
         private AuthorizeRequestFactoryInterface $factory,
+        private AfterTokenizedRequestProcessorInterface $afterTokenizedRequestProcessor,
     ) {
     }
 
     public function __invoke(AuthorizePaymentRequest $command): void
     {
-        /** @var PaymentRequestInterface|null $paymentRequest */
-        $paymentRequest = $this->paymentRequestRepository->find($command->getHash());
+        $paymentRequest = $this->paymentRequestProvider->provideFromHash($command->getHash());
         Assert::notNull($paymentRequest);
 
         $token = $this->payumTokenFactory->createNew($paymentRequest);
@@ -45,6 +47,8 @@ final class AuthorizePaymentRequestHandler implements MessageHandlerInterface
         $token = $request->getToken();
         Assert::notNull($token);
 
-        $this->payumReplyProcessor->process($paymentRequest, $request, $token->getGatewayName());
+        $this->requestProcessor->process($paymentRequest, $request, $token->getGatewayName());
+
+        $this->afterTokenizedRequestProcessor->process($paymentRequest, $token);
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
index 13df4e965a..e07faefdba 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
@@ -16,26 +16,24 @@ namespace Sylius\Bundle\PayumBundle\CommandHandler;
 use Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest;
 use Sylius\Bundle\PayumBundle\Factory\CaptureRequestFactoryInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
 final class CapturePaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private RepositoryInterface            $paymentRequestRepository,
-        private PayumTokenFactoryInterface     $payumTokenFactory,
-        private PayumRequestProcessorInterface $payumReplyProcessor,
+        private PaymentRequestProviderInterface $paymentRequestProvider,
+        private PayumTokenFactoryInterface $payumTokenFactory,
+        private RequestProcessorInterface $requestProcessor,
         private CaptureRequestFactoryInterface $factory,
     ) {
     }
 
     public function __invoke(CapturePaymentRequest $command): void
     {
-        /** @var PaymentRequestInterface|null $paymentRequest */
-        $paymentRequest = $this->paymentRequestRepository->find($command->getHash());
+        $paymentRequest = $this->paymentRequestProvider->provideFromHash($command->getHash());
         Assert::notNull($paymentRequest);
 
         $token = $this->payumTokenFactory->createNew($paymentRequest);
@@ -45,6 +43,6 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
         $token = $request->getToken();
         Assert::notNull($token);
 
-        $this->payumReplyProcessor->process($paymentRequest, $request, $token->getGatewayName());
+        $this->requestProcessor->process($paymentRequest, $request, $token->getGatewayName());
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php
index 0f0255f519..d74a7152b6 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php
@@ -13,29 +13,26 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\CommandHandler;
 
-use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
 final class StatusPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private RepositoryInterface $paymentRequestRepository,
-        private PayumRequestProcessorInterface $payumReplyProcessor,
+        private PaymentRequestProviderInterface $paymentRequestProvider,
+        private RequestProcessorInterface $requestProcessor,
         private GetStatusFactoryInterface $factory,
     ) {
     }
 
     public function __invoke(StatusPaymentRequest $command): void
     {
-        /** @var PaymentRequestInterface|null $paymentRequest */
-        $paymentRequest = $this->paymentRequestRepository->find($command->getHash());
+        $paymentRequest = $this->paymentRequestProvider->provideFromHash($command->getHash());
         Assert::notNull($paymentRequest);
 
         $payment = $paymentRequest->getPayment();
@@ -52,6 +49,6 @@ final class StatusPaymentRequestHandler implements MessageHandlerInterface
 
         $gatewayName = $gatewayConfig->getGatewayName();
 
-        $this->payumReplyProcessor->process($paymentRequest, $request, $gatewayName);
+        $this->requestProcessor->process($paymentRequest, $request, $gatewayName);
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContext.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContext.php
similarity index 90%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContext.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContext.php
index e4f5ae409f..4c8640c2c0 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContext.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContext.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\PayumBundle\PaymentRequest;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-final class PayumPaymentRequestContext implements PayumPaymentRequestContextInterface
+final class PaymentRequestContext implements PaymentRequestContextInterface
 {
     private ?PaymentRequestInterface $paymentRequest = null;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContextInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContextInterface.php
similarity index 92%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContextInterface.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContextInterface.php
index 1f5aad664d..871cb2f83d 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/PayumPaymentRequestContextInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContextInterface.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\PayumBundle\PaymentRequest;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface PayumPaymentRequestContextInterface
+interface PaymentRequestContextInterface
 {
     public function isEnabled(): bool;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php
new file mode 100644
index 0000000000..ba579bbcb5
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
+
+use Payum\Core\Security\TokenInterface;
+use Sylius\Bundle\ApiBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
+use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+final class AfterTokenizedRequestProcessor implements AfterTokenizedRequestProcessorInterface
+{
+    public function __construct(
+        private PaymentRequestFactoryInterface $paymentRequestFactory,
+        private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
+        private PaymentRepositoryInterface $paymentRepository,
+        private MessageBusInterface $commandBus,
+    ) {
+    }
+
+    public function process(
+        PaymentRequestInterface $paymentRequest,
+        TokenInterface $token,
+    ): void {
+        if (PaymentRequestInterface::STATE_COMPLETED !== $paymentRequest->getState()) {
+            return;
+        }
+
+        $details = $paymentRequest->getResponseData();
+        $details['after_url'] = $token->getAfterUrl();
+        $paymentRequest->setResponseData($details);
+
+        $newPaymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($paymentRequest);
+        $newPaymentRequest->setType(PaymentRequestInterface::DATA_TYPE_STATUS);
+
+        $this->paymentRepository->add($newPaymentRequest);
+
+        if (!$this->paymentRequestCommandProvider->supports($newPaymentRequest)) {
+            throw new PaymentRequestNotSupportedException();
+        }
+
+        $command = $this->paymentRequestCommandProvider->provide($newPaymentRequest);
+
+        $this->commandBus->dispatch($command);
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php
new file mode 100644
index 0000000000..26917f4286
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
+
+use Payum\Core\Security\TokenInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface AfterTokenizedRequestProcessorInterface
+{
+    public function process(
+        PaymentRequestInterface $paymentRequest,
+        TokenInterface $token,
+    ): void;
+}
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessor.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php
similarity index 59%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessor.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php
index b78e591828..e012a2b4cf 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessor.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php
@@ -14,16 +14,14 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
 
 use Payum\Core\Payum;
-use Payum\Core\Security\TokenAggregateInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\PayumPaymentRequestContextInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Webmozart\Assert\Assert;
 
-final class PayumRequestProcessor implements PayumRequestProcessorInterface
+final class RequestProcessor implements RequestProcessorInterface
 {
     public function __construct(
         private Payum $payum,
-        private PayumPaymentRequestContextInterface $payumApiContext,
+        private PaymentRequestContextInterface $payumApiContext,
     ) {
     }
 
@@ -43,18 +41,5 @@ final class PayumRequestProcessor implements PayumRequestProcessorInterface
         }
 
         $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED);
-
-        if (false === $request instanceof TokenAggregateInterface) {
-            return;
-        }
-
-        $token = $request->getToken();
-        if (null === $token) {
-            return;
-        }
-
-        $details = $paymentRequest->getResponseData();
-        $details['after_url'] = $token->getAfterUrl();
-        $paymentRequest->setResponseData($details);
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessorInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
similarity index 93%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessorInterface.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
index 4d44304768..2397c18236 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/PayumRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
@@ -16,7 +16,7 @@ namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
 use Payum\Core\Security\TokenAggregateInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface PayumRequestProcessorInterface
+interface RequestProcessorInterface
 {
     public function process(
         PaymentRequestInterface $paymentRequest,
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumAuthorizePaymentRequestCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php
similarity index 85%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumAuthorizePaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php
index fb79eae89c..0a28108ab2 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumAuthorizePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php
@@ -8,7 +8,7 @@ use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-final class PayumAuthorizePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+final class AuthorizeCommandProvider implements PaymentRequestCommandProviderInterface
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumCapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php
similarity index 86%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumCapturePaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php
index b56c99e53c..4adc2c325b 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumCapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php
@@ -8,7 +8,7 @@ use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-final class PayumCapturePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+final class CaptureCommandProvider implements PaymentRequestCommandProviderInterface
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProvider.php
new file mode 100644
index 0000000000..7f9ca523c1
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProvider.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\Proxy;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+
+final class PaymentRequestProvider implements PaymentRequestProviderInterface
+{
+    public function __construct(
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private EntityManagerInterface $entityManager,
+    ) {
+    }
+
+    public function provideFromHash(string $hash): ?PaymentRequestInterface
+    {
+        $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
+
+        if (null === $paymentRequest) {
+            return null;
+        }
+
+        // Needed to get a real object to give to Payum which is not handling
+        // Proxy class from Doctrine when a token is created for ex.
+        $payment = $paymentRequest->getPayment();
+        if ($payment instanceof Proxy) {
+            $this->entityManager->detach($payment);
+            $payment = $this->entityManager->find(PaymentInterface::class, $payment->getId());
+            $paymentRequest->setPayment($payment);
+        }
+
+        return $paymentRequest;
+    }
+}
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
new file mode 100644
index 0000000000..30f87f1d60
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface PaymentRequestProviderInterface
+{
+    public function provideFromHash(string $hash): ?PaymentRequestInterface;
+}
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumStatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php
similarity index 86%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumStatusPaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php
index 6a0b6add22..bb5cfd1184 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PayumStatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php
@@ -8,7 +8,7 @@ use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-final class PayumStatusPaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
+final class StatusCommandProvider implements PaymentRequestCommandProviderInterface
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml
index 31bfbffb8b..3a437de539 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/offline.xml
@@ -23,11 +23,11 @@
             <tag name="sylius.payment_request.command_provider" factory="offline" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumCapturePaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\CaptureCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.offline" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumStatusPaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\StatusCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.offline" type="status" />
         </service>
 
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
index f9257b4925..9964dcf6ab 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
@@ -18,42 +18,56 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessor">
+        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProvider">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+        </service>
+
+        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessor">
             <argument type="service" id="payum" />
             <argument type="service" id="sylius.payment_request.payum.context" />
         </service>
 
+        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessor">
+            <argument type="service" id="sylius.custom_factory.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
+            <argument type="service" id="sylius.repository.payment" />
+            <argument type="service" id="sylius.command_bus" />
+        </service>
+
         <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactory">
             <argument type="service" id="payum" />
         </service>
 
         <service id="sylius.payment_request.payum.capture" class="Sylius\Bundle\PayumBundle\CommandHandler\CapturePaymentRequestHandler">
-            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
             <argument type="service" id="sylius.factory.payum_capture" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="sylius.payment_request.payum.authorize" class="Sylius\Bundle\PayumBundle\CommandHandler\AuthorizePaymentRequestHandler">
-            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
             <argument type="service" id="sylius.factory.payum_authorize" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="sylius.payment_request.payum.status" class="Sylius\Bundle\PayumBundle\CommandHandler\StatusPaymentRequestHandler">
-            <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\PayumRequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
             <argument type="service" id="sylius.factory.payum_get_status_action" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
-        <service id="sylius.payment_request.payum.context" class="Sylius\Bundle\PayumBundle\PaymentRequest\PayumPaymentRequestContext" />
+        <service id="sylius.payment_request.payum.context" class="Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContext" />
+        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface" alias="sylius.payment_request.payum.context" />
 
         <service id="sylius_payment_request.action.get_http_request" class="Sylius\Bundle\PayumBundle\Action\PaymentRequest\SyliusGetHttpRequestAction">
             <argument type="service" id="sylius.payment_request.payum.context" />
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml
index f3aa832f81..167e282ec3 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/paypal_express_checkout.xml
@@ -23,15 +23,15 @@
             <tag name="sylius.payment_request.command_provider" factory="paypal_express_checkout" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumCapturePaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\CaptureCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumAuthorizePaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\AuthorizeCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumStatusPaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\StatusCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="status" />
         </service>
 
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml
index 27b0a32360..2ec2316e93 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/stripe.xml
@@ -23,15 +23,15 @@
             <tag name="sylius.payment_request.command_provider" factory="stripe" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumCapturePaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.stripe.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\CaptureCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.stripe" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.authorize" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumAuthorizePaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.stripe.authorize" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\AuthorizeCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.stripe" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PayumStatusPaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.stripe.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\StatusCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.stripe" type="status" />
         </service>
 
diff --git a/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php b/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
new file mode 100644
index 0000000000..5c65ab32a1
--- /dev/null
+++ b/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Factory;
+
+use Sylius\Component\Payment\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Resource\Factory\FactoryInterface;
+
+/**
+ * @implements PaymentRequestFactoryInterface<PaymentRequestInterface>
+ */
+final class PaymentRequestFactory implements PaymentRequestFactoryInterface
+{
+    public function __construct(private FactoryInterface $factory)
+    {
+    }
+
+    public function createNew(): PaymentRequestInterface
+    {
+        return $this->factory->createNew();
+    }
+
+    public function createWithPaymentAndPaymentMethod(PaymentInterface $payment, PaymentMethodInterface $paymentMethod): PaymentRequestInterface
+    {
+        $paymentRequest = $this->createNew();
+
+        $paymentRequest->setPayment($payment);
+        $paymentRequest->setMethod($paymentMethod);
+
+        return $paymentRequest;
+    }
+
+    public function createFromPaymentRequest(PaymentRequestInterface $paymentRequest): PaymentRequestInterface
+    {
+        $newPaymentRequest = $this->createNew();
+
+        $newPaymentRequest->setPayment($paymentRequest->getPayment());
+        $newPaymentRequest->setMethod($paymentRequest->getMethod());
+
+        return $newPaymentRequest;
+    }
+}
diff --git a/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php b/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php
new file mode 100644
index 0000000000..2b0243783a
--- /dev/null
+++ b/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Factory;
+
+use Sylius\Component\Payment\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Resource\Factory\FactoryInterface;
+
+/**
+ * @template T of PaymentRequestInterface
+ *
+ * @extends FactoryInterface<T>
+ */
+interface PaymentRequestFactoryInterface extends FactoryInterface
+{
+    public function createWithPaymentAndPaymentMethod(PaymentInterface $payment, PaymentMethodInterface $paymentMethod): PaymentRequestInterface;
+
+    public function createFromPaymentRequest(PaymentRequestInterface $paymentRequest): PaymentRequestInterface;
+}
diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
index 9c7c5381e0..00331ede59 100644
--- a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -14,8 +14,14 @@ declare(strict_types=1);
 namespace Sylius\Component\Payment\Repository;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
 
-interface PaymentRequestRepositoryInterface
+/**
+ * @template T of PaymentRequestInterface
+ *
+ * @extends RepositoryInterface<T>
+ */
+interface PaymentRequestRepositoryInterface extends RepositoryInterface
 {
     /**
      * @return PaymentRequestInterface[]

From be639b907c98a1dda076c14c9052922ccf908156 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 1 Feb 2024 23:07:41 +0100
Subject: [PATCH 015/200] Refactor some repeated processes and fix ECS

---
 .../Payment/AddPaymentRequestHandler.php      | 22 +++-----
 .../Payment/UpdatePaymentRequestHandler.php   | 15 ++----
 .../config/api_resources/PaymentRequest.xml   |  8 +--
 .../config/serialization/PaymentRequest.xml   | 54 ++++++++++++-------
 .../config/services/command_handlers.xml      |  6 +--
 .../PaymentRequestDuplicationChecker.php      |  9 ++++
 ...mentRequestDuplicationCheckerInterface.php |  9 ++++
 .../PaymentRequestCommandDispatcher.php       | 48 +++++++++++++++++
 ...ymentRequestCommandDispatcherInterface.php | 23 ++++++++
 .../Offline/CapturePaymentRequestHandler.php  | 27 +++-------
 .../PaymentRequestNotSupportedException.php   |  2 +-
 .../AfterOfflineCaptureProcessor.php          | 40 ++++++++++++++
 .../AfterOfflineCaptureProcessorInterface.php | 21 ++++++++
 ...PaymentRequestCommandProviderInterface.php |  9 ++++
 .../PaymentRequestTypeCommandProvider.php     |  9 ++++
 .../Resources/config/services.xml             |  1 +
 .../config/services/command_dispatcher.xml    | 28 ++++++++++
 .../Resources/config/services/offline.xml     |  5 +-
 .../SyliusGetHttpRequestAction.php            |  2 +-
 .../SyliusRenderTemplateAction.php            |  3 +-
 .../CapturePaymentRequestHandler.php          | 48 -----------------
 ...ler.php => ModelPaymentRequestHandler.php} |  6 +--
 ...ler.php => TokenPaymentRequestHandler.php} | 14 +++--
 .../PayumBundle/Factory/AuthorizeFactory.php  | 11 +++-
 .../AuthorizeRequestFactoryInterface.php      | 13 -----
 .../PayumBundle/Factory/CaptureFactory.php    | 11 +++-
 .../Factory/GetStatusFactoryInterface.php     |  2 +-
 .../ModelAggregateRequestFactoryInterface.php | 21 ++++++++
 ...TokenAggregateRequestFactoryInterface.php} | 11 +++-
 .../AfterTokenizedRequestProcessor.php        | 28 +++++-----
 ...fterTokenizedRequestProcessorInterface.php |  9 ++++
 .../Processor/RequestProcessorInterface.php   |  2 +-
 .../Provider/AuthorizeCommandProvider.php     |  9 ++++
 .../Provider/CaptureCommandProvider.php       |  9 ++++
 .../PaymentRequestProviderInterface.php       |  9 ++++
 .../Provider/StatusCommandProvider.php        |  9 ++++
 .../config/integrations/payment_request.xml   | 39 +++++++-------
 .../Resources/config/services/factory.xml     |  2 +-
 .../Payment/spec/Model/PaymentRequestSpec.php |  2 +-
 39 files changed, 405 insertions(+), 191 deletions(-)
 create mode 100644 src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcher.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
 rename src/Sylius/Bundle/{ApiBundle => PaymentBundle}/Exception/PaymentRequestNotSupportedException.php (92%)
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessorInterface.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Resources/config/services/command_dispatcher.xml
 delete mode 100644 src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
 rename src/Sylius/Bundle/PayumBundle/CommandHandler/{StatusPaymentRequestHandler.php => ModelPaymentRequestHandler.php} (87%)
 rename src/Sylius/Bundle/PayumBundle/CommandHandler/{AuthorizePaymentRequestHandler.php => TokenPaymentRequestHandler.php} (75%)
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Factory/AuthorizeRequestFactoryInterface.php
 create mode 100644 src/Sylius/Bundle/PayumBundle/Factory/ModelAggregateRequestFactoryInterface.php
 rename src/Sylius/Bundle/PayumBundle/Factory/{CaptureRequestFactoryInterface.php => TokenAggregateRequestFactoryInterface.php} (50%)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 177753c0c0..b182c3c551 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -14,17 +14,14 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
-use Sylius\Bundle\ApiBundle\Exception\PaymentRequestNotSupportedException;
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
 use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
 use Webmozart\Assert\Assert;
 
 /** @experimental */
@@ -34,21 +31,15 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         private PaymentRequestFactoryInterface $paymentRequestFactory,
         private PaymentMethodRepositoryInterface $paymentMethodRepository,
         private PaymentRepositoryInterface $paymentRepository,
-        private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
-        private MessageBusInterface $commandBus,
+        private PaymentRequestCommandDispatcherInterface $paymentRequestCommandDispatcher,
     ) {
     }
 
     public function __invoke(AddPaymentRequest $addPaymentRequest): PaymentRequestInterface
     {
         $paymentRequest = $this->createPaymentRequest($addPaymentRequest);
-        if (!$this->paymentRequestCommandProvider->supports($paymentRequest)) {
-            throw new PaymentRequestNotSupportedException();
-        }
 
-        $command = $this->paymentRequestCommandProvider->provide($paymentRequest);
-
-        $this->commandBus->dispatch($command);
+        $this->paymentRequestCommandDispatcher->add($paymentRequest);
 
         return $paymentRequest;
     }
@@ -57,24 +48,23 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
     {
         /** @var PaymentMethodInterface|null $paymentMethod */
         $paymentMethod = $this->paymentMethodRepository->findOneBy([
-            'code' => $addPaymentRequest->getPaymentMethodCode()
+            'code' => $addPaymentRequest->getPaymentMethodCode(),
         ]);
         Assert::notNull($paymentMethod, sprintf(
             'Payment method code "%s", can not be found!',
-            $addPaymentRequest->getPaymentMethodCode()
+            $addPaymentRequest->getPaymentMethodCode(),
         ));
         /** @var PaymentInterface|null $payment */
         $payment = $this->paymentRepository->find($addPaymentRequest->getPaymentId());
         Assert::notNull(
             $payment,
-            sprintf('Payment ID "%s" can not be found!', $addPaymentRequest->getPaymentId())
+            sprintf('Payment ID "%s" can not be found!', $addPaymentRequest->getPaymentId()),
         );
 
         $paymentRequest = $this->paymentRequestFactory->createWithPaymentAndPaymentMethod($payment, $paymentMethod);
         $paymentRequest->setType($addPaymentRequest->getType());
         $paymentRequest->setRequestPayload($addPaymentRequest->getRequestPayload());
 
-        $this->paymentRepository->add($paymentRequest);
         return $paymentRequest;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 4a6eec2f7f..fcd4301cc9 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -14,12 +14,10 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest;
-use Sylius\Bundle\ApiBundle\Exception\PaymentRequestNotSupportedException;
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
 use Webmozart\Assert\Assert;
 
 /** @experimental */
@@ -27,8 +25,7 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
-        private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
-        private MessageBusInterface $commandBus,
+        private PaymentRequestCommandDispatcherInterface $paymentRequestCommandDispatcher,
     ) {
     }
 
@@ -42,13 +39,7 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
 
         $paymentRequest->setRequestPayload($updatePaymentRequest->getRequestPayload());
 
-        if (!$this->paymentRequestCommandProvider->supports($paymentRequest)) {
-            throw new PaymentRequestNotSupportedException();
-        }
-
-        $command = $this->paymentRequestCommandProvider->provide($paymentRequest);
-
-        $this->commandBus->dispatch($command);
+        $this->paymentRequestCommandDispatcher->add($paymentRequest);
 
         return $paymentRequest;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
index 659ad5a262..d9a548c385 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -30,7 +30,7 @@
                     <attribute>sylius.api.search_payment_request_filter</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">admin:payment_request:read</attribute>
+                    <attribute name="groups">admin:payment_request:show</attribute>
                 </attribute>
             </collectionOperation>
 
@@ -43,7 +43,7 @@
                     <attribute name="groups">shop:payment_request:create</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:payment_request:read</attribute>
+                    <attribute name="groups">shop:payment_request:show</attribute>
                 </attribute>
             </collectionOperation>
         </collectionOperations>
@@ -53,7 +53,7 @@
                 <attribute name="method">GET</attribute>
                 <attribute name="path">/shop/payment-requests/{hash}</attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:payment_request:read</attribute>
+                    <attribute name="groups">shop:payment_request:show</attribute>
                 </attribute>
             </itemOperation>
 
@@ -67,7 +67,7 @@
                 </attribute>
                 <attribute name="normalization_context">
                     <attribute name="groups">
-                        <attribute>shop:payment_request:read</attribute>
+                        <attribute>shop:payment_request:show</attribute>
                     </attribute>
                 </attribute>
             </itemOperation>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
index dd280a5e69..009c851f2f 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -17,40 +17,58 @@
 >
     <class name="Sylius\Component\Core\Model\PaymentRequest">
         <attribute name="hash">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
         <attribute name="payment">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
         <attribute name="method">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
         <attribute name="type">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
         <attribute name="state">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
         <attribute name="requestPayload">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
         <attribute name="responseData">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
         <attribute name="createdAt">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
         <attribute name="updatedAt">
-            <group>admin:payment_request:read</group>
-            <group>shop:payment_request:read</group>
+            <group>admin:payment_request:show</group>
+            <group>admin:payment_request:index</group>
+            <group>shop:payment_request:show</group>
+            <group>shop:payment_request:index</group>
         </attribute>
     </class>
 </serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 2c2eb8facb..811701d6f4 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -243,16 +243,14 @@
             <argument type="service" id="sylius.custom_factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.repository.payment" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
-            <argument type="service" id="sylius.command_bus" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\UpdatePaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
-            <argument type="service" id="sylius.command_bus" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
diff --git a/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php b/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php
index 1fd79df091..0a44de5ed4 100644
--- a/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php
+++ b/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Checker;
diff --git a/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php b/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php
index ace56e7e47..7597ef86f2 100644
--- a/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php
+++ b/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Checker;
diff --git a/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcher.php b/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcher.php
new file mode 100644
index 0000000000..4342744900
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcher.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\CommandDispatcher;
+
+use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+final class PaymentRequestCommandDispatcher implements PaymentRequestCommandDispatcherInterface
+{
+    public function __construct(
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
+        private MessageBusInterface $commandBus,
+    ) {
+    }
+
+    public function add(PaymentRequestInterface $paymentRequest): void
+    {
+        $this->paymentRequestRepository->add($paymentRequest);
+
+        $this->update($paymentRequest);
+    }
+
+    public function update(PaymentRequestInterface $paymentRequest): void
+    {
+        if (!$this->paymentRequestCommandProvider->supports($paymentRequest)) {
+            throw new PaymentRequestNotSupportedException();
+        }
+
+        $command = $this->paymentRequestCommandProvider->provide($paymentRequest);
+
+        $this->commandBus->dispatch($command);
+    }
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php b/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
new file mode 100644
index 0000000000..13eb34b222
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\CommandDispatcher;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface PaymentRequestCommandDispatcherInterface
+{
+    public function add(PaymentRequestInterface $paymentRequest): void;
+
+    public function update(PaymentRequestInterface $paymentRequest): void;
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php
index d7ffdfd671..930858162c 100644
--- a/src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -13,13 +13,11 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\CommandHandler\Offline;
 
-use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
 use Sylius\Bundle\PaymentBundle\Command\Offline\CapturePaymentRequest;
+use Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessorInterface;
 use Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\PaymentTransitions;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
@@ -29,16 +27,15 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
     public const FACTORY_NAME = 'offline';
 
     public function __construct(
-        private RepositoryInterface              $paymentRequestRepository,
-        private OfflineCaptureProcessorInterface $capturePaymentRequestProcessor,
-        private StateMachineFactoryInterface     $stateMachineFactory,
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private OfflineCaptureProcessorInterface $offlineCaptureProcessor,
+        private AfterOfflineCaptureProcessorInterface $afterOfflineCaptureProcessor,
     ) {
     }
 
     public function __invoke(CapturePaymentRequest $capturePaymentRequest): void
     {
-        /** @var PaymentRequestInterface|null $paymentRequest */
-        $paymentRequest = $this->paymentRequestRepository->find($capturePaymentRequest->getHash());
+        $paymentRequest = $this->paymentRequestRepository->findOneByHash($capturePaymentRequest->getHash());
         Assert::notNull($paymentRequest);
 
         /** @var PaymentMethodInterface|null $paymentMethod */
@@ -53,15 +50,7 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
         $payment = $paymentRequest->getPayment();
         Assert::notNull($payment);
 
-        $this->capturePaymentRequestProcessor->process($paymentRequest);
-
-        // @todo modify Payment->getDetails() to retrieve last payment request `responseData`
-
-        $stateMachine = $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH);
-        if ($paymentRequest->getResponseData()['paid']) {
-            $stateMachine->apply(PaymentTransitions::TRANSITION_COMPLETE);
-        } else {
-            $stateMachine->apply(PaymentTransitions::TRANSITION_PROCESS);
-        }
+        $this->offlineCaptureProcessor->process($paymentRequest);
+        $this->afterOfflineCaptureProcessor->process($paymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Exception/PaymentRequestNotSupportedException.php b/src/Sylius/Bundle/PaymentBundle/Exception/PaymentRequestNotSupportedException.php
similarity index 92%
rename from src/Sylius/Bundle/ApiBundle/Exception/PaymentRequestNotSupportedException.php
rename to src/Sylius/Bundle/PaymentBundle/Exception/PaymentRequestNotSupportedException.php
index bf31ca989b..e7460fc3eb 100644
--- a/src/Sylius/Bundle/ApiBundle/Exception/PaymentRequestNotSupportedException.php
+++ b/src/Sylius/Bundle/PaymentBundle/Exception/PaymentRequestNotSupportedException.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Exception;
+namespace Sylius\Bundle\PaymentBundle\Exception;
 
 /** @experimental */
 final class PaymentRequestNotSupportedException extends \RuntimeException
diff --git a/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php b/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php
new file mode 100644
index 0000000000..a133704e7b
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Processor;
+
+use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\PaymentTransitions;
+use Webmozart\Assert\Assert;
+
+final class AfterOfflineCaptureProcessor implements AfterOfflineCaptureProcessorInterface
+{
+    public function __construct(
+        private StateMachineFactoryInterface $stateMachineFactory,
+    ) {
+    }
+
+    public function process(PaymentRequestInterface $paymentRequest): void
+    {
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment);
+
+        $stateMachine = $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH);
+        if ($paymentRequest->getResponseData()['paid']) {
+            $stateMachine->apply(PaymentTransitions::TRANSITION_COMPLETE);
+        } else {
+            $stateMachine->apply(PaymentTransitions::TRANSITION_PROCESS);
+        }
+    }
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessorInterface.php b/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessorInterface.php
new file mode 100644
index 0000000000..22af327d5a
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessorInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Processor;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface AfterOfflineCaptureProcessorInterface
+{
+    public function process(PaymentRequestInterface $paymentRequest): void;
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php
index 15f4f49140..7bef0d5af9 100644
--- a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php
+++ b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Provider;
diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
index 6e5d222f0a..587dbaf6de 100644
--- a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
+++ b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Provider;
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index 6bb5900350..7a2c489c45 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -14,6 +14,7 @@
 <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">
     <imports>
         <import resource="services/checker.xml" />
+        <import resource="services/command_dispatcher.xml" />
         <import resource="services/form.xml" />
         <import resource="services/offline.xml" />
         <import resource="services/provider.xml" />
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/command_dispatcher.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/command_dispatcher.xml
new file mode 100644
index 0000000000..c21b39ee50
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/command_dispatcher.xml
@@ -0,0 +1,28 @@
+<?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\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" class="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcher">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
+            <argument type="service" id="sylius.command_bus" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
index d81f5f7a86..e1159d7e56 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
@@ -34,12 +34,15 @@
         <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\PaymentBundle\CommandHandler\Offline\CapturePaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface" />
-            <argument type="service" id="sm.factory" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface" class="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessor" />
+        <service id="Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessorInterface" class="Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessor">
+            <argument tag="service" id="sm.factory" />
+        </service>
 
     </services>
 </container>
diff --git a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
index add075ffac..3721540fa8 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
@@ -28,7 +28,7 @@ final class SyliusGetHttpRequestAction implements ActionInterface
 
     public function execute($request): void
     {
-        /** @var $request GetHttpRequest */
+        /** @var GetHttpRequest $request */
         RequestNotSupportedException::assertSupports($this, $request);
 
         $this->updateRequest($request);
diff --git a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
index 759c286539..ea522256c4 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
@@ -25,9 +25,10 @@ final class SyliusRenderTemplateAction implements ActionInterface
         private PaymentRequestContextInterface $payumApiContext,
     ) {
     }
+
     public function execute($request): void
     {
-        /** @var $request RenderTemplate */
+        /** @var RenderTemplate $request */
         RequestNotSupportedException::assertSupports($this, $request);
 
         $paymentRequest = $this->payumApiContext->getPaymentRequest();
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
deleted file mode 100644
index e07faefdba..0000000000
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/CapturePaymentRequestHandler.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\PayumBundle\CommandHandler;
-
-use Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest;
-use Sylius\Bundle\PayumBundle\Factory\CaptureRequestFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Webmozart\Assert\Assert;
-
-final class CapturePaymentRequestHandler implements MessageHandlerInterface
-{
-    public function __construct(
-        private PaymentRequestProviderInterface $paymentRequestProvider,
-        private PayumTokenFactoryInterface $payumTokenFactory,
-        private RequestProcessorInterface $requestProcessor,
-        private CaptureRequestFactoryInterface $factory,
-    ) {
-    }
-
-    public function __invoke(CapturePaymentRequest $command): void
-    {
-        $paymentRequest = $this->paymentRequestProvider->provideFromHash($command->getHash());
-        Assert::notNull($paymentRequest);
-
-        $token = $this->payumTokenFactory->createNew($paymentRequest);
-
-        $request = $this->factory->createNewWithToken($token);
-
-        $token = $request->getToken();
-        Assert::notNull($token);
-
-        $this->requestProcessor->process($paymentRequest, $request, $token->getGatewayName());
-    }
-}
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/ModelPaymentRequestHandler.php
similarity index 87%
rename from src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php
rename to src/Sylius/Bundle/PayumBundle/CommandHandler/ModelPaymentRequestHandler.php
index d74a7152b6..980eec3a1e 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/StatusPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/ModelPaymentRequestHandler.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\CommandHandler;
 
-use Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest;
+use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
@@ -21,7 +21,7 @@ use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
-final class StatusPaymentRequestHandler implements MessageHandlerInterface
+final class ModelPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private PaymentRequestProviderInterface $paymentRequestProvider,
@@ -30,7 +30,7 @@ final class StatusPaymentRequestHandler implements MessageHandlerInterface
     ) {
     }
 
-    public function __invoke(StatusPaymentRequest $command): void
+    public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
         $paymentRequest = $this->paymentRequestProvider->provideFromHash($command->getHash());
         Assert::notNull($paymentRequest);
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php
similarity index 75%
rename from src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php
rename to src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php
index 3e5db4a1fc..a76b3a10e9 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/AuthorizePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php
@@ -13,36 +13,34 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\CommandHandler;
 
-use Payum\Core\Security\TokenAggregateInterface;
-use Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest;
-use Sylius\Bundle\PayumBundle\Factory\AuthorizeRequestFactoryInterface;
+use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
-final class AuthorizePaymentRequestHandler implements MessageHandlerInterface
+final class TokenPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private PaymentRequestProviderInterface $paymentRequestProvider,
         private PayumTokenFactoryInterface $payumTokenFactory,
         private RequestProcessorInterface $requestProcessor,
-        private AuthorizeRequestFactoryInterface $factory,
         private AfterTokenizedRequestProcessorInterface $afterTokenizedRequestProcessor,
+        private TokenAggregateRequestFactoryInterface $payumRequestFactory,
     ) {
     }
 
-    public function __invoke(AuthorizePaymentRequest $command): void
+    public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
         $paymentRequest = $this->paymentRequestProvider->provideFromHash($command->getHash());
         Assert::notNull($paymentRequest);
 
         $token = $this->payumTokenFactory->createNew($paymentRequest);
 
-        $request = $this->factory->createNewWithToken($token);
+        $request = $this->payumRequestFactory->createNewWithToken($token);
 
         $token = $request->getToken();
         Assert::notNull($token);
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeFactory.php b/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeFactory.php
index 97a1faf7ce..1946ac30c6 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeFactory.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeFactory.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\Factory;
@@ -8,7 +17,7 @@ use Payum\Core\Request\Authorize;
 use Payum\Core\Security\TokenAggregateInterface;
 use Payum\Core\Security\TokenInterface;
 
-final class AuthorizeFactory implements AuthorizeRequestFactoryInterface
+final class AuthorizeFactory implements TokenAggregateRequestFactoryInterface
 {
     public function createNewWithToken(TokenInterface $token): TokenAggregateInterface
     {
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeRequestFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeRequestFactoryInterface.php
deleted file mode 100644
index 9a71098489..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Factory/AuthorizeRequestFactoryInterface.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\PayumBundle\Factory;
-
-use Payum\Core\Security\TokenAggregateInterface;
-use Payum\Core\Security\TokenInterface;
-
-interface AuthorizeRequestFactoryInterface
-{
-    public function createNewWithToken(TokenInterface $token): TokenAggregateInterface;
-}
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/CaptureFactory.php b/src/Sylius/Bundle/PayumBundle/Factory/CaptureFactory.php
index 78c6e23386..d3b7ffca39 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/CaptureFactory.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/CaptureFactory.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\Factory;
@@ -8,7 +17,7 @@ use Payum\Core\Request\Capture;
 use Payum\Core\Security\TokenAggregateInterface;
 use Payum\Core\Security\TokenInterface;
 
-final class CaptureFactory implements CaptureRequestFactoryInterface
+final class CaptureFactory implements TokenAggregateRequestFactoryInterface
 {
     public function createNewWithToken(TokenInterface $token): TokenAggregateInterface
     {
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactoryInterface.php
index 0f7e9ea030..10fb0ebd6a 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactoryInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactoryInterface.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\PayumBundle\Factory;
 
 use Payum\Core\Request\GetStatusInterface;
 
-interface GetStatusFactoryInterface
+interface GetStatusFactoryInterface extends ModelAggregateRequestFactoryInterface
 {
     public function createNewWithModel($model): GetStatusInterface;
 }
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/ModelAggregateRequestFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/ModelAggregateRequestFactoryInterface.php
new file mode 100644
index 0000000000..21c5e26059
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/Factory/ModelAggregateRequestFactoryInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PayumBundle\Factory;
+
+use Payum\Core\Model\ModelAggregateInterface;
+
+interface ModelAggregateRequestFactoryInterface
+{
+    public function createNewWithModel($model): ModelAggregateInterface;
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/CaptureRequestFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/TokenAggregateRequestFactoryInterface.php
similarity index 50%
rename from src/Sylius/Bundle/PayumBundle/Factory/CaptureRequestFactoryInterface.php
rename to src/Sylius/Bundle/PayumBundle/Factory/TokenAggregateRequestFactoryInterface.php
index 5f2d0cb36f..098eba7a7e 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/CaptureRequestFactoryInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/TokenAggregateRequestFactoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\Factory;
@@ -7,7 +16,7 @@ namespace Sylius\Bundle\PayumBundle\Factory;
 use Payum\Core\Security\TokenAggregateInterface;
 use Payum\Core\Security\TokenInterface;
 
-interface CaptureRequestFactoryInterface
+interface TokenAggregateRequestFactoryInterface
 {
     public function createNewWithToken(TokenInterface $token): TokenAggregateInterface;
 }
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php
index ba579bbcb5..469d868bf3 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php
@@ -1,24 +1,28 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
 
 use Payum\Core\Security\TokenInterface;
-use Sylius\Bundle\ApiBundle\Exception\PaymentRequestNotSupportedException;
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
-use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
+use Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
 
 final class AfterTokenizedRequestProcessor implements AfterTokenizedRequestProcessorInterface
 {
     public function __construct(
         private PaymentRequestFactoryInterface $paymentRequestFactory,
-        private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
-        private PaymentRepositoryInterface $paymentRepository,
-        private MessageBusInterface $commandBus,
+        private PaymentRequestCommandDispatcherInterface $paymentRequestCommandDispatcher,
     ) {
     }
 
@@ -37,14 +41,6 @@ final class AfterTokenizedRequestProcessor implements AfterTokenizedRequestProce
         $newPaymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($paymentRequest);
         $newPaymentRequest->setType(PaymentRequestInterface::DATA_TYPE_STATUS);
 
-        $this->paymentRepository->add($newPaymentRequest);
-
-        if (!$this->paymentRequestCommandProvider->supports($newPaymentRequest)) {
-            throw new PaymentRequestNotSupportedException();
-        }
-
-        $command = $this->paymentRequestCommandProvider->provide($newPaymentRequest);
-
-        $this->commandBus->dispatch($command);
+        $this->paymentRequestCommandDispatcher->add($newPaymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php
index 26917f4286..f97c0b9c92 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
index 2397c18236..2795d3fc9c 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
@@ -21,6 +21,6 @@ interface RequestProcessorInterface
     public function process(
         PaymentRequestInterface $paymentRequest,
         TokenAggregateInterface $request,
-        string $gatewayName
+        string $gatewayName,
     ): void;
 }
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php
index 0a28108ab2..ace097ba64 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php
index 4adc2c325b..6b21461e75 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
index 30f87f1d60..43aa4de281 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php
index bb5cfd1184..1ec733406c 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
index 9964dcf6ab..addaddd3f4 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
@@ -30,40 +30,41 @@
 
         <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessor">
             <argument type="service" id="sylius.custom_factory.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
-            <argument type="service" id="sylius.repository.payment" />
-            <argument type="service" id="sylius.command_bus" />
+            <argument type="service" id="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
         </service>
 
         <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactory">
             <argument type="service" id="payum" />
         </service>
 
-        <service id="sylius.payment_request.payum.capture" class="Sylius\Bundle\PayumBundle\CommandHandler\CapturePaymentRequestHandler">
+        <service id="Sylius\Bundle\PayumBundle\CommandHandler\TokenPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" />
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
-            <argument type="service" id="sylius.factory.payum_capture" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" />
-        </service>
-
-        <service id="sylius.payment_request.payum.authorize" class="Sylius\Bundle\PayumBundle\CommandHandler\AuthorizePaymentRequestHandler">
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
-            <argument type="service" id="sylius.factory.payum_authorize" />
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
-        <service id="sylius.payment_request.payum.status" class="Sylius\Bundle\PayumBundle\CommandHandler\StatusPaymentRequestHandler">
+        <service id="sylius.payment_request.payum.capture" parent="Sylius\Bundle\PayumBundle\CommandHandler\TokenPaymentRequestHandler">
+            <argument type="service" id="sylius.factory.payum_capture" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest" />
+        </service>
+
+        <service id="sylius.payment_request.payum.authorize" parent="Sylius\Bundle\PayumBundle\CommandHandler\TokenPaymentRequestHandler">
+            <argument type="service" id="sylius.factory.payum_authorize" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest" />
+        </service>
+
+        <service id="Sylius\Bundle\PayumBundle\CommandHandler\ModelPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
+        </service>
+
+        <service id="sylius.payment_request.payum.status" parent="Sylius\Bundle\PayumBundle\CommandHandler\ModelPaymentRequestHandler">
             <argument type="service" id="sylius.factory.payum_get_status_action" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest" />
         </service>
 
         <service id="sylius.payment_request.payum.context" class="Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContext" />
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
index ce30756b56..62ee359335 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
@@ -14,7 +14,7 @@
         <service id="Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactoryInterface" alias="sylius.factory.payum_resolve_next_route" />
 
         <service id="sylius.factory.payum_capture" class="Sylius\Bundle\PayumBundle\Factory\CaptureFactory" />
-        <service id="Sylius\Bundle\PayumBundle\Factory\CaptureRequestFactoryInterface" alias="sylius.factory.payum_capture" />
+        <service id="TokenAggregateRequestFactoryInterface" alias="sylius.factory.payum_capture" />
 
         <service id="sylius.factory.payum_authorize" class="Sylius\Bundle\PayumBundle\Factory\AuthorizeFactory" />
         <service id="Sylius\Bundle\PayumBundle\Factory\AuthorizeRequestFactoryInterface" alias="sylius.factory.payum_authorize" />
diff --git a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
index dad5d6a8aa..7b3764573c 100644
--- a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
+++ b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
@@ -16,8 +16,8 @@ namespace spec\Sylius\Component\Payment\Model;
 use PhpSpec\ObjectBehavior;
 use stdClass;
 use Sylius\Component\Payment\Model\PaymentInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class PaymentRequestSpec extends ObjectBehavior
 {

From 18358d107b6d54c29e636f2a8a4b6fe573aa181b Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 2 Feb 2024 00:07:40 +0100
Subject: [PATCH 016/200] 3/5 behat tests ok

---
 .../Behat/Context/Api/PaypalContext.php       | 59 ++++++++++++-------
 .../TokenPaymentRequestHandler.php            |  6 +-
 ...sor.php => AfterTokenRequestProcessor.php} |  2 +-
 ...> AfterTokenRequestProcessorInterface.php} |  2 +-
 .../Processor/RequestProcessor.php            | 12 ++++
 .../config/integrations/payment_request.xml   |  4 +-
 6 files changed, 56 insertions(+), 29 deletions(-)
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/{AfterTokenizedRequestProcessor.php => AfterTokenRequestProcessor.php} (93%)
 rename src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/{AfterTokenizedRequestProcessorInterface.php => AfterTokenRequestProcessorInterface.php} (91%)

diff --git a/src/Sylius/Behat/Context/Api/PaypalContext.php b/src/Sylius/Behat/Context/Api/PaypalContext.php
index 06645c1654..cf29190285 100644
--- a/src/Sylius/Behat/Context/Api/PaypalContext.php
+++ b/src/Sylius/Behat/Context/Api/PaypalContext.php
@@ -57,21 +57,20 @@ final class PaypalContext implements Context
 
     /**
      * @When I sign in to PayPal and authorize successfully
-     */
-    public function iSignInToPaypalAndAuthorizeSuccessfully(): void
-    {
-        $this->paypalApiMocker->performActionInApiSuccessfulScope(function () {
-            $this->putPaymentRequest($this->sharedStorage->get('payment_request_uri'));
-        });
-    }
-
-    /**
      * @When I sign in to PayPal and pay successfully
      */
-    public function iSignInToPaypalAndPaySuccessfully(): void
+    public function iSignInToPaypalAndAuthorizeOrPaySuccessfully(): void
     {
         $this->paypalApiMocker->performActionInApiSuccessfulScope(function () {
-            $this->paypalExpressCheckoutPage->pay();
+            $this->putPaymentRequest(
+                $this->sharedStorage->get('payment_request_uri'),
+                [
+                    'query' => [
+                        'token' => 'EC-2d9EV13959UR209410U',
+                        'PayerID' => 'UX8WBNYWGBVMG',
+                    ]
+                ]
+            );
         });
     }
 
@@ -81,7 +80,15 @@ final class PaypalContext implements Context
      */
     public function iCancelMyPaypalPayment(): void
     {
-        $this->paypalExpressCheckoutPage->cancel();
+        $this->putPaymentRequest(
+            $this->sharedStorage->get('payment_request_uri'),
+            [
+                'query' => [
+                    'token' => 'EC-2d9EV13959UR209410U',
+                    'cancelled' => 1,
+                ]
+            ]
+        );
     }
 
     /**
@@ -89,8 +96,15 @@ final class PaypalContext implements Context
      */
     public function iTryToPayAgain(): void
     {
+        $this->client->show(Resources::ORDERS, $this->sharedStorage->get('cart_token'));
+
         $this->paypalApiMocker->performActionInApiInitializeScope(function () {
-            $this->orderDetails->pay();
+            $payments = $this->responseChecker->getValue($this->client->getLastResponse(), 'payments');
+            $payment = end($payments);
+            $this->postPaymentRequest($payment);
+
+            $uri = $this->responseChecker->getValue($this->client->getLastResponse(), '@id');
+            $this->sharedStorage->set('payment_request_uri', $uri);
         });
     }
 
@@ -99,7 +113,13 @@ final class PaypalContext implements Context
      */
     public function iShouldBeNotifiedThatMyPaymentHasBeenCancelled(): void
     {
-        $this->assertNotification('Payment has been cancelled.');
+        Assert::true(
+            $this->responseChecker->isUpdateSuccessful($this->client->getLastResponse()),
+            sprintf(
+                'Payment request could not be updated: %s',
+                $this->responseChecker->getError($this->client->getLastResponse()),
+            ),
+        );
     }
 
     /**
@@ -110,7 +130,7 @@ final class PaypalContext implements Context
         Assert::true(
             $this->responseChecker->isUpdateSuccessful($this->client->getLastResponse()),
             sprintf(
-                'Payment request could not be edited: %s',
+                'Payment request could not be updated: %s',
                 $this->responseChecker->getError($this->client->getLastResponse()),
             ),
         );
@@ -160,7 +180,7 @@ final class PaypalContext implements Context
         $this->client->executeCustomRequest($request);
     }
 
-    function putPaymentRequest(string $paymentRequestUri): void
+    function putPaymentRequest(string $paymentRequestUri, array $httpRequest = []): void
     {
         $request = $this->requestFactory->custom(
             $paymentRequestUri,
@@ -173,12 +193,7 @@ final class PaypalContext implements Context
             'requestPayload' => [
                 'target_path' => 'https://myshop.tld/target-path',
                 'after_path' => 'https://myshop.tld/after-path',
-                'http_request' => [
-                    'query' => [
-                        'token' => 'EC-2d9EV13959UR209410U',
-                        'PayerID' => 'UX8WBNYWGBVMG',
-                    ]
-                ],
+                'http_request' => $httpRequest,
             ],
         ]);
 
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php
index a76b3a10e9..e57d4e55fe 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php
@@ -16,7 +16,7 @@ namespace Sylius\Bundle\PayumBundle\CommandHandler;
 use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface;
+use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenRequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
@@ -28,7 +28,7 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
         private PaymentRequestProviderInterface $paymentRequestProvider,
         private PayumTokenFactoryInterface $payumTokenFactory,
         private RequestProcessorInterface $requestProcessor,
-        private AfterTokenizedRequestProcessorInterface $afterTokenizedRequestProcessor,
+        private AfterTokenRequestProcessorInterface $afterTokenRequestProcessor,
         private TokenAggregateRequestFactoryInterface $payumRequestFactory,
     ) {
     }
@@ -47,6 +47,6 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
 
         $this->requestProcessor->process($paymentRequest, $request, $token->getGatewayName());
 
-        $this->afterTokenizedRequestProcessor->process($paymentRequest, $token);
+        $this->afterTokenRequestProcessor->process($paymentRequest, $token);
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessor.php
similarity index 93%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessor.php
index 469d868bf3..50b4dd16af 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessor.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessor.php
@@ -18,7 +18,7 @@ use Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatche
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-final class AfterTokenizedRequestProcessor implements AfterTokenizedRequestProcessorInterface
+final class AfterTokenRequestProcessor implements AfterTokenRequestProcessorInterface
 {
     public function __construct(
         private PaymentRequestFactoryInterface $paymentRequestFactory,
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessorInterface.php
similarity index 91%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php
rename to src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessorInterface.php
index f97c0b9c92..a16770dfcc 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenizedRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessorInterface.php
@@ -16,7 +16,7 @@ namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
 use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface AfterTokenizedRequestProcessorInterface
+interface AfterTokenRequestProcessorInterface
 {
     public function process(
         PaymentRequestInterface $paymentRequest,
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php
index e012a2b4cf..816e4013a8 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
 
 use Payum\Core\Payum;
+use Payum\Core\Security\TokenAggregateInterface;
 use Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
@@ -41,5 +42,16 @@ final class RequestProcessor implements RequestProcessorInterface
         }
 
         $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED);
+
+        if (false === $request instanceof TokenAggregateInterface) {
+            return;
+        }
+
+        $token = $request->getToken();
+        if (null === $token) {
+            return;
+        }
+
+        $this->payum->getHttpRequestVerifier()->invalidate($token);
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
index addaddd3f4..160ea0255f 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payment_request.xml
@@ -28,7 +28,7 @@
             <argument type="service" id="sylius.payment_request.payum.context" />
         </service>
 
-        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessor">
+        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenRequestProcessor">
             <argument type="service" id="sylius.custom_factory.payment_request" />
             <argument type="service" id="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
         </service>
@@ -41,7 +41,7 @@
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" />
             <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenizedRequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenRequestProcessorInterface" />
         </service>
 
         <service id="sylius.payment_request.payum.capture" parent="Sylius\Bundle\PayumBundle\CommandHandler\TokenPaymentRequestHandler">

From 8adbd8b31edaf689ed0281e8895e8c3411b5343e Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 2 Feb 2024 00:08:18 +0100
Subject: [PATCH 017/200] Behat ecs fix

---
 src/Sylius/Behat/Context/Api/PaypalContext.php      | 13 ++++++-------
 .../Shop/Checkout/CheckoutOrderDetailsContext.php   |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Sylius/Behat/Context/Api/PaypalContext.php b/src/Sylius/Behat/Context/Api/PaypalContext.php
index cf29190285..fb14fb641d 100644
--- a/src/Sylius/Behat/Context/Api/PaypalContext.php
+++ b/src/Sylius/Behat/Context/Api/PaypalContext.php
@@ -68,8 +68,8 @@ final class PaypalContext implements Context
                     'query' => [
                         'token' => 'EC-2d9EV13959UR209410U',
                         'PayerID' => 'UX8WBNYWGBVMG',
-                    ]
-                ]
+                    ],
+                ],
             );
         });
     }
@@ -86,8 +86,8 @@ final class PaypalContext implements Context
                 'query' => [
                     'token' => 'EC-2d9EV13959UR209410U',
                     'cancelled' => 1,
-                ]
-            ]
+                ],
+            ],
         );
     }
 
@@ -169,8 +169,7 @@ final class PaypalContext implements Context
             'paymentMethodCode' => $payment['method'],
             'type' => $authorize
                 ? PaymentRequestInterface::DATA_TYPE_AUTHORIZE
-                : PaymentRequestInterface::DATA_TYPE_CAPTURE
-            ,
+                : PaymentRequestInterface::DATA_TYPE_CAPTURE,
             'requestPayload' => [
                 'target_path' => 'https://myshop.tld/target-path',
                 'after_path' => 'https://myshop.tld/after-path',
@@ -180,7 +179,7 @@ final class PaypalContext implements Context
         $this->client->executeCustomRequest($request);
     }
 
-    function putPaymentRequest(string $paymentRequestUri, array $httpRequest = []): void
+    public function putPaymentRequest(string $paymentRequestUri, array $httpRequest = []): void
     {
         $request = $this->requestFactory->custom(
             $paymentRequestUri,
diff --git a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
index 744e06c7cc..f464f6ea41 100644
--- a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
+++ b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
@@ -16,8 +16,6 @@ namespace Sylius\Behat\Context\Api\Shop\Checkout;
 use Behat\Behat\Context\Context;
 use Sylius\Behat\Client\ApiClientInterface;
 use Sylius\Behat\Client\RequestFactoryInterface;
-use Sylius\Behat\Page\Shop\Order\ShowPageInterface;
-use Sylius\Behat\Page\Shop\Order\ThankYouPageInterface;
 use Sylius\Behat\Service\SharedStorageInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Webmozart\Assert\Assert;

From 8bdba2209c964431979872c66f8e624e68ddc43f Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 2 Feb 2024 17:26:51 +0100
Subject: [PATCH 018/200] @paying_for_order&&@api fully working

---
 ...venting_to_pay_for_cancelled_order.feature |  2 +-
 ...t_methods_based_on_current_channel.feature |  2 +-
 .../Checkout/CheckoutOrderDetailsContext.php  | 87 ++++++-------------
 .../config/services/contexts/api/shop.xml     |  2 +-
 .../suites/api/checkout/paying_for_order.yml  |  1 +
 5 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature b/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
index ff3246c153..aa90747179 100644
--- a/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
+++ b/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
@@ -13,7 +13,7 @@ Feature: Preventing to pay for the cancelled order
         And the store allows paying Offline
         And there is a customer "sylius@example.com" that placed an order "#00000022"
 
-    @ui @no-api
+    @ui @api
     Scenario: Not being able to pay for cancelled order
         Given the customer bought 3 "Iron Maiden T-Shirt" products
         And the customer chose "Free" shipping method to "United States" with "Offline" payment
diff --git a/features/shop/checkout/paying_for_order/viewing_available_payment_methods_based_on_current_channel.feature b/features/shop/checkout/paying_for_order/viewing_available_payment_methods_based_on_current_channel.feature
index e92aa3f02c..4db36a7ca4 100644
--- a/features/shop/checkout/paying_for_order/viewing_available_payment_methods_based_on_current_channel.feature
+++ b/features/shop/checkout/paying_for_order/viewing_available_payment_methods_based_on_current_channel.feature
@@ -30,7 +30,7 @@ Feature: Viewing available payment methods based on current channel
         And I should see "Bank of America" and "Offline" payment methods
         But I should not see "Bank of Poland" and "Bank of Universe" payment methods
 
-    @api @ui
+    @ui @api
     Scenario: Seeing shipping methods that are available in another channel as an logged in customer
         Given I am a logged in customer
         And I am in the "Poland" channel
diff --git a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
index f464f6ea41..c05130fc41 100644
--- a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
+++ b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
@@ -15,17 +15,20 @@ namespace Sylius\Behat\Context\Api\Shop\Checkout;
 
 use Behat\Behat\Context\Context;
 use Sylius\Behat\Client\ApiClientInterface;
-use Sylius\Behat\Client\RequestFactoryInterface;
+use Sylius\Behat\Client\ResponseCheckerInterface;
+use Sylius\Behat\Context\Api\Resources;
 use Sylius\Behat\Service\SharedStorageInterface;
 use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\OrderPaymentStates;
+use Sylius\Component\Payment\Model\PaymentInterface;
 use Webmozart\Assert\Assert;
 
 final class CheckoutOrderDetailsContext implements Context
 {
     public function __construct(
-        private RequestFactoryInterface $requestFactory,
         private SharedStorageInterface $sharedStorage,
         private ApiClientInterface $client,
+        private ResponseCheckerInterface $responseChecker,
     ) {
     }
 
@@ -34,43 +37,8 @@ final class CheckoutOrderDetailsContext implements Context
      */
     public function iWantToBrowseOrderDetailsForThisOrder(OrderInterface $order): void
     {
-        $this->orderDetails->open(['tokenValue' => $order->getTokenValue()]);
-    }
-
-    /**
-     * @When I try to pay with :paymentMethodName payment method
-     */
-    public function iChangePaymentMethodTo(string $paymentMethodName): void
-    {
-        $this->orderDetails->choosePaymentMethod($paymentMethodName);
-        $this->orderDetails->pay();
-    }
-
-    /**
-     * @When I retry the payment with :paymentMethodName payment method
-     */
-    public function iChangePaymentMethodAfterCheckout(string $paymentMethodName): void
-    {
-        $this->thankYouPage->goToTheChangePaymentMethodPage();
-        $this->orderDetails->choosePaymentMethod($paymentMethodName);
-        $this->orderDetails->pay();
-    }
-
-    /**
-     * @When I want to pay for my order
-     */
-    public function iWantToPayForMyOrder(): void
-    {
-        $this->thankYouPage->goToTheChangePaymentMethodPage();
-    }
-
-    /**
-     * @When I try to pay for my order
-     */
-    public function iTryToPayForMyOrder(): void
-    {
-        $this->thankYouPage->goToTheChangePaymentMethodPage();
-        $this->orderDetails->pay();
+        $this->sharedStorage->set('cart_token', $order->getTokenValue());
+        $this->client->show(Resources::ORDERS, $order->getTokenValue());
     }
 
     /**
@@ -78,7 +46,8 @@ final class CheckoutOrderDetailsContext implements Context
      */
     public function iShouldBeAbleToPay(): void
     {
-        Assert::true($this->orderDetails->hasPayAction());
+        $state = $this->getLatestPaymentState();
+        Assert::eq($state, PaymentInterface::STATE_NEW);
     }
 
     /**
@@ -86,31 +55,27 @@ final class CheckoutOrderDetailsContext implements Context
      */
     public function iShouldNotBeAbleToPay(): void
     {
-        Assert::false($this->orderDetails->canBePaid());
+        $state = $this->getLatestPaymentState();
+        Assert::notEq($state, PaymentInterface::STATE_NEW);
     }
 
-    /**
-     * @Then I should see :quantity as number of items
-     */
-    public function iShouldSeeAsNumberOfItems(int $quantity): void
-    {
-        Assert::same($this->orderDetails->getAmountOfItems(), $quantity);
-    }
 
-    /**
-     * @Then I should have chosen :paymentMethodName payment method
-     */
-    public function iShouldHaveChosenPaymentMethod(string $paymentMethodName): void
+    private function getLatestPaymentState(): ?string
     {
-        $this->thankYouPage->goToTheChangePaymentMethodPage();
-        Assert::same($this->orderDetails->getChosenPaymentMethod(), $paymentMethodName);
-    }
+        $response = $this->client->show(Resources::ORDERS, $this->sharedStorage->get('cart_token'));
+        Assert::same($this->client->getLastResponse()->getStatusCode(), 200);
 
-    /**
-     * @Then I should be notified to choose a payment method
-     */
-    public function iShouldBeNotifiedToChooseAPaymentMethod(): void
-    {
-        Assert::contains($this->orderDetails->getPaymentValidationMessage(), 'Please select a payment method.');
+        // If the payment is canceled we won't be able to retrieve it because only new one are retrievable
+        if (OrderPaymentStates::STATE_CANCELLED === $this->responseChecker->getValue($response, 'paymentState')) {
+            return PaymentInterface::STATE_CANCELLED;
+        }
+
+        $payments = $this->responseChecker->getValue($response, 'payments');
+        $payment = end($payments);
+
+        $paymentId = $payment['id'];
+        $response = $this->client->show(Resources::PAYMENTS, (string) $paymentId);
+
+        return $this->responseChecker->getValue($response, 'state');
     }
 }
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
index cec644c8ee..38afcbd193 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
@@ -200,9 +200,9 @@
         </service>
 
         <service id="sylius.behat.context.api.shop.checkout.order_details" class="Sylius\Behat\Context\Api\Shop\Checkout\CheckoutOrderDetailsContext">
-            <argument type="service" id="sylius.behat.request_factory" />
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="sylius.behat.api_platform_client.shop" />
+            <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
         </service>
 
         <service id="Sylius\Behat\Context\Api\Shop\TaxonContext">
diff --git a/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml b/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
index 8a29cd9251..4f6a7a5bb8 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
@@ -44,6 +44,7 @@ default:
                 - sylius.behat.context.api.shop.cart
                 - sylius.behat.context.api.shop.checkout
                 - sylius.behat.context.api.shop.checkout.complete
+                - sylius.behat.context.api.shop.checkout.order_details
                 - sylius.behat.context.api.shop.order
                 - sylius.behat.context.api.shop.response
 

From 166e1a97da0bb7e341eccd0e74cc9461f3f2aaa9 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 2 Feb 2024 20:03:14 +0100
Subject: [PATCH 019/200] Fix PHPStan real issue and regenrate baseline for the
 rest

---
 .../Provider/PaymentRequestCommandProvider.php    |  1 -
 .../PaymentRequest/SyliusGetHttpRequestAction.php | 15 ++++++++++++++-
 .../PayumBundle/Factory/GetStatusFactory.php      |  2 +-
 .../Factory/GetStatusFactoryInterface.php         |  2 +-
 .../ModelAggregateRequestFactoryInterface.php     |  2 +-
 .../Factory/ResolveNextRouteFactory.php           |  2 +-
 .../Factory/ResolveNextRouteFactoryInterface.php  |  2 +-
 .../PaymentRequest/Factory/PayumTokenFactory.php  |  8 +++++++-
 .../Processor/RequestProcessorInterface.php       |  3 +--
 9 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
index 1433be69e9..cf95d2731c 100644
--- a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
@@ -51,7 +51,6 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
         Assert::notNull($gatewayConfig);
-        /** @var PaymentRequestCommandProviderInterface $service */
         $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
 
         /** @var PaymentRequestCommandProviderInterface $provider */
diff --git a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
index 3721540fa8..3a9abfe070 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
@@ -39,7 +39,19 @@ final class SyliusGetHttpRequestAction implements ActionInterface
         $paymentRequest = $this->payumApiContext->getPaymentRequest();
         Assert::notNull($paymentRequest);
 
-        /** @var array $payload */
+        /** @var array{
+         *     'http_request'?: array{
+         *         'query'?: array<string, string>,
+         *         'request'?: array<string, string>,
+         *         'method'?: string,
+         *         'uri'?: string,
+         *         'client_ip'?: string,
+         *         'user_agent'?: string,
+         *         'content'?: string,
+         *         'headers'?: array<string, string>,
+         *     },
+         * } $payload
+         */
         $payload = $paymentRequest->getRequestPayload();
         $httpRequest = $payload['http_request'] ?? [];
 
@@ -52,6 +64,7 @@ final class SyliusGetHttpRequestAction implements ActionInterface
         $request->content = $httpRequest['content'] ?? '';
 
         // Not existing property but used by the Symfony bridge
+        /** @phpstan-ignore-next-line */
         $request->headers = $httpRequest['headers'] ?? [];
     }
 
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactory.php b/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactory.php
index e4e9634610..2220d9ef26 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactory.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactory.php
@@ -18,7 +18,7 @@ use Sylius\Bundle\PayumBundle\Request\GetStatus;
 
 final class GetStatusFactory implements GetStatusFactoryInterface
 {
-    public function createNewWithModel($model): GetStatusInterface
+    public function createNewWithModel(mixed $model): GetStatusInterface
     {
         return new GetStatus($model);
     }
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactoryInterface.php
index 10fb0ebd6a..45c039a8cc 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactoryInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/GetStatusFactoryInterface.php
@@ -17,5 +17,5 @@ use Payum\Core\Request\GetStatusInterface;
 
 interface GetStatusFactoryInterface extends ModelAggregateRequestFactoryInterface
 {
-    public function createNewWithModel($model): GetStatusInterface;
+    public function createNewWithModel(mixed $model): GetStatusInterface;
 }
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/ModelAggregateRequestFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/ModelAggregateRequestFactoryInterface.php
index 21c5e26059..b7707fa190 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/ModelAggregateRequestFactoryInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/ModelAggregateRequestFactoryInterface.php
@@ -17,5 +17,5 @@ use Payum\Core\Model\ModelAggregateInterface;
 
 interface ModelAggregateRequestFactoryInterface
 {
-    public function createNewWithModel($model): ModelAggregateInterface;
+    public function createNewWithModel(mixed $model): ModelAggregateInterface;
 }
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/ResolveNextRouteFactory.php b/src/Sylius/Bundle/PayumBundle/Factory/ResolveNextRouteFactory.php
index a05f40cc00..4a4fed188e 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/ResolveNextRouteFactory.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/ResolveNextRouteFactory.php
@@ -18,7 +18,7 @@ use Sylius\Bundle\PayumBundle\Request\ResolveNextRouteInterface;
 
 final class ResolveNextRouteFactory implements ResolveNextRouteFactoryInterface
 {
-    public function createNewWithModel($model): ResolveNextRouteInterface
+    public function createNewWithModel(mixed $model): ResolveNextRouteInterface
     {
         return new ResolveNextRoute($model);
     }
diff --git a/src/Sylius/Bundle/PayumBundle/Factory/ResolveNextRouteFactoryInterface.php b/src/Sylius/Bundle/PayumBundle/Factory/ResolveNextRouteFactoryInterface.php
index 9dcc8a16e7..66d2e231b6 100644
--- a/src/Sylius/Bundle/PayumBundle/Factory/ResolveNextRouteFactoryInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Factory/ResolveNextRouteFactoryInterface.php
@@ -17,5 +17,5 @@ use Sylius\Bundle\PayumBundle\Request\ResolveNextRouteInterface;
 
 interface ResolveNextRouteFactoryInterface
 {
-    public function createNewWithModel($model): ResolveNextRouteInterface;
+    public function createNewWithModel(mixed $model): ResolveNextRouteInterface;
 }
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
index 7a0bfa62ec..5aa05e5322 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
@@ -39,7 +39,13 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
 
         $gatewayName = $gatewayConfig->getGatewayName();
 
-        /** @var array|null $payload */
+        /** @var array{
+         *     'target_path'?: string,
+         *     'target_path_parameters'?: array<string, string>,
+         *     'after_path'?: string,
+         *     'after_path_parameters'?: array<string, string>,
+         * }|null $payload
+         */
         $payload = $paymentRequest->getRequestPayload();
         Assert::notNull($payload, 'The request payload need to be not null!');
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
index 2795d3fc9c..9791a51e15 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
@@ -13,14 +13,13 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
 
-use Payum\Core\Security\TokenAggregateInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 interface RequestProcessorInterface
 {
     public function process(
         PaymentRequestInterface $paymentRequest,
-        TokenAggregateInterface $request,
+        mixed $request,
         string $gatewayName,
     ): void;
 }

From b9b3cd2b2d9abc245f9770311a33dbdeae0fd7d0 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 17:19:49 +0100
Subject: [PATCH 020/200] Fix service definition and use state machine
 absctraction

---
 .../Processor/AfterOfflineCaptureProcessor.php     | 14 +++++++++++++-
 .../Resources/config/services/offline.xml          |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php b/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php
index a133704e7b..988c7e6753 100644
--- a/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php
+++ b/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PaymentBundle\Processor;
 
 use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
+use Sylius\Abstraction\StateMachine\StateMachineInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\PaymentTransitions;
 use Webmozart\Assert\Assert;
@@ -21,8 +22,19 @@ use Webmozart\Assert\Assert;
 final class AfterOfflineCaptureProcessor implements AfterOfflineCaptureProcessorInterface
 {
     public function __construct(
-        private StateMachineFactoryInterface $stateMachineFactory,
+        private StateMachineFactoryInterface|StateMachineInterface $stateMachineFactory,
     ) {
+        if ($this->stateMachineFactory instanceof StateMachineFactoryInterface) {
+            trigger_deprecation(
+                'sylius/payment-bundle',
+                '1.13',
+                sprintf(
+                    'Passing an instance of "%s" as the first argument is deprecated. It will accept only instances of "%s" in Sylius 2.0.',
+                    StateMachineFactoryInterface::class,
+                    StateMachineInterface::class,
+                ),
+            );
+        }
     }
 
     public function process(PaymentRequestInterface $paymentRequest): void
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
index e1159d7e56..94d08b44b2 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
@@ -40,8 +40,9 @@
         </service>
 
         <service id="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface" class="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessor" />
+
         <service id="Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessorInterface" class="Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessor">
-            <argument tag="service" id="sm.factory" />
+            <argument type="service" id="sylius_abstraction.state_machine" />
         </service>
 
     </services>

From bd3337bceb2527b69246b2af01a44d370cdaf544 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 17:33:41 +0100
Subject: [PATCH 021/200] Move Payum related integrations to a dedicated folder

---
 .../DependencyInjection/SyliusPayumExtension.php   | 14 +++++++-------
 .../config/{ => integrations/payum}/paypal.xml     |  4 ----
 .../config/{ => integrations/payum}/stripe.xml     |  4 ----
 .../integrations/{ => sylius_payment}/offline.xml  |  0
 .../paypal_express_checkout.xml                    |  0
 .../services.xml}                                  |  0
 .../integrations/{ => sylius_payment}/stripe.xml   |  0
 7 files changed, 7 insertions(+), 15 deletions(-)
 rename src/Sylius/Bundle/PayumBundle/Resources/config/{ => integrations/payum}/paypal.xml (94%)
 rename src/Sylius/Bundle/PayumBundle/Resources/config/{ => integrations/payum}/stripe.xml (92%)
 rename src/Sylius/Bundle/PayumBundle/Resources/config/integrations/{ => sylius_payment}/offline.xml (100%)
 rename src/Sylius/Bundle/PayumBundle/Resources/config/integrations/{ => sylius_payment}/paypal_express_checkout.xml (100%)
 rename src/Sylius/Bundle/PayumBundle/Resources/config/integrations/{payment_request.xml => sylius_payment/services.xml} (100%)
 rename src/Sylius/Bundle/PayumBundle/Resources/config/integrations/{ => sylius_payment}/stripe.xml (100%)

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">
 
-    <imports>
-        <import resource="paypal/**.xml" />
-    </imports>
-
     <services>
         <defaults public="true" />
 
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">
 
-    <imports>
-        <import resource="stripe/**.xml" />
-    </imports>
-
     <services>
         <defaults public="true" />
 
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

From e513585b807d341de4160267893407aaf28e5687 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 17:49:50 +0100
Subject: [PATCH 022/200] Fix composer require checker missing new usages

---
 composer-require-checker.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/composer-require-checker.json b/composer-require-checker.json
index 4d09255eff..6e16f40361 100644
--- a/composer-require-checker.json
+++ b/composer-require-checker.json
@@ -36,6 +36,7 @@
     "Payum\\Core\\Model\\GatewayConfig",
     "Payum\\Core\\Model\\GatewayConfigInterface",
     "Payum\\Core\\Model\\Identity",
+    "Payum\\Core\\Model\\ModelAggregateInterface",
     "Payum\\Core\\Model\\Payment",
     "Payum\\Core\\Model\\PaymentInterface",
     "Payum\\Core\\Payum",
@@ -44,11 +45,14 @@
     "Payum\\Core\\Request\\Capture",
     "Payum\\Core\\Request\\Convert",
     "Payum\\Core\\Request\\Generic",
+    "Payum\\Core\\Request\\GetHttpRequest",
     "Payum\\Core\\Request\\GetStatusInterface",
     "Payum\\Core\\Request\\Notify",
+    "Payum\\Core\\Request\\RenderTemplate",
     "Payum\\Core\\Security\\CryptedInterface",
     "Payum\\Core\\Security\\GenericTokenFactoryInterface",
     "Payum\\Core\\Security\\HttpRequestVerifierInterface",
+    "Payum\\Core\\Security\\TokenAggregateInterface",
     "Payum\\Core\\Security\\TokenInterface",
     "Payum\\Core\\Security\\Util\\Random",
     "Payum\\Core\\Storage\\AbstractStorage",

From b79ac33fa374255306e1f5806b70c8eca2fdf5b8 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 18:02:31 +0100
Subject: [PATCH 023/200] Regenerate baseline for PHP8.2 and Sf 6.4

---
 phpstan-baseline.neon | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 954e6a233c..0bc5ada03d 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3835,6 +3835,16 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodChoiceType.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\PaymentBundle\\\\Provider\\\\PaymentRequestCommandProvider\\:\\:__construct\\(\\) has parameter \\$locator with generic interface Symfony\\\\Contracts\\\\Service\\\\ServiceProviderInterface but does not specify its types\\: T$#"
+			count: 1
+			path: src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
+
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\PaymentBundle\\\\Provider\\\\PaymentRequestTypeCommandProvider\\:\\:__construct\\(\\) has parameter \\$locator with generic interface Symfony\\\\Contracts\\\\Service\\\\ServiceProviderInterface but does not specify its types\\: T$#"
+			count: 1
+			path: src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
+
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\PaymentBundle\\\\SyliusPaymentBundle\\:\\:getSupportedDrivers\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

From 607ce05ff7de5132a3856bfc342ebd5846b72ec6 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 18:14:57 +0100
Subject: [PATCH 024/200] Fix baseline

---
 phpstan-baseline.neon | 138 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 134 insertions(+), 4 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 0bc5ada03d..14cb76378b 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1235,6 +1235,21 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/ApiBundle/DataTransformer/SubresourceIdAwareCommandDataTransformer.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\DependencyInjection\\\\Compiler\\\\CommandDataTransformerPass\\:\\:process\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/CommandDataTransformerPass.php
+
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\DependencyInjection\\\\Compiler\\\\FlattenExceptionNormalizerDecoratorCompilerPass\\:\\:process\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/FlattenExceptionNormalizerDecoratorCompilerPass.php
+
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\DependencyInjection\\\\Compiler\\\\LegacyErrorHandlingCompilerPass\\:\\:process\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/LegacyErrorHandlingCompilerPass.php
+
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\Doctrine\\\\QueryCollectionExtension\\\\AcceptedProductReviewsExtension\\:\\:applyToCollection\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -2120,6 +2135,11 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\CoreBundle\\\\DependencyInjection\\\\SyliusCoreExtension\\:\\:switchOrderProcessorsPriorities\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
+
 		-
 			message: "#^Property Sylius\\\\Bundle\\\\CoreBundle\\\\DependencyInjection\\\\SyliusCoreExtension\\:\\:\\$bundles type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -3300,6 +3320,11 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/CoreBundle/Form/Type/Promotion/Rule/TotalOfItemsFromTaxonConfigurationType.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\CoreBundle\\\\Form\\\\Type\\\\ShopBillingDataType\\:\\:configureOptions\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Form/Type/ShopBillingDataType.php
+
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\CoreBundle\\\\Form\\\\Type\\\\TaxCalculationStrategyChoiceType\\:\\:__construct\\(\\) has parameter \\$strategies with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -4186,12 +4211,12 @@ parameters:
 			path: src/Sylius/Bundle/PromotionBundle/Validator/CatalogPromotionActionValidator.php
 
 		-
-			message: "#^Property Sylius\\\\Bundle\\\\PromotionBundle\\\\Validator\\\\CatalogPromotionActionValidator\\:\\:\\$actionTypes is never read, only written\\.$#"
+			message: "#^Property Sylius\\\\Bundle\\\\PromotionBundle\\\\Validator\\\\CatalogPromotionActionValidator\\:\\:\\$actionValidators type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: src/Sylius/Bundle/PromotionBundle/Validator/CatalogPromotionActionValidator.php
 
 		-
-			message: "#^Property Sylius\\\\Bundle\\\\PromotionBundle\\\\Validator\\\\CatalogPromotionActionValidator\\:\\:\\$actionValidators type has no value type specified in iterable type array\\.$#"
+			message: "#^Property Sylius\\\\Bundle\\\\PromotionBundle\\\\Validator\\\\CatalogPromotionActionValidator\\:\\:\\$actionTypes is never read, only written.$#"
 			count: 1
 			path: src/Sylius/Bundle/PromotionBundle/Validator/CatalogPromotionActionValidator.php
 
@@ -4206,12 +4231,12 @@ parameters:
 			path: src/Sylius/Bundle/PromotionBundle/Validator/CatalogPromotionScopeValidator.php
 
 		-
-			message: "#^Method Sylius\\\\Bundle\\\\PromotionBundle\\\\Validator\\\\CatalogPromotionScopeValidator\\:\\:__construct\\(\\) has parameter \\$scopeValidators with no value type specified in iterable type iterable\\.$#"
+			message: "#^Property Sylius\\\\Bundle\\\\PromotionBundle\\\\Validator\\\\CatalogPromotionScopeValidator\\:\\:\\$scopeTypes is never read, only written.$#"
 			count: 1
 			path: src/Sylius/Bundle/PromotionBundle/Validator/CatalogPromotionScopeValidator.php
 
 		-
-			message: "#^Property Sylius\\\\Bundle\\\\PromotionBundle\\\\Validator\\\\CatalogPromotionScopeValidator\\:\\:\\$scopeTypes is never read, only written\\.$#"
+			message: "#^Method Sylius\\\\Bundle\\\\PromotionBundle\\\\Validator\\\\CatalogPromotionScopeValidator\\:\\:__construct\\(\\) has parameter \\$scopeValidators with no value type specified in iterable type iterable\\.$#"
 			count: 1
 			path: src/Sylius/Bundle/PromotionBundle/Validator/CatalogPromotionScopeValidator.php
 
@@ -4370,6 +4395,11 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/ShopBundle/Router/LocaleStrippingRouter.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\ShopBundle\\\\SyliusShopBundle\\:\\:build\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/ShopBundle/SyliusShopBundle.php
+
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\TaxationBundle\\\\Form\\\\Type\\\\TaxCalculatorChoiceType\\:\\:__construct\\(\\) has parameter \\$calculators with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -4520,6 +4550,16 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/UserBundle/Console/Command/AbstractRoleCommand.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\UserBundle\\\\Command\\\\DemoteUserCommand\\:\\:executeRoleCommand\\(\\) has parameter \\$securityRoles with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/UserBundle/Command/DemoteUserCommand.php
+
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\UserBundle\\\\Command\\\\PromoteUserCommand\\:\\:executeRoleCommand\\(\\) has parameter \\$securityRoles with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/UserBundle/Command/PromoteUserCommand.php
+
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\UserBundle\\\\Controller\\\\UserController\\:\\:getSyliusAttribute\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -6289,3 +6329,93 @@ parameters:
 			message: "#^Method Sylius\\\\Component\\\\User\\\\Security\\\\Checker\\\\TokenUniquenessChecker\\:\\:__construct\\(\\) has parameter \\$repository with generic interface Sylius\\\\Component\\\\Resource\\\\Repository\\\\RepositoryInterface but does not specify its types\\: T$#"
 			count: 1
 			path: src/Sylius/Component/User/Security/Checker/TokenUniquenessChecker.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/AbstractInstallCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/CancelUnpaidOrdersCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/CheckRequirementsCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/InformAboutGUSCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/InstallAssetsCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/InstallCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/InstallDatabaseCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/InstallSampleDataCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/JwtConfigurationCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/SetupCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/ShowAvailablePluginsCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/CoreBundle/Command/Model/PluginInfo.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/OrderBundle/Command/RemoveExpiredCartsCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/PromotionBundle/Command/GenerateCouponsCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/UiBundle/Command/DebugTemplateEventCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/UserBundle/Command/AbstractRoleCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/UserBundle/Command/DemoteUserCommand.php
+
+		-
+			message: "#^If condition is always false.$#"
+			count: 1
+			path: src/Sylius/Bundle/UserBundle/Command/PromoteUserCommand.php

From 3892a5f6c90dad535e5a3a206ca91b3222a67aec Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 19:15:10 +0100
Subject: [PATCH 025/200] Add missing deps

---
 src/Sylius/Bundle/PaymentBundle/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json
index 3ebb64ae54..c2a03d9159 100644
--- a/src/Sylius/Bundle/PaymentBundle/composer.json
+++ b/src/Sylius/Bundle/PaymentBundle/composer.json
@@ -30,6 +30,7 @@
         "sylius/payment": "^2.0",
         "sylius/resource-bundle": "^1.10",
         "symfony/framework-bundle": "^6.4.1",
+        "symfony/messenger": "^6.4.0",
         "ramsey/uuid-doctrine": "^2.0"
     },
     "conflict": {

From 9fae92399379e934e48775a77638bb0db8b0cb1e Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 19:16:51 +0100
Subject: [PATCH 026/200] Fix old ignore

---
 src/Sylius/Bundle/PaymentBundle/.gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/PaymentBundle/.gitignore b/src/Sylius/Bundle/PaymentBundle/.gitignore
index a24566fdcc..d9a7ab6005 100644
--- a/src/Sylius/Bundle/PaymentBundle/.gitignore
+++ b/src/Sylius/Bundle/PaymentBundle/.gitignore
@@ -4,5 +4,5 @@ bin/
 composer.phar
 composer.lock
 
-test/app/cache
-test/app/logs
+test/var/cache
+test/var/logs

From 9704d93c3a01a227f2681a15f5ee342eceef9898 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 19:21:25 +0100
Subject: [PATCH 027/200] Use Sylius abstract doctrine migration to allow
 PostgreSQL

---
 .../Bundle/CoreBundle/Migrations/Version20231106190918.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
index d226a42118..ee601d69b5 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
+use Sylius\Bundle\CoreBundle\Doctrine\Migrations\AbstractMigration;
 
 final class Version20231106190918 extends AbstractMigration
 {

From 8c72284fa6b9c27e60e53e176739692530f277fb Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 23:26:50 +0100
Subject: [PATCH 028/200] Create migration for PostgreSQL

---
 .../Migrations/Version20240203222417.php      | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php

diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
new file mode 100644
index 0000000000..6f4b946d5a
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Sylius\Bundle\CoreBundle\Doctrine\Migrations\AbstractPostgreSQLMigration;
+
+final class Version20240203222417 extends AbstractPostgreSQLMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create payment request';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE sylius_payment_request (hash UUID NOT NULL, method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, request_payload TEXT NOT NULL, response_data JSON NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(hash))');
+        $this->addSql('CREATE INDEX IDX_86D904B19883967 ON sylius_payment_request (method_id)');
+        $this->addSql('CREATE INDEX IDX_86D904B4C3A3BB ON sylius_payment_request (payment_id)');
+        $this->addSql('COMMENT ON COLUMN sylius_payment_request.hash IS \'(DC2Type:uuid)\'');
+        $this->addSql('COMMENT ON COLUMN sylius_payment_request.request_payload IS \'(DC2Type:object)\'');
+        $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE messenger_messages ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE messenger_messages ALTER available_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE messenger_messages ALTER delivered_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('COMMENT ON COLUMN messenger_messages.created_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN messenger_messages.available_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN messenger_messages.delivered_at IS \'(DC2Type:datetime_immutable)\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE sylius_payment_request DROP CONSTRAINT FK_86D904B19883967');
+        $this->addSql('ALTER TABLE sylius_payment_request DROP CONSTRAINT FK_86D904B4C3A3BB');
+        $this->addSql('DROP TABLE sylius_payment_request');
+        $this->addSql('ALTER TABLE messenger_messages ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE messenger_messages ALTER available_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE messenger_messages ALTER delivered_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('COMMENT ON COLUMN messenger_messages.created_at IS NULL');
+        $this->addSql('COMMENT ON COLUMN messenger_messages.available_at IS NULL');
+        $this->addSql('COMMENT ON COLUMN messenger_messages.delivered_at IS NULL');
+    }
+}

From 5473573ea09a4b2dc3eefc7d1d375d70ff858971 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 3 Feb 2024 23:44:08 +0100
Subject: [PATCH 029/200] Add missing messenger buses

---
 .../Resources/config/app/config.yml           | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
index 619fe137f6..c4b179aaf9 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
@@ -15,3 +15,23 @@ jms_serializer:
             sylius-payment:
                 namespace_prefix: "Sylius\\Component\\Payment"
                 path: "@SyliusPaymentBundle/Resources/config/serializer"
+
+sylius_payum:
+    gateway_config:
+        validation_groups:
+            paypal_express_checkout:
+                - 'sylius'
+                - 'sylius_paypal_express_checkout'
+            stripe_checkout:
+                - 'sylius'
+                - 'sylius_stripe_checkout'
+
+framework:
+    messenger:
+        buses:
+            sylius.event_bus:
+                default_middleware: allow_no_handlers
+            sylius.command_bus:
+                middleware:
+                    - 'validation'
+                    - 'doctrine_transaction'

From a1378b593827c00ea9b452c10bd4335aa6f6c3e5 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sun, 4 Feb 2024 18:12:50 +0100
Subject: [PATCH 030/200] Refactor to use CoreBundle instead of
 SyliusPay(um|ment)Bundle

---
 .../Payment/AddPaymentRequestHandler.php      |  2 +-
 .../Payment/UpdatePaymentRequestHandler.php   |  2 +-
 .../config/services/command_handlers.xml      |  4 +-
 .../SyliusCoreExtension.php                   | 21 +++++
 .../PaymentRequestDuplicationChecker.php      |  2 +-
 ...mentRequestDuplicationCheckerInterface.php |  2 +-
 .../Offline}/CapturePaymentRequest.php        |  4 +-
 .../Command/Offline}/StatusPaymentRequest.php |  4 +-
 .../PaymentRequestHashAwareInterface.php      |  2 +-
 .../PaymentRequestCommandDispatcher.php       |  4 +-
 ...ymentRequestCommandDispatcherInterface.php |  2 +-
 .../Offline/CapturePaymentRequestHandler.php  |  8 +-
 .../Action}/SyliusGetHttpRequestAction.php    | 11 +--
 .../Action}/SyliusRenderTemplateAction.php    |  4 +-
 .../Command/AuthorizePaymentRequest.php       |  4 +-
 .../Payum/Command}/CapturePaymentRequest.php  |  4 +-
 .../Payum/Command}/StatusPaymentRequest.php   |  4 +-
 .../ModelPaymentRequestHandler.php            |  8 +-
 .../TokenPaymentRequestHandler.php            | 12 +--
 .../Payum}/Factory/PayumTokenFactory.php      |  2 +-
 .../Factory/PayumTokenFactoryInterface.php    |  2 +-
 .../Payum}/PaymentRequestContext.php          |  2 +-
 .../Payum}/PaymentRequestContextInterface.php |  2 +-
 .../Processor/AfterTokenRequestProcessor.php  |  4 +-
 .../AfterTokenRequestProcessorInterface.php   |  2 +-
 .../Payum}/Processor/RequestProcessor.php     |  4 +-
 .../Processor/RequestProcessorInterface.php   |  2 +-
 .../Provider/AuthorizeCommandProvider.php     |  6 +-
 .../Provider/CaptureCommandProvider.php       |  6 +-
 .../Provider/PaymentRequestProvider.php       |  2 +-
 .../PaymentRequestProviderInterface.php       |  2 +-
 .../Payum}/Provider/StatusCommandProvider.php |  6 +-
 .../AfterOfflineCaptureProcessor.php          |  2 +-
 .../AfterOfflineCaptureProcessorInterface.php |  2 +-
 .../Processor/OfflineCaptureProcessor.php     |  2 +-
 .../OfflineCaptureProcessorInterface.php      |  2 +-
 .../CapturePaymentRequestCommandProvider.php  |  6 +-
 .../StatusPaymentRequestCommandProvider.php   |  6 +-
 .../PaymentRequestCommandProvider.php         |  4 +-
 ...PaymentRequestCommandProviderInterface.php |  2 +-
 .../PaymentRequestTypeCommandProvider.php     |  2 +-
 .../services/integrations/payum}/offline.xml  |  6 +-
 .../payum}/paypal_express_checkout.xml        |  8 +-
 .../services/integrations/payum}/stripe.xml   |  8 +-
 .../config/services/payment_request.xml       | 27 ++++++
 .../services/payment_request}/checker.xml     |  2 +-
 .../payment_request}/command_dispatcher.xml   |  4 +-
 .../services/payment_request}/offline.xml     | 16 ++--
 .../payment_request/payum/actions.xml         | 34 ++++++++
 .../payment_request/payum/comman_handlers.xml | 52 +++++++++++
 .../payment_request/payum/factory.xml         | 31 +++++++
 .../payment_request/payum/processors.xml      | 27 ++++++
 .../payment_request/payum/providers.xml       | 27 ++++++
 .../services/payment_request}/provider.xml    |  4 +-
 .../Resources/config/app/config.yml           | 10 ---
 .../Resources/config/services.xml             |  4 -
 .../SyliusPayumExtension.php                  | 15 ----
 .../integrations/sylius_payment/services.xml  | 86 -------------------
 src/Sylius/Bundle/PayumBundle/composer.json   |  2 +-
 59 files changed, 321 insertions(+), 216 deletions(-)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Checker/PaymentRequestDuplicationChecker.php (93%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Checker/PaymentRequestDuplicationCheckerInterface.php (88%)
 rename src/Sylius/Bundle/{PayumBundle/Command => CoreBundle/PaymentRequest/Command/Offline}/CapturePaymentRequest.php (78%)
 rename src/Sylius/Bundle/{PayumBundle/Command => CoreBundle/PaymentRequest/Command/Offline}/StatusPaymentRequest.php (78%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Command/PaymentRequestHashAwareInterface.php (87%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/CommandDispatcher/PaymentRequestCommandDispatcher.php (89%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php (88%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/CommandHandler/Offline/CapturePaymentRequestHandler.php (84%)
 rename src/Sylius/Bundle/{PayumBundle/Action/PaymentRequest => CoreBundle/PaymentRequest/Payum/Action}/SyliusGetHttpRequestAction.php (86%)
 rename src/Sylius/Bundle/{PayumBundle/Action/PaymentRequest => CoreBundle/PaymentRequest/Payum/Action}/SyliusRenderTemplateAction.php (89%)
 rename src/Sylius/Bundle/{PayumBundle => CoreBundle/PaymentRequest/Payum}/Command/AuthorizePaymentRequest.php (79%)
 rename src/Sylius/Bundle/{PaymentBundle/Command/Offline => CoreBundle/PaymentRequest/Payum/Command}/CapturePaymentRequest.php (79%)
 rename src/Sylius/Bundle/{PaymentBundle/Command/Offline => CoreBundle/PaymentRequest/Payum/Command}/StatusPaymentRequest.php (78%)
 rename src/Sylius/Bundle/{PayumBundle => CoreBundle/PaymentRequest/Payum}/CommandHandler/ModelPaymentRequestHandler.php (82%)
 rename src/Sylius/Bundle/{PayumBundle => CoreBundle/PaymentRequest/Payum}/CommandHandler/TokenPaymentRequestHandler.php (74%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Factory/PayumTokenFactory.php (97%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Factory/PayumTokenFactoryInterface.php (87%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/PaymentRequestContext.php (93%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/PaymentRequestContextInterface.php (90%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Processor/AfterTokenRequestProcessor.php (88%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Processor/AfterTokenRequestProcessorInterface.php (88%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Processor/RequestProcessor.php (90%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Processor/RequestProcessorInterface.php (87%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Provider/AuthorizeCommandProvider.php (75%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Provider/CaptureCommandProvider.php (75%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Provider/PaymentRequestProvider.php (95%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Provider/PaymentRequestProviderInterface.php (86%)
 rename src/Sylius/Bundle/{PayumBundle/PaymentRequest => CoreBundle/PaymentRequest/Payum}/Provider/StatusCommandProvider.php (75%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Processor/AfterOfflineCaptureProcessor.php (96%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Processor/AfterOfflineCaptureProcessorInterface.php (87%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Processor/OfflineCaptureProcessor.php (94%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Processor/OfflineCaptureProcessorInterface.php (87%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Provider/Offline/CapturePaymentRequestCommandProvider.php (75%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Provider/Offline/StatusPaymentRequestCommandProvider.php (75%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Provider/PaymentRequestCommandProvider.php (92%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Provider/PaymentRequestCommandProviderInterface.php (89%)
 rename src/Sylius/Bundle/{PaymentBundle => CoreBundle/PaymentRequest}/Provider/PaymentRequestTypeCommandProvider.php (94%)
 rename src/Sylius/Bundle/{PayumBundle/Resources/config/integrations/sylius_payment => CoreBundle/Resources/config/services/integrations/payum}/offline.xml (79%)
 rename src/Sylius/Bundle/{PayumBundle/Resources/config/integrations/sylius_payment => CoreBundle/Resources/config/services/integrations/payum}/paypal_express_checkout.xml (74%)
 rename src/Sylius/Bundle/{PayumBundle/Resources/config/integrations/sylius_payment => CoreBundle/Resources/config/services/integrations/payum}/stripe.xml (76%)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml
 rename src/Sylius/Bundle/{PaymentBundle/Resources/config/services => CoreBundle/Resources/config/services/payment_request}/checker.xml (76%)
 rename src/Sylius/Bundle/{PaymentBundle/Resources/config/services => CoreBundle/Resources/config/services/payment_request}/command_dispatcher.xml (67%)
 rename src/Sylius/Bundle/{PaymentBundle/Resources/config/services => CoreBundle/Resources/config/services/payment_request}/offline.xml (60%)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/actions.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/providers.xml
 rename src/Sylius/Bundle/{PaymentBundle/Resources/config/services => CoreBundle/Resources/config/services/payment_request}/provider.xml (67%)
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/services.xml

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index b182c3c551..3800b698b7 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
-use Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index fcd4301cc9..8d9f5129b2 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest;
-use Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 811701d6f4..0c1daf639c 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -243,14 +243,14 @@
             <argument type="service" id="sylius.custom_factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.repository.payment" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\UpdatePaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
index 5074aab2e9..c1c499e664 100644
--- a/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
+++ b/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
@@ -13,6 +13,9 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\DependencyInjection;
 
+use Payum\Offline\OfflineGatewayFactory;
+use Payum\Paypal\ExpressCheckout\Nvp\PaypalExpressCheckoutGatewayFactory;
+use Payum\Stripe\StripeCheckoutGatewayFactory;
 use Sylius\Bundle\CoreBundle\Attribute\AsCatalogPromotionApplicatorCriteria;
 use Sylius\Bundle\CoreBundle\Attribute\AsCatalogPromotionPriceCalculator;
 use Sylius\Bundle\CoreBundle\Attribute\AsEntityObserver;
@@ -105,6 +108,7 @@ final class SyliusCoreExtension extends AbstractResourceExtension implements Pre
         $this->prependDoctrineMigrations($container);
         $this->prependJmsSerializerIfAdminApiBundleIsNotPresent($container);
         $this->prependSyliusOrderBundle($container, $config);
+        $this->prependPayum($container);
     }
 
     protected function getMigrationsNamespace(): string
@@ -184,6 +188,23 @@ final class SyliusCoreExtension extends AbstractResourceExtension implements Pre
         ]);
     }
 
+    private function prependPayum(ContainerBuilder $container): void
+    {
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+
+        if (class_exists(OfflineGatewayFactory::class)) {
+            $loader->load('services/integrations/payum/offline.xml');
+        }
+
+        if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) {
+            $loader->load('services/integrations/payum/paypal_express_checkout.xml');
+        }
+
+        if (class_exists(StripeCheckoutGatewayFactory::class)) {
+            $loader->load('services/integrations/payum/stripe.xml');
+        }
+    }
+
     private function registerAutoconfiguration(ContainerBuilder $container): void
     {
         $container->registerAttributeForAutoconfiguration(
diff --git a/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
similarity index 93%
rename from src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
index 0a44de5ed4..69ba683192 100644
--- a/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationChecker.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
diff --git a/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationCheckerInterface.php
similarity index 88%
rename from src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationCheckerInterface.php
index 7597ef86f2..86702e11e1 100644
--- a/src/Sylius/Bundle/PaymentBundle/Checker/PaymentRequestDuplicationCheckerInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationCheckerInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Checker;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/CapturePaymentRequest.php
similarity index 78%
rename from src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/CapturePaymentRequest.php
index b19e742b54..1921179890 100644
--- a/src/Sylius/Bundle/PayumBundle/Command/CapturePaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/CapturePaymentRequest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Command;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline;
 
-use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 
 class CapturePaymentRequest implements PaymentRequestHashAwareInterface
 {
diff --git a/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
similarity index 78%
rename from src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
index 2a367101ee..ef2b56900c 100644
--- a/src/Sylius/Bundle/PayumBundle/Command/StatusPaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Command;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline;
 
-use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 
 class StatusPaymentRequest implements PaymentRequestHashAwareInterface
 {
diff --git a/src/Sylius/Bundle/PaymentBundle/Command/PaymentRequestHashAwareInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
similarity index 87%
rename from src/Sylius/Bundle/PaymentBundle/Command/PaymentRequestHashAwareInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
index 51444ee898..e821b42819 100644
--- a/src/Sylius/Bundle/PaymentBundle/Command/PaymentRequestHashAwareInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Command;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command;
 
 /** @experimental */
 interface PaymentRequestHashAwareInterface
diff --git a/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcher.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php
similarity index 89%
rename from src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcher.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php
index 4342744900..4332579230 100644
--- a/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcher.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\CommandDispatcher;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
diff --git a/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
similarity index 88%
rename from src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
index 13eb34b222..6012579785 100644
--- a/src/Sylius/Bundle/PaymentBundle/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\CommandDispatcher;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
similarity index 84%
rename from src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index 930858162c..26750e90e4 100644
--- a/src/Sylius/Bundle/PaymentBundle/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\CommandHandler\Offline;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
 
-use Sylius\Bundle\PaymentBundle\Command\Offline\CapturePaymentRequest;
-use Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessorInterface;
-use Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\AfterOfflineCaptureProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\OfflineCaptureProcessorInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
diff --git a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
similarity index 86%
rename from src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
index 3a9abfe070..9fbe434966 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Action\PaymentRequest;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Action;
 
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\GetHttpRequest;
-use Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface;
 use Webmozart\Assert\Assert;
 
 final class SyliusGetHttpRequestAction implements ActionInterface
@@ -63,9 +63,10 @@ final class SyliusGetHttpRequestAction implements ActionInterface
         $request->userAgent = $httpRequest['user_agent'] ?? '';
         $request->content = $httpRequest['content'] ?? '';
 
-        // Not existing property but used by the Symfony bridge
-        /** @phpstan-ignore-next-line */
-        $request->headers = $httpRequest['headers'] ?? [];
+        // Next release of Payum will have this field
+        if (property_exists($request, 'headers')) {
+            $request->headers = $httpRequest['headers'] ?? [];
+        }
     }
 
     public function supports($request): bool
diff --git a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusRenderTemplateAction.php
similarity index 89%
rename from src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusRenderTemplateAction.php
index ea522256c4..d656ae99ed 100644
--- a/src/Sylius/Bundle/PayumBundle/Action/PaymentRequest/SyliusRenderTemplateAction.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusRenderTemplateAction.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Action\PaymentRequest;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Action;
 
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\RenderTemplate;
-use Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface;
 use Webmozart\Assert\Assert;
 
 final class SyliusRenderTemplateAction implements ActionInterface
diff --git a/src/Sylius/Bundle/PayumBundle/Command/AuthorizePaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php
similarity index 79%
rename from src/Sylius/Bundle/PayumBundle/Command/AuthorizePaymentRequest.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php
index 2d822ac594..efd762eb09 100644
--- a/src/Sylius/Bundle/PayumBundle/Command/AuthorizePaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Command;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
 
-use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 
 class AuthorizePaymentRequest implements PaymentRequestHashAwareInterface
 {
diff --git a/src/Sylius/Bundle/PaymentBundle/Command/Offline/CapturePaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php
similarity index 79%
rename from src/Sylius/Bundle/PaymentBundle/Command/Offline/CapturePaymentRequest.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php
index 215cad448c..02d46df93c 100644
--- a/src/Sylius/Bundle/PaymentBundle/Command/Offline/CapturePaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Command\Offline;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
 
-use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 
 class CapturePaymentRequest implements PaymentRequestHashAwareInterface
 {
diff --git a/src/Sylius/Bundle/PaymentBundle/Command/Offline/StatusPaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php
similarity index 78%
rename from src/Sylius/Bundle/PaymentBundle/Command/Offline/StatusPaymentRequest.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php
index b63267e30e..00797f6150 100644
--- a/src/Sylius/Bundle/PaymentBundle/Command/Offline/StatusPaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Command\Offline;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
 
-use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 
 class StatusPaymentRequest implements PaymentRequestHashAwareInterface
 {
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
similarity index 82%
rename from src/Sylius/Bundle/PayumBundle/CommandHandler/ModelPaymentRequestHandler.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
index 980eec3a1e..bbf1f3d17b 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\CommandHandler;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler;
 
-use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
diff --git a/src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php
similarity index 74%
rename from src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php
index e57d4e55fe..81df149ca1 100644
--- a/src/Sylius/Bundle/PayumBundle/CommandHandler/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\CommandHandler;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler;
 
-use Sylius\Bundle\PaymentBundle\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\AfterTokenRequestProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface;
 use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenRequestProcessorInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
similarity index 97%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index 5aa05e5322..a4f20030ca 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Factory;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory;
 
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenInterface;
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactoryInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactoryInterface.php
similarity index 87%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactoryInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactoryInterface.php
index 16a21c8761..010fd1765c 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Factory/PayumTokenFactoryInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactoryInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Factory;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory;
 
 use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContext.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContext.php
similarity index 93%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContext.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContext.php
index 4c8640c2c0..5aa7a14329 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContext.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContext.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContextInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContextInterface.php
similarity index 90%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContextInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContextInterface.php
index 871cb2f83d..43359c9a7b 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/PaymentRequestContextInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContextInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessor.php
similarity index 88%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessor.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessor.php
index 50b4dd16af..72c6951fe5 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessor.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor;
 
 use Payum\Core\Security\TokenInterface;
-use Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessorInterface.php
similarity index 88%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessorInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessorInterface.php
index a16770dfcc..7efa21cc57 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/AfterTokenRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor;
 
 use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessor.php
similarity index 90%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessor.php
index 816e4013a8..f7b284e3f2 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessor.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor;
 
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenAggregateInterface;
-use Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class RequestProcessor implements RequestProcessorInterface
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessorInterface.php
similarity index 87%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessorInterface.php
index 9791a51e15..9240c8f35c 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Processor/RequestProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/AuthorizeCommandProvider.php
similarity index 75%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/AuthorizeCommandProvider.php
index ace097ba64..e5f44cbc16 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/AuthorizeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/AuthorizeCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
 
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
-use Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\AuthorizePaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class AuthorizeCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/CaptureCommandProvider.php
similarity index 75%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/CaptureCommandProvider.php
index 6b21461e75..6073558ead 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/CaptureCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/CaptureCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
 
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
-use Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\CapturePaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class CaptureCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProvider.php
similarity index 95%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProvider.php
index 7f9ca523c1..3be2cde94d 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProvider.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\Proxy;
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProviderInterface.php
similarity index 86%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProviderInterface.php
index 43aa4de281..ed9b7dee32 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProviderInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/StatusCommandProvider.php
similarity index 75%
rename from src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/StatusCommandProvider.php
index 1ec733406c..cf202363bc 100644
--- a/src/Sylius/Bundle/PayumBundle/PaymentRequest/Provider/StatusCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/StatusCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\PaymentRequest\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
 
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
-use Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\StatusPaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class StatusCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessor.php
similarity index 96%
rename from src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessor.php
index 988c7e6753..4c8d4ba58c 100644
--- a/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessor.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor;
 
 use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
 use Sylius\Abstraction\StateMachine\StateMachineInterface;
diff --git a/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessorInterface.php
similarity index 87%
rename from src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessorInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessorInterface.php
index 22af327d5a..6fb6fc0ecb 100644
--- a/src/Sylius/Bundle/PaymentBundle/Processor/AfterOfflineCaptureProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessor.php
similarity index 94%
rename from src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessor.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessor.php
index 2c4e4d75ea..7a43444829 100644
--- a/src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessor.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor;
 
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
diff --git a/src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessorInterface.php
similarity index 87%
rename from src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessorInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessorInterface.php
index 48d24006b6..c5fadd9a28 100644
--- a/src/Sylius/Bundle/PaymentBundle/Processor/OfflineCaptureProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/Offline/CapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/CapturePaymentRequestCommandProvider.php
similarity index 75%
rename from src/Sylius/Bundle/PaymentBundle/Provider/Offline/CapturePaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/CapturePaymentRequestCommandProvider.php
index 2445f6d253..996ddb80a1 100644
--- a/src/Sylius/Bundle/PaymentBundle/Provider/Offline/CapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/CapturePaymentRequestCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Provider\Offline;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider\Offline;
 
-use Sylius\Bundle\PaymentBundle\Command\Offline\CapturePaymentRequest;
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class CapturePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/Offline/StatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/StatusPaymentRequestCommandProvider.php
similarity index 75%
rename from src/Sylius/Bundle/PaymentBundle/Provider/Offline/StatusPaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/StatusPaymentRequestCommandProvider.php
index 51b1e01b26..9fbcb6e302 100644
--- a/src/Sylius/Bundle/PaymentBundle/Provider/Offline/StatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/StatusPaymentRequestCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Provider\Offline;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider\Offline;
 
-use Sylius\Bundle\PaymentBundle\Command\Offline\StatusPaymentRequest;
-use Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\StatusPaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class StatusPaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProvider.php
similarity index 92%
rename from src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProvider.php
index cf95d2731c..3216056806 100644
--- a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProvider.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
-use Sylius\Bundle\PaymentBundle\Checker\PaymentRequestDuplicationCheckerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProviderInterface.php
similarity index 89%
rename from src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProviderInterface.php
index 7bef0d5af9..bfde835869 100644
--- a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestCommandProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProviderInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestTypeCommandProvider.php
similarity index 94%
rename from src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestTypeCommandProvider.php
index 587dbaf6de..fba8f6d579 100644
--- a/src/Sylius/Bundle/PaymentBundle/Provider/PaymentRequestTypeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestTypeCommandProvider.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
similarity index 79%
rename from src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/offline.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
index 3a437de539..c19b3b6ff6 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
@@ -18,16 +18,16 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestTypeCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.offline" index-by="type" />
             <tag name="sylius.payment_request.command_provider" factory="offline" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\CaptureCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\CaptureCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.offline" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\StatusCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\StatusCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.offline" type="status" />
         </service>
 
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/paypal_express_checkout.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
similarity index 74%
rename from src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/paypal_express_checkout.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
index 167e282ec3..c66b2a89a6 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/paypal_express_checkout.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
@@ -18,20 +18,20 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestTypeCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.paypal_express_checkout" index-by="type" />
             <tag name="sylius.payment_request.command_provider" factory="paypal_express_checkout" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\CaptureCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\CaptureCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\AuthorizeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\AuthorizeCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\StatusCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\StatusCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="status" />
         </service>
 
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/stripe.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
similarity index 76%
rename from src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/stripe.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
index 2ec2316e93..91a5a52b57 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/stripe.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
@@ -18,20 +18,20 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.payum.stripe" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.stripe" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestTypeCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.stripe" index-by="type" />
             <tag name="sylius.payment_request.command_provider" factory="stripe" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.capture" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\CaptureCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.stripe.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\CaptureCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.stripe" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.authorize" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\AuthorizeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.stripe.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\AuthorizeCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.stripe" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.status" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\StatusCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.stripe.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\StatusCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.stripe" type="status" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml
new file mode 100644
index 0000000000..88c557ee3d
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml
@@ -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">
+    <imports>
+        <import resource="payment_request/*.xml" />
+        <import resource="payment_request/payum/*.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>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/checker.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
similarity index 76%
rename from src/Sylius/Bundle/PaymentBundle/Resources/config/services/checker.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
index 66c47db6cb..2891bd9c47 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/checker.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\PaymentBundle\Checker\PaymentRequestDuplicationCheckerInterface" class="Sylius\Bundle\PaymentBundle\Checker\PaymentRequestDuplicationChecker">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationChecker">
             <argument type="service" id="sylius.repository.payment_request" />
         </service>
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/command_dispatcher.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
similarity index 67%
rename from src/Sylius/Bundle/PaymentBundle/Resources/config/services/command_dispatcher.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
index c21b39ee50..50fda42a8d 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/command_dispatcher.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
@@ -18,9 +18,9 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" class="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcher">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcher">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface" />
             <argument type="service" id="sylius.command_bus" />
         </service>
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
similarity index 60%
rename from src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
index 94d08b44b2..75ec387865 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
@@ -18,30 +18,30 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.offline" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestTypeCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="type" />
             <tag name="sylius.payment_request.command_provider" factory="offline" priority="-100" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\PaymentBundle\Provider\Offline\CapturePaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\Offline\CapturePaymentRequestCommandProvider">
             <tag name="sylius.payment_request.command_provider.offline" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.offline.status" class="Sylius\Bundle\PaymentBundle\Provider\Offline\StatusPaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\Offline\StatusPaymentRequestCommandProvider">
             <tag name="sylius.payment_request.command_provider.offline" type="status" />
         </service>
 
-        <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\PaymentBundle\CommandHandler\Offline\CapturePaymentRequestHandler">
+        <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\OfflineCaptureProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\AfterOfflineCaptureProcessorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
-        <service id="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessorInterface" class="Sylius\Bundle\PaymentBundle\Processor\OfflineCaptureProcessor" />
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\OfflineCaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\OfflineCaptureProcessor" />
 
-        <service id="Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessorInterface" class="Sylius\Bundle\PaymentBundle\Processor\AfterOfflineCaptureProcessor">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\AfterOfflineCaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\AfterOfflineCaptureProcessor">
             <argument type="service" id="sylius_abstraction.state_machine" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/actions.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/actions.xml
new file mode 100644
index 0000000000..481e2199e2
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/actions.xml
@@ -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_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>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml
new file mode 100644
index 0000000000..4d9b255b2f
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml
@@ -0,0 +1,52 @@
+<?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\CommandHandler\TokenPaymentRequestHandler" abstract="true">
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\AfterTokenRequestProcessorInterface" />
+        </service>
+
+        <service id="sylius.payment_request.payum.capture" parent="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\TokenPaymentRequestHandler">
+            <argument type="service" id="sylius.factory.payum_capture" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\CapturePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\CapturePaymentRequest" />
+        </service>
+
+        <service id="sylius.payment_request.payum.authorize" parent="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\TokenPaymentRequestHandler">
+            <argument type="service" id="sylius.factory.payum_authorize" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\AuthorizePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\AuthorizePaymentRequest" />
+        </service>
+
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\ModelPaymentRequestHandler" abstract="true">
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface" />
+        </service>
+
+        <service id="sylius.payment_request.payum.status" parent="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\ModelPaymentRequestHandler">
+            <argument type="service" id="sylius.factory.payum_get_status_action" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\StatusPaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\StatusPaymentRequest" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml
new file mode 100644
index 0000000000..1325861659
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml
@@ -0,0 +1,31 @@
+<?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\Processor\AfterTokenRequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\AfterTokenRequestProcessor">
+            <argument type="service" id="sylius.custom_factory.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
+        </service>
+
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactory">
+            <argument type="service" id="payum" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
new file mode 100644
index 0000000000..d06abf84ae
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
@@ -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\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessor">
+            <argument type="service" id="payum" />
+            <argument type="service" id="sylius.payment_request.payum.context" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/providers.xml
new file mode 100644
index 0000000000..beef4bd035
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/providers.xml
@@ -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\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProvider">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
similarity index 67%
rename from src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
index 8c5c5c48d5..1ba56942f4 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
@@ -18,8 +18,8 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\PaymentBundle\Provider\PaymentRequestCommandProvider">
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\Checker\PaymentRequestDuplicationCheckerInterface" />
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProvider">
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface" />
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="factory" />
         </service>
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
index c4b179aaf9..dfc0ec5120 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
@@ -25,13 +25,3 @@ sylius_payum:
             stripe_checkout:
                 - 'sylius'
                 - 'sylius_stripe_checkout'
-
-framework:
-    messenger:
-        buses:
-            sylius.event_bus:
-                default_middleware: allow_no_handlers
-            sylius.command_bus:
-                middleware:
-                    - 'validation'
-                    - 'doctrine_transaction'
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index 7a2c489c45..a8a5f3cbeb 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -13,11 +13,7 @@
 
 <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">
     <imports>
-        <import resource="services/checker.xml" />
-        <import resource="services/command_dispatcher.xml" />
         <import resource="services/form.xml" />
-        <import resource="services/offline.xml" />
-        <import resource="services/provider.xml" />
     </imports>
 
     <parameters>
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
index 551bfa876f..6ec8ebce9d 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -88,20 +88,5 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
         }
 
         $container->prependExtensionConfig('sylius_payment', ['gateways' => $gateways]);
-
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config/integrations/sylius_payment'));
-        $loader->load('services.xml');
-
-        if (class_exists(OfflineGatewayFactory::class)) {
-            $loader->load('offline.xml');
-        }
-
-        if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) {
-            $loader->load('paypal_express_checkout.xml');
-        }
-
-        if (class_exists(StripeCheckoutGatewayFactory::class)) {
-            $loader->load('stripe.xml');
-        }
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/services.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/services.xml
deleted file mode 100644
index 160ea0255f..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/sylius_payment/services.xml
+++ /dev/null
@@ -1,86 +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\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProvider">
-            <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="doctrine.orm.entity_manager" />
-        </service>
-
-        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessor">
-            <argument type="service" id="payum" />
-            <argument type="service" id="sylius.payment_request.payum.context" />
-        </service>
-
-        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenRequestProcessorInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenRequestProcessor">
-            <argument type="service" id="sylius.custom_factory.payment_request" />
-            <argument type="service" id="Sylius\Bundle\PaymentBundle\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
-        </service>
-
-        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" class="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactory">
-            <argument type="service" id="payum" />
-        </service>
-
-        <service id="Sylius\Bundle\PayumBundle\CommandHandler\TokenPaymentRequestHandler" abstract="true">
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Factory\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\AfterTokenRequestProcessorInterface" />
-        </service>
-
-        <service id="sylius.payment_request.payum.capture" parent="Sylius\Bundle\PayumBundle\CommandHandler\TokenPaymentRequestHandler">
-            <argument type="service" id="sylius.factory.payum_capture" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\PayumBundle\Command\CapturePaymentRequest" />
-        </service>
-
-        <service id="sylius.payment_request.payum.authorize" parent="Sylius\Bundle\PayumBundle\CommandHandler\TokenPaymentRequestHandler">
-            <argument type="service" id="sylius.factory.payum_authorize" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\PayumBundle\Command\AuthorizePaymentRequest" />
-        </service>
-
-        <service id="Sylius\Bundle\PayumBundle\CommandHandler\ModelPaymentRequestHandler" abstract="true">
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
-            <argument type="service" id="Sylius\Bundle\PayumBundle\PaymentRequest\Processor\RequestProcessorInterface" />
-        </service>
-
-        <service id="sylius.payment_request.payum.status" parent="Sylius\Bundle\PayumBundle\CommandHandler\ModelPaymentRequestHandler">
-            <argument type="service" id="sylius.factory.payum_get_status_action" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\PayumBundle\Command\StatusPaymentRequest" />
-        </service>
-
-        <service id="sylius.payment_request.payum.context" class="Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContext" />
-        <service id="Sylius\Bundle\PayumBundle\PaymentRequest\PaymentRequestContextInterface" alias="sylius.payment_request.payum.context" />
-
-        <service id="sylius_payment_request.action.get_http_request" class="Sylius\Bundle\PayumBundle\Action\PaymentRequest\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\PayumBundle\Action\PaymentRequest\SyliusRenderTemplateAction">
-            <argument type="service" id="sylius.payment_request.payum.context" />
-
-            <tag name="payum.action" all="true" prepend="true" />
-        </service>
-
-    </services>
-</container>
diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json
index 141a96db12..792d1993a0 100644
--- a/src/Sylius/Bundle/PayumBundle/composer.json
+++ b/src/Sylius/Bundle/PayumBundle/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "sylius/payum-bundle",
     "type": "symfony-bundle",
-    "description": "CommandHandler integration for Symfony e-commerce applications.",
+    "description": "Payum integration for Symfony e-commerce applications.",
     "keywords": [
         "payments",
         "payment",

From 7e9a9ae00538c05f5386a547f0a193e567d9f469 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 7 Feb 2024 14:59:55 +0100
Subject: [PATCH 031/200] Move folder Provider to CommandProvider to better
 reflect it's a messenger command

---
 .../PaymentRequestCommandDispatcher.php          |  2 +-
 .../CapturePaymentRequestCommandProvider.php     |  4 ++--
 .../StatusPaymentRequestCommandProvider.php      |  4 ++--
 .../PaymentRequestCommandProvider.php            |  2 +-
 .../PaymentRequestCommandProviderInterface.php   |  2 +-
 .../PaymentRequestTypeCommandProvider.php        |  2 +-
 .../AuthorizeCommandProvider.php                 |  4 ++--
 .../CaptureCommandProvider.php                   |  4 ++--
 .../StatusCommandProvider.php                    |  4 ++--
 .../services/integrations/payum/offline.xml      | 12 ++++++------
 .../payum/paypal_express_checkout.xml            | 16 ++++++++--------
 .../services/integrations/payum/stripe.xml       | 16 ++++++++--------
 .../payment_request/command_dispatcher.xml       |  2 +-
 .../config/services/payment_request/offline.xml  |  6 +++---
 .../config/services/payment_request/provider.xml |  2 +-
 15 files changed, 41 insertions(+), 41 deletions(-)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Provider => CommandProvider}/Offline/CapturePaymentRequestCommandProvider.php (82%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Provider => CommandProvider}/Offline/StatusPaymentRequestCommandProvider.php (82%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Provider => CommandProvider}/PaymentRequestCommandProvider.php (96%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Provider => CommandProvider}/PaymentRequestCommandProviderInterface.php (88%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Provider => CommandProvider}/PaymentRequestTypeCommandProvider.php (94%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/{Provider => CommandProvider}/AuthorizeCommandProvider.php (82%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/{Provider => CommandProvider}/CaptureCommandProvider.php (82%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/{Provider => CommandProvider}/StatusCommandProvider.php (82%)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php
index 4332579230..68e08b13d2 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher;
 
-use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/CapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
similarity index 82%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/CapturePaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
index 996ddb80a1..55a4fb78ee 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/CapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider\Offline;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class CapturePaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/StatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
similarity index 82%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/StatusPaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
index 9fbcb6e302..cda3b2ab56 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/Offline/StatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider\Offline;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\StatusPaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class StatusPaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
similarity index 96%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
index 3216056806..55b1a212d7 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProviderInterface.php
similarity index 88%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProviderInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProviderInterface.php
index bfde835869..4aa7d60632 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestCommandProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProviderInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestTypeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
similarity index 94%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestTypeCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
index fba8f6d579..a0dbc1804b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestTypeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/AuthorizeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php
similarity index 82%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/AuthorizeCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php
index e5f44cbc16..236ebf8cd8 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/AuthorizeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\AuthorizePaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class AuthorizeCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/CaptureCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php
similarity index 82%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/CaptureCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php
index 6073558ead..98e03104fc 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/CaptureCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\CapturePaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class CaptureCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/StatusCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php
similarity index 82%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/StatusCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php
index cf202363bc..3f0065d397 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/StatusCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\StatusPaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class StatusCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
index c19b3b6ff6..699e402815 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
@@ -18,17 +18,17 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestTypeCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.offline" index-by="type" />
+        <service id="sylius.payment_request.payum.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.payum.command_provider.offline" index-by="type" />
             <tag name="sylius.payment_request.command_provider" factory="offline" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\CaptureCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.offline" type="capture" />
+        <service id="sylius.payment_request.payum.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.offline" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\StatusCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.offline" type="status" />
+        <service id="sylius.payment_request.payum.command_provider.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.offline" type="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
index c66b2a89a6..d631286bb5 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
@@ -18,21 +18,21 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestTypeCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.paypal_express_checkout" index-by="type" />
+        <service id="sylius.payment_request.payum.command_provider.paypal_express_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.payum.command_provider.paypal_express_checkout" index-by="type" />
             <tag name="sylius.payment_request.command_provider" factory="paypal_express_checkout" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\CaptureCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="capture" />
+        <service id="sylius.payment_request.payum.command_provider.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.paypal_express_checkout" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="authorize" />
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\AuthorizeCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.paypal_express_checkout" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\StatusCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="status" />
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.paypal_express_checkout" type="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
index 91a5a52b57..7ca3dac0f3 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
@@ -18,21 +18,21 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.payum.stripe" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestTypeCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.stripe" index-by="type" />
+        <service id="sylius.payment_request.payum.command_provider.stripe" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.payum.command_provider.stripe" index-by="type" />
             <tag name="sylius.payment_request.command_provider" factory="stripe" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\CaptureCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe" type="capture" />
+        <service id="sylius.payment_request.payum.command_provider.stripe.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.stripe" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe" type="authorize" />
+        <service id="sylius.payment_request.payum.command_provider.stripe.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\AuthorizeCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.stripe" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.stripe.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\StatusCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe" type="status" />
+        <service id="sylius.payment_request.payum.command_provider.stripe.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.stripe" type="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
index 50fda42a8d..81604384f2 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
@@ -20,7 +20,7 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcher">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface" />
             <argument type="service" id="sylius.command_bus" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
index 75ec387865..68902ecbdf 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
@@ -18,16 +18,16 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="type" />
             <tag name="sylius.payment_request.command_provider" factory="offline" priority="-100" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\Offline\CapturePaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline\CapturePaymentRequestCommandProvider">
             <tag name="sylius.payment_request.command_provider.offline" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\Offline\StatusPaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline\StatusPaymentRequestCommandProvider">
             <tag name="sylius.payment_request.command_provider.offline" type="status" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
index 1ba56942f4..6f7b7aae29 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestCommandProvider">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProvider">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface" />
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="factory" />
         </service>

From b5d9ca230269224fe8133ade4b09c9a7f989224c Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 7 Feb 2024 15:02:40 +0100
Subject: [PATCH 032/200] Switch to new Sylius prefix

---
 .../config/api_resources/PaymentRequest.xml   | 12 ++--
 .../Commands/Payment/AddPaymentRequest.xml    |  8 +--
 .../Commands/Payment/UpdatePaymentRequest.xml |  2 +-
 .../config/serialization/PaymentRequest.xml   | 72 +++++++++----------
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
index d9a548c385..8203b85c8d 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -30,7 +30,7 @@
                     <attribute>sylius.api.search_payment_request_filter</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">admin:payment_request:show</attribute>
+                    <attribute name="groups">sylius:admin:payment_request:show</attribute>
                 </attribute>
             </collectionOperation>
 
@@ -40,10 +40,10 @@
                 <attribute name="messenger">input</attribute>
                 <attribute name="input">Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest</attribute>
                 <attribute name="denormalization_context">
-                    <attribute name="groups">shop:payment_request:create</attribute>
+                    <attribute name="groups">sylius:shop:payment_request:create</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:payment_request:show</attribute>
+                    <attribute name="groups">sylius:shop:payment_request:show</attribute>
                 </attribute>
             </collectionOperation>
         </collectionOperations>
@@ -53,7 +53,7 @@
                 <attribute name="method">GET</attribute>
                 <attribute name="path">/shop/payment-requests/{hash}</attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:payment_request:show</attribute>
+                    <attribute name="groups">sylius:shop:payment_request:show</attribute>
                 </attribute>
             </itemOperation>
 
@@ -63,11 +63,11 @@
                 <attribute name="messenger">input</attribute>
                 <attribute name="input">Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest</attribute>
                 <attribute name="denormalization_context">
-                    <attribute name="groups">shop:payment_request:update</attribute>
+                    <attribute name="groups">sylius:shop:payment_request:update</attribute>
                 </attribute>
                 <attribute name="normalization_context">
                     <attribute name="groups">
-                        <attribute>shop:payment_request:show</attribute>
+                        <attribute>sylius:shop:payment_request:show</attribute>
                     </attribute>
                 </attribute>
             </itemOperation>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
index 62ce8a8c04..a0e768f6fd 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
@@ -17,16 +17,16 @@
 >
     <class name="Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest">
         <attribute name="paymentId">
-            <group>shop:payment_request:create</group>
+            <group>sylius:shop:payment_request:create</group>
         </attribute>
         <attribute name="paymentMethodCode">
-            <group>shop:payment_request:create</group>
+            <group>sylius:shop:payment_request:create</group>
         </attribute>
         <attribute name="type">
-            <group>shop:payment_request:create</group>
+            <group>sylius:shop:payment_request:create</group>
         </attribute>
         <attribute name="requestPayload">
-            <group>shop:payment_request:create</group>
+            <group>sylius:shop:payment_request:create</group>
         </attribute>
     </class>
 </serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml
index 65bd2e1abc..141a328f66 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml
@@ -17,7 +17,7 @@
 >
     <class name="Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest">
         <attribute name="requestPayload">
-            <group>shop:payment_request:update</group>
+            <group>sylius:shop:payment_request:update</group>
         </attribute>
     </class>
 </serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
index 009c851f2f..fc41ca9a2e 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -17,58 +17,58 @@
 >
     <class name="Sylius\Component\Core\Model\PaymentRequest">
         <attribute name="hash">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="payment">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="method">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="type">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="state">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="requestPayload">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="responseData">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="createdAt">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="updatedAt">
-            <group>admin:payment_request:show</group>
-            <group>admin:payment_request:index</group>
-            <group>shop:payment_request:show</group>
-            <group>shop:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
+            <group>sylius:admin:payment_request:index</group>
+            <group>sylius:shop:payment_request:show</group>
+            <group>sylius:shop:payment_request:index</group>
         </attribute>
     </class>
 </serializer>

From cf4acde282699404776134a5541c7848675cbbfe Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 21 Feb 2024 17:16:24 +0100
Subject: [PATCH 033/200] Remove no more needed method

---
 .../Applicator/PaymentStateMachineTransitionApplicator.php | 7 -------
 .../PaymentStateMachineTransitionApplicatorInterface.php   | 2 --
 2 files changed, 9 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicator.php b/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicator.php
index b40c357097..ccbe66f3f9 100644
--- a/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicator.php
+++ b/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicator.php
@@ -44,13 +44,6 @@ final class PaymentStateMachineTransitionApplicator implements PaymentStateMachi
         return $data;
     }
 
-    public function process(PaymentInterface $data): PaymentInterface
-    {
-        $this->applyTransition($data, PaymentTransitions::TRANSITION_PROCESS);
-
-        return $data;
-    }
-
     private function applyTransition(PaymentInterface $payment, string $transition): void
     {
         $stateMachine = $this->getStateMachine();
diff --git a/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicatorInterface.php b/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicatorInterface.php
index aa794e7fc7..4193a7f7f4 100644
--- a/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicatorInterface.php
+++ b/src/Sylius/Bundle/ApiBundle/Applicator/PaymentStateMachineTransitionApplicatorInterface.php
@@ -18,6 +18,4 @@ use Sylius\Component\Payment\Model\PaymentInterface;
 interface PaymentStateMachineTransitionApplicatorInterface
 {
     public function complete(PaymentInterface $data): PaymentInterface;
-
-    public function process(PaymentInterface $data): PaymentInterface;
 }

From ad3d6db21c664c4c9b4732f2c18e9f06a76a9516 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:42:03 +0100
Subject: [PATCH 034/200] Remove messenger changes

---
 .../CoreBundle/Migrations/Version20240203222417.php  | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
index 6f4b946d5a..3f860852ec 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
@@ -32,12 +32,6 @@ final class Version20240203222417 extends AbstractPostgreSQLMigration
         $this->addSql('COMMENT ON COLUMN sylius_payment_request.request_payload IS \'(DC2Type:object)\'');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE messenger_messages ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE messenger_messages ALTER available_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE messenger_messages ALTER delivered_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('COMMENT ON COLUMN messenger_messages.created_at IS \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN messenger_messages.available_at IS \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN messenger_messages.delivered_at IS \'(DC2Type:datetime_immutable)\'');
     }
 
     public function down(Schema $schema): void
@@ -45,11 +39,5 @@ final class Version20240203222417 extends AbstractPostgreSQLMigration
         $this->addSql('ALTER TABLE sylius_payment_request DROP CONSTRAINT FK_86D904B19883967');
         $this->addSql('ALTER TABLE sylius_payment_request DROP CONSTRAINT FK_86D904B4C3A3BB');
         $this->addSql('DROP TABLE sylius_payment_request');
-        $this->addSql('ALTER TABLE messenger_messages ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE messenger_messages ALTER available_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE messenger_messages ALTER delivered_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('COMMENT ON COLUMN messenger_messages.created_at IS NULL');
-        $this->addSql('COMMENT ON COLUMN messenger_messages.available_at IS NULL');
-        $this->addSql('COMMENT ON COLUMN messenger_messages.delivered_at IS NULL');
     }
 }

From 6f4101ded3811ca9a2e86f2cd4da0b3e3ccc0379 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 18:22:28 +0100
Subject: [PATCH 035/200] Wrong factory name

---
 .../services/integrations/payum/stripe.xml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
index 7ca3dac0f3..88adaa9e5c 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
@@ -18,21 +18,21 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.payum.command_provider.stripe" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.payum.command_provider.stripe" index-by="type" />
-            <tag name="sylius.payment_request.command_provider" factory="stripe" />
+        <service id="sylius.payment_request.payum.command_provider.stripe_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.payum.command_provider.stripe_checkout" index-by="type" />
+            <tag name="sylius.payment_request.command_provider" factory="stripe_checkout" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.stripe.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.stripe" type="capture" />
+        <service id="sylius.payment_request.payum.command_provider.stripe_checkout.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.stripe_checkout" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.stripe.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.stripe" type="authorize" />
+        <service id="sylius.payment_request.payum.command_provider.stripe_checkout.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\AuthorizeCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.stripe_checkout" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.stripe.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.stripe" type="status" />
+        <service id="sylius.payment_request.payum.command_provider.stripe_checkout.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
+            <tag name="sylius.payment_request.payum.command_provider.stripe_checkout" type="status" />
         </service>
 
     </services>

From 475250ca158b7acba3d2919d6ed8935c8f4a3b34 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 18:28:31 +0100
Subject: [PATCH 036/200] Switch to Symfony uid

---
 composer.json                                 |  3 +--
 config/packages/uid.yaml                      |  4 ++++
 .../Migrations/Version20231106190918.php      |  2 +-
 .../Resources/config/app/config.yml           |  8 -------
 .../doctrine/model/PaymentRequest.orm.xml     |  2 +-
 src/Sylius/Bundle/PaymentBundle/composer.json |  4 +---
 .../Payment/Model/PaymentRequest.php          |  7 +++---
 .../Payment/Model/PaymentRequestInterface.php |  3 ++-
 src/Sylius/Component/Payment/composer.json    |  3 ++-
 symfony.lock                                  | 24 +++++++++----------
 10 files changed, 28 insertions(+), 32 deletions(-)
 create mode 100644 config/packages/uid.yaml

diff --git a/composer.json b/composer.json
index 473e9dff0c..bb1e4bdd96 100644
--- a/composer.json
+++ b/composer.json
@@ -70,8 +70,6 @@
         "psr/http-client": "^1.0",
         "psr/http-message": "^1.0",
         "psr/log": "^2.0",
-        "ramsey/uuid": "^4.0",
-        "ramsey/uuid-doctrine": "^2.0",
         "sonata-project/block-bundle": "^4.2 || ^5.0",
         "stof/doctrine-extensions-bundle": "^1.4",
         "sylius-labs/association-hydrator": "^1.1 || ^1.2",
@@ -133,6 +131,7 @@
         "symfony/translation": "^6.4.0",
         "symfony/translation-contracts": "^2.5.2",
         "symfony/twig-bundle": "^6.4.0",
+        "symfony/uid": "^6.4.0",
         "symfony/ux-autocomplete": "^2.17",
         "symfony/ux-live-component": "^2.17",
         "symfony/ux-twig-component": "^2.17",
diff --git a/config/packages/uid.yaml b/config/packages/uid.yaml
new file mode 100644
index 0000000000..01520944f5
--- /dev/null
+++ b/config/packages/uid.yaml
@@ -0,0 +1,4 @@
+framework:
+    uid:
+        default_uuid_version: 7
+        time_based_uuid_version: 7
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
index ee601d69b5..2a5e1ae996 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
@@ -25,7 +25,7 @@ final class Version20231106190918 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE sylius_payment_request (hash CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, request_payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE sylius_payment_request (hash BINARY(16) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, request_payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id)');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id)');
     }
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
index dfc0ec5120..3615048869 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
@@ -1,14 +1,6 @@
 # This file is part of the Sylius package.
 # (c) Sylius Sp. z o.o.
 
-parameters:
-    sylius.uuid_type: Ramsey\Uuid\Doctrine\UuidType
-
-doctrine:
-    dbal:
-        types:
-            uuid: "%sylius.uuid_type%"
-
 jms_serializer:
     metadata:
         directories:
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index 7617b94729..7fbb85b2c4 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -17,7 +17,7 @@
     <mapped-superclass name="Sylius\Component\Payment\Model\PaymentRequest" table="sylius_payment_request">
         <id name="hash" column="hash" type="uuid">
             <generator strategy="CUSTOM" />
-            <custom-id-generator class="Ramsey\Uuid\Doctrine\UuidGenerator"/>
+            <custom-id-generator class="doctrine.uuid_generator"/>
         </id>
 
         <many-to-one field="method" target-entity="Sylius\Component\Payment\Model\PaymentMethodInterface">
diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json
index c2a03d9159..dce6337dad 100644
--- a/src/Sylius/Bundle/PaymentBundle/composer.json
+++ b/src/Sylius/Bundle/PaymentBundle/composer.json
@@ -29,9 +29,7 @@
         "php": "^8.2",
         "sylius/payment": "^2.0",
         "sylius/resource-bundle": "^1.10",
-        "symfony/framework-bundle": "^6.4.1",
-        "symfony/messenger": "^6.4.0",
-        "ramsey/uuid-doctrine": "^2.0"
+        "symfony/framework-bundle": "^6.4.1"
     },
     "conflict": {
         "doctrine/orm": "2.15.2"
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index 2880153b3f..b0da94ce9e 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -14,12 +14,13 @@ declare(strict_types=1);
 namespace Sylius\Component\Payment\Model;
 
 use Sylius\Component\Resource\Model\TimestampableTrait;
+use Symfony\Component\Uid\Uuid;
 
 class PaymentRequest implements PaymentRequestInterface
 {
     use TimestampableTrait;
 
-    protected ?string $hash = null;
+    protected ?Uuid $hash = null;
 
     protected ?PaymentMethodInterface $method = null;
 
@@ -40,10 +41,10 @@ class PaymentRequest implements PaymentRequestInterface
 
     public function getId(): ?string
     {
-        return $this->getHash();
+        return $this->getHash()?->toBinary();
     }
 
-    public function getHash(): ?string
+    public function getHash(): ?Uuid
     {
         return $this->hash;
     }
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index 554d488f94..d9e35cb3f9 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -15,6 +15,7 @@ namespace Sylius\Component\Payment\Model;
 
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Sylius\Component\Resource\Model\TimestampableInterface;
+use Symfony\Component\Uid\Uuid;
 
 interface PaymentRequestInterface extends TimestampableInterface, ResourceInterface
 {
@@ -40,7 +41,7 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public const DATA_TYPE_PAYOUT = 'payout';
 
-    public function getHash(): ?string;
+    public function getHash(): ?Uuid;
 
     public function getMethod(): ?PaymentMethodInterface;
 
diff --git a/src/Sylius/Component/Payment/composer.json b/src/Sylius/Component/Payment/composer.json
index 2c6b5fae15..0ee205ff8e 100644
--- a/src/Sylius/Component/Payment/composer.json
+++ b/src/Sylius/Component/Payment/composer.json
@@ -28,7 +28,8 @@
     "require": {
         "php": "^8.2",
         "sylius/registry": "^1.6",
-        "sylius/resource": "^1.10"
+        "sylius/resource": "^1.10",
+        "symfony/uid": "^5.4.21 || ^6.4"
     },
     "require-dev": {
         "phpspec/phpspec": "^7.2"
diff --git a/symfony.lock b/symfony.lock
index 2755d00962..a9dc54b277 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -466,18 +466,6 @@
     "ralouphie/getallheaders": {
         "version": "3.0.3"
     },
-    "ramsey/uuid": {
-        "version": "3.8.0"
-    },
-    "ramsey/uuid-doctrine": {
-        "version": "2.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes-contrib",
-            "branch": "main",
-            "version": "1.3",
-            "ref": "471aed0fbf5620b8d7f92b7a5ebbbf6c0945c27a"
-        }
-    },
     "rector/rector": {
         "version": "0.11.52"
     },
@@ -879,6 +867,18 @@
             "templates/base.html.twig"
         ]
     },
+    "symfony/uid": {
+        "version": "6.4",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "6.2",
+            "ref": "d294ad4add3e15d7eb1bae0221588ca89b38e558"
+        },
+        "files": [
+            "config/packages/uid.yaml"
+        ]
+    },
     "symfony/ux-autocomplete": {
         "version": "2.9999999",
         "recipe": {

From 30d3af2d13e825629e826c265a2408c1ade4f53c Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 18:31:05 +0100
Subject: [PATCH 037/200] Add a trait to avoid code duplicates

---
 .../Command/Offline/CapturePaymentRequest.php | 15 +++-------
 .../Command/Offline/StatusPaymentRequest.php  | 15 +++-------
 .../PaymentRequestHashAwareInterface.php      |  4 +--
 .../Command/PaymentRequestHashAwareTrait.php  | 29 +++++++++++++++++++
 .../Payum/Command/AuthorizePaymentRequest.php | 15 +++-------
 .../Payum/Command/CapturePaymentRequest.php   | 15 +++-------
 .../Payum/Command/StatusPaymentRequest.php    | 15 +++-------
 7 files changed, 51 insertions(+), 57 deletions(-)
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareTrait.php

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/CapturePaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/CapturePaymentRequest.php
index 1921179890..cac95cccc7 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/CapturePaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/CapturePaymentRequest.php
@@ -14,21 +14,14 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
 
 class CapturePaymentRequest implements PaymentRequestHashAwareInterface
 {
+    use PaymentRequestHashAwareTrait;
+
     public function __construct(
-        protected string $hash,
+        protected ?string $hash,
     ) {
     }
-
-    public function getHash(): string
-    {
-        return $this->hash;
-    }
-
-    public function setHash(string $hash): void
-    {
-        $this->hash = $hash;
-    }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
index ef2b56900c..b934dca71b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
@@ -14,21 +14,14 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
 
 class StatusPaymentRequest implements PaymentRequestHashAwareInterface
 {
+    use PaymentRequestHashAwareTrait;
+
     public function __construct(
-        protected string $hash,
+        protected ?string $hash,
     ) {
     }
-
-    public function getHash(): string
-    {
-        return $this->hash;
-    }
-
-    public function setHash(string $hash): void
-    {
-        $this->hash = $hash;
-    }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
index e821b42819..1d91518491 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
@@ -16,7 +16,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command;
 /** @experimental */
 interface PaymentRequestHashAwareInterface
 {
-    public function getHash(): string;
+    public function getHash(): ?string;
 
-    public function setHash(string $hash): void;
+    public function setHash(?string $hash): void;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareTrait.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareTrait.php
new file mode 100644
index 0000000000..b80bc98654
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareTrait.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command;
+
+trait PaymentRequestHashAwareTrait
+{
+    protected ?string $hash;
+
+    public function getHash(): ?string
+    {
+        return $this->hash;
+    }
+
+    public function setHash(?string $hash): void
+    {
+        $this->hash = $hash;
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php
index efd762eb09..e7d7d955ac 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php
@@ -14,21 +14,14 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
 
 class AuthorizePaymentRequest implements PaymentRequestHashAwareInterface
 {
+    use PaymentRequestHashAwareTrait;
+
     public function __construct(
-        protected string $hash,
+        protected ?string $hash,
     ) {
     }
-
-    public function getHash(): string
-    {
-        return $this->hash;
-    }
-
-    public function setHash(string $hash): void
-    {
-        $this->hash = $hash;
-    }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php
index 02d46df93c..b6dc938a55 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php
@@ -14,21 +14,14 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
 
 class CapturePaymentRequest implements PaymentRequestHashAwareInterface
 {
+    use PaymentRequestHashAwareTrait;
+
     public function __construct(
-        protected string $hash,
+        protected ?string $hash,
     ) {
     }
-
-    public function getHash(): string
-    {
-        return $this->hash;
-    }
-
-    public function setHash(string $hash): void
-    {
-        $this->hash = $hash;
-    }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php
index 00797f6150..c22d7e11cf 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php
@@ -14,21 +14,14 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
 
 class StatusPaymentRequest implements PaymentRequestHashAwareInterface
 {
+    use PaymentRequestHashAwareTrait;
+
     public function __construct(
-        protected string $hash,
+        protected ?string $hash,
     ) {
     }
-
-    public function getHash(): string
-    {
-        return $this->hash;
-    }
-
-    public function setHash(string $hash): void
-    {
-        $this->hash = $hash;
-    }
 }

From fe5ad0827601045bb6f89b6fc8c4ea0528dc97f1 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 18:31:40 +0100
Subject: [PATCH 038/200] Required changes to use Symfony uid component

---
 ...entRequestHashAwareInputCommandDataTransformer.php |  7 ++++++-
 .../Offline/CapturePaymentRequestHandler.php          |  5 ++++-
 .../Offline/CapturePaymentRequestCommandProvider.php  |  2 +-
 .../Offline/StatusPaymentRequestCommandProvider.php   |  2 +-
 .../CommandProvider/PaymentRequestCommandProvider.php |  6 ++----
 .../PaymentRequestTypeCommandProvider.php             | 11 +++--------
 .../CommandHandler/ModelPaymentRequestHandler.php     |  5 ++++-
 .../CommandHandler/TokenPaymentRequestHandler.php     |  5 ++++-
 .../CommandProvider/AuthorizeCommandProvider.php      |  2 +-
 .../Payum/CommandProvider/CaptureCommandProvider.php  |  2 +-
 .../Payum/CommandProvider/StatusCommandProvider.php   |  2 +-
 .../Doctrine/ORM/PaymentRequestRepository.php         |  3 ++-
 12 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
index 2b2591abc4..4ebeecf733 100644
--- a/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
+++ b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
@@ -24,7 +24,12 @@ final class PaymentRequestHashAwareInputCommandDataTransformer implements Comman
         /** @var PaymentRequestInterface $paymentRequest */
         $paymentRequest = $context['object_to_populate'];
 
-        $object->setHash($paymentRequest->getHash());
+        $hash = $paymentRequest->getHash();
+        if (null === $hash) {
+            return $object;
+        }
+
+        $object->setHash($hash->toBinary());
 
         return $object;
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index 26750e90e4..e8505855fc 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -35,7 +35,10 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(CapturePaymentRequest $capturePaymentRequest): void
     {
-        $paymentRequest = $this->paymentRequestRepository->findOneByHash($capturePaymentRequest->getHash());
+        $hash = $capturePaymentRequest->getHash();
+        Assert::notNull($hash, 'The payment request hash cannot be null.');
+
+        $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
         Assert::notNull($paymentRequest);
 
         /** @var PaymentMethodInterface|null $paymentMethod */
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
index 55a4fb78ee..36169787a9 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
@@ -26,6 +26,6 @@ final class CapturePaymentRequestCommandProvider implements PaymentRequestComman
 
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        return new CapturePaymentRequest($paymentRequest->getHash());
+        return new CapturePaymentRequest($paymentRequest->getHash()?->toBinary());
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
index cda3b2ab56..39fbce1ca1 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
@@ -26,6 +26,6 @@ final class StatusPaymentRequestCommandProvider implements PaymentRequestCommand
 
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        return new StatusPaymentRequest($paymentRequest->getHash());
+        return new StatusPaymentRequest($paymentRequest->getHash()?->toBinary());
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
index 55b1a212d7..4ccf6cba73 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
@@ -23,6 +23,7 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
 {
     public function __construct(
         private PaymentRequestDuplicationCheckerInterface $paymentRequestDuplicationChecker,
+        /** @var ServiceProviderInterface<PaymentRequestCommandProviderInterface> */
         private ServiceProviderInterface $locator,
     ) {
     }
@@ -53,9 +54,6 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
         Assert::notNull($gatewayConfig);
         $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
 
-        /** @var PaymentRequestCommandProviderInterface $provider */
-        $provider = $this->locator->get($factoryName);
-
-        return $provider;
+        return $this->locator->get($factoryName);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
index a0dbc1804b..c0b548f70d 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
@@ -19,23 +19,18 @@ use Symfony\Contracts\Service\ServiceProviderInterface;
 final class PaymentRequestTypeCommandProvider implements PaymentRequestCommandProviderInterface
 {
     public function __construct(
+        /** @var ServiceProviderInterface<PaymentRequestCommandProviderInterface> */
         private ServiceProviderInterface $locator,
     ) {
     }
 
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        /** @var PaymentRequestCommandProviderInterface $provider */
-        $provider = $this->locator->get($paymentRequest->getType());
-
-        return $provider->supports($paymentRequest);
+        return $this->locator->get($paymentRequest->getType())->supports($paymentRequest);
     }
 
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        /** @var PaymentRequestCommandProviderInterface $provider */
-        $provider = $this->locator->get($paymentRequest->getType());
-
-        return $provider->provide($paymentRequest);
+        return $this->locator->get($paymentRequest->getType())->provide($paymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
index bbf1f3d17b..2339b15dc2 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
@@ -32,7 +32,10 @@ final class ModelPaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
-        $paymentRequest = $this->paymentRequestProvider->provideFromHash($command->getHash());
+        $hash = $command->getHash();
+        Assert::notNull($hash, 'The payment request hash cannot be null.');
+
+        $paymentRequest = $this->paymentRequestProvider->provideFromHash($hash);
         Assert::notNull($paymentRequest);
 
         $payment = $paymentRequest->getPayment();
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php
index 81df149ca1..cbc794333f 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php
@@ -35,7 +35,10 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
-        $paymentRequest = $this->paymentRequestProvider->provideFromHash($command->getHash());
+        $hash = $command->getHash();
+        Assert::notNull($hash, 'The payment request hash cannot be null.');
+
+        $paymentRequest = $this->paymentRequestProvider->provideFromHash($hash);
         Assert::notNull($paymentRequest);
 
         $token = $this->payumTokenFactory->createNew($paymentRequest);
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php
index 236ebf8cd8..44ebfb6a6b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php
@@ -26,6 +26,6 @@ final class AuthorizeCommandProvider implements PaymentRequestCommandProviderInt
 
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        return new AuthorizePaymentRequest($paymentRequest->getHash());
+        return new AuthorizePaymentRequest($paymentRequest->getHash()?->toBinary());
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php
index 98e03104fc..81876eaf4f 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php
@@ -26,6 +26,6 @@ final class CaptureCommandProvider implements PaymentRequestCommandProviderInter
 
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        return new CapturePaymentRequest($paymentRequest->getHash());
+        return new CapturePaymentRequest($paymentRequest->getHash()?->toBinary());
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php
index 3f0065d397..16d3c7fd8b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php
@@ -26,6 +26,6 @@ final class StatusCommandProvider implements PaymentRequestCommandProviderInterf
 
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        return new StatusPaymentRequest($paymentRequest->getHash());
+        return new StatusPaymentRequest($paymentRequest->getHash()?->toBinary());
     }
 }
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index af750bf70f..71aad1bca2 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -16,6 +16,7 @@ namespace Sylius\Bundle\PaymentBundle\Doctrine\ORM;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Bridge\Doctrine\Types\UuidType;
 
 /**
  * @template T of PaymentRequestInterface
@@ -33,7 +34,7 @@ class PaymentRequestRepository extends EntityRepository implements PaymentReques
             ->andWhere('o.type = :type')
             ->andWhere('o.payment = :payment')
             ->andWhere('o.method = :method')
-            ->setParameter('paymentRequest', $paymentRequest)
+            ->setParameter('paymentRequest', $paymentRequest->getHash(), UuidType::NAME)
             ->setParameter('type', $paymentRequest->getType())
             ->setParameter('method', $paymentRequest->getMethod())
             ->setParameter('payment', $paymentRequest->getPayment())

From de668e900a715c5ed85381013017915d288e39aa Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 18:47:08 +0100
Subject: [PATCH 039/200] Symfony style error message

---
 .../CommandHandler/Payment/AddPaymentRequestHandler.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 3800b698b7..249988e148 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -51,14 +51,14 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
             'code' => $addPaymentRequest->getPaymentMethodCode(),
         ]);
         Assert::notNull($paymentMethod, sprintf(
-            'Payment method code "%s", can not be found!',
+            'Payment method (code "%s") not found.',
             $addPaymentRequest->getPaymentMethodCode(),
         ));
         /** @var PaymentInterface|null $payment */
         $payment = $this->paymentRepository->find($addPaymentRequest->getPaymentId());
         Assert::notNull(
             $payment,
-            sprintf('Payment ID "%s" can not be found!', $addPaymentRequest->getPaymentId()),
+            sprintf('Payment (id "%s") not found.', $addPaymentRequest->getPaymentId()),
         );
 
         $paymentRequest = $this->paymentRequestFactory->createWithPaymentAndPaymentMethod($payment, $paymentMethod);

From a6586bb25ed212df68bb1ee5050f7175f28ef2bb Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 19:19:24 +0100
Subject: [PATCH 040/200] Add clear assert message

---
 .../Payment/UpdatePaymentRequestHandler.php            |  4 ++--
 .../Offline/CapturePaymentRequestHandler.php           |  8 ++++----
 .../CommandHandler/ModelPaymentRequestHandler.php      | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 8d9f5129b2..28f59f4a47 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -32,10 +32,10 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
     public function __invoke(UpdatePaymentRequest $updatePaymentRequest): PaymentRequestInterface
     {
         $hash = $updatePaymentRequest->getHash();
-        Assert::notNull($hash);
+        Assert::notNull($hash, 'Payment request hash cannot be null.');
 
         $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
-        Assert::notNull($paymentRequest);
+        Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
 
         $paymentRequest->setRequestPayload($updatePaymentRequest->getRequestPayload());
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index e8505855fc..78d9da3436 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -36,17 +36,17 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
     public function __invoke(CapturePaymentRequest $capturePaymentRequest): void
     {
         $hash = $capturePaymentRequest->getHash();
-        Assert::notNull($hash, 'The payment request hash cannot be null.');
+        Assert::notNull($hash, 'Payment request hash cannot be null.');
 
         $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
-        Assert::notNull($paymentRequest);
+        Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
 
         /** @var PaymentMethodInterface|null $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod);
+        Assert::notNull($paymentMethod, 'Payment cannot be null.');
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig);
+        Assert::notNull($gatewayConfig, 'Payment method cannot be null.');
         $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
         Assert::eq($factoryName, self::FACTORY_NAME, 'Expected a factory name equal to %2$s. Got: %s');
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
index 2339b15dc2..78f4707dee 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
@@ -33,22 +33,22 @@ final class ModelPaymentRequestHandler implements MessageHandlerInterface
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
         $hash = $command->getHash();
-        Assert::notNull($hash, 'The payment request hash cannot be null.');
+        Assert::notNull($hash, 'Payment request hash cannot be null.');
 
         $paymentRequest = $this->paymentRequestProvider->provideFromHash($hash);
-        Assert::notNull($paymentRequest);
+        Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
 
         $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment);
+        Assert::notNull($payment, 'Payment cannot be null.');
 
         $request = $this->factory->createNewWithModel($payment);
 
         /** @var PaymentMethodInterface|null $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod);
+        Assert::notNull($paymentMethod, 'Payment method cannot be null.');
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig);
+        Assert::notNull($gatewayConfig, 'Gateway config cannot be null.');
 
         $gatewayName = $gatewayConfig->getGatewayName();
 

From b56cc9474f659fbc421eaeadd6c3605fa07b01ee Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:00:02 +0100
Subject: [PATCH 041/200] Move Payum Command* to the upper level

---
 .../Payum}/AuthorizePaymentRequest.php        |  2 +-
 .../Payum}/CapturePaymentRequest.php          |  2 +-
 .../Payum}/StatusPaymentRequest.php           |  2 +-
 .../Payum}/ModelPaymentRequestHandler.php     |  2 +-
 .../Payum}/TokenPaymentRequestHandler.php     |  2 +-
 .../Payum}/AuthorizeCommandProvider.php       |  4 ++--
 .../Payum}/CaptureCommandProvider.php         |  4 ++--
 .../Payum}/StatusCommandProvider.php          |  4 ++--
 .../services/integrations/payum/offline.xml   | 14 ++++++-------
 .../payum/paypal_express_checkout.xml         | 10 +++++-----
 .../services/integrations/payum/stripe.xml    | 18 ++++++++---------
 .../services/payment_request/offline.xml      |  2 +-
 .../payment_request/payum/comman_handlers.xml | 20 +++++++++----------
 .../services/payment_request/provider.xml     |  2 +-
 14 files changed, 44 insertions(+), 44 deletions(-)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/Command => Command/Payum}/AuthorizePaymentRequest.php (90%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/Command => Command/Payum}/CapturePaymentRequest.php (90%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/Command => Command/Payum}/StatusPaymentRequest.php (90%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/CommandHandler => CommandHandler/Payum}/ModelPaymentRequestHandler.php (96%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/CommandHandler => CommandHandler/Payum}/TokenPaymentRequestHandler.php (96%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/CommandProvider => CommandProvider/Payum}/AuthorizeCommandProvider.php (86%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/CommandProvider => CommandProvider/Payum}/CaptureCommandProvider.php (86%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/CommandProvider => CommandProvider/Payum}/StatusCommandProvider.php (86%)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/AuthorizePaymentRequest.php
similarity index 90%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/AuthorizePaymentRequest.php
index e7d7d955ac..b9cddab3b7 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/AuthorizePaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/AuthorizePaymentRequest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/CapturePaymentRequest.php
similarity index 90%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/CapturePaymentRequest.php
index b6dc938a55..4148a5c29c 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/CapturePaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/CapturePaymentRequest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/StatusPaymentRequest.php
similarity index 90%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/StatusPaymentRequest.php
index c22d7e11cf..2293332dbe 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Command/StatusPaymentRequest.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Payum/StatusPaymentRequest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
similarity index 96%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
index 78f4707dee..62ba179f49 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
similarity index 96%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index cbc794333f..2e3a604530 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandHandler/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/AuthorizeCommandProvider.php
similarity index 86%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/AuthorizeCommandProvider.php
index 44ebfb6a6b..6433d1f218 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/AuthorizeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/AuthorizeCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\AuthorizePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\AuthorizePaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class AuthorizeCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/CaptureCommandProvider.php
similarity index 86%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/CaptureCommandProvider.php
index 81876eaf4f..72c77e200a 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/CaptureCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/CaptureCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\CapturePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\CapturePaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class CaptureCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/StatusCommandProvider.php
similarity index 86%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/StatusCommandProvider.php
index 16d3c7fd8b..3ec97d1d80 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/CommandProvider/StatusCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/StatusCommandProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\StatusPaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\StatusPaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class StatusCommandProvider implements PaymentRequestCommandProviderInterface
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
index 699e402815..d2f4b8db15 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
@@ -18,17 +18,17 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.payum.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.payum.command_provider.offline" index-by="type" />
-            <tag name="sylius.payment_request.command_provider" factory="offline" />
+        <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.offline" index-by="type" />
+            <tag name="sylius.payment_request.command_provider" gateway-factory="offline" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.offline" type="capture" />
+        <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.offline" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.offline" type="status" />
+        <service id="sylius.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\StatusCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.offline" type="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
index d631286bb5..ccdacd325b 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
@@ -19,20 +19,20 @@
         <defaults public="true" />
 
         <service id="sylius.payment_request.payum.command_provider.paypal_express_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.payum.command_provider.paypal_express_checkout" index-by="type" />
-            <tag name="sylius.payment_request.command_provider" factory="paypal_express_checkout" />
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.paypal_express_checkout" index-by="type" />
+            <tag name="sylius.payment_request.command_provider" gateway-factory="paypal_express_checkout" />
         </service>
 
         <service id="sylius.payment_request.payum.command_provider.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.paypal_express_checkout" type="capture" />
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="capture" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.paypal_express_checkout" type="authorize" />
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="authorize" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.paypal_express_checkout" type="status" />
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
index 88adaa9e5c..0e565a19af 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
@@ -18,21 +18,21 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.payum.command_provider.stripe_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.payum.command_provider.stripe_checkout" index-by="type" />
-            <tag name="sylius.payment_request.command_provider" factory="stripe_checkout" />
+        <service id="sylius.payment_request.command_provider.payum.stripe_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.stripe_checkout" index-by="type" />
+            <tag name="sylius.payment_request.command_provider" gateway-factory="stripe_checkout" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.stripe_checkout.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.stripe_checkout" type="capture" />
+        <service id="sylius.payment_request.command_provider.payum.stripe_checkout.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.stripe_checkout.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.stripe_checkout" type="authorize" />
+        <service id="sylius.payment_request.command_provider.payum.stripe_checkout.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\AuthorizeCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.stripe_checkout.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
-            <tag name="sylius.payment_request.payum.command_provider.stripe_checkout" type="status" />
+        <service id="sylius.payment_request.command_provider.payum.stripe_checkout.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\StatusCommandProvider">
+            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" type="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
index 68902ecbdf..d9e6255a39 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
@@ -20,7 +20,7 @@
 
         <service id="sylius.payment_request.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="type" />
-            <tag name="sylius.payment_request.command_provider" factory="offline" priority="-100" />
+            <tag name="sylius.payment_request.command_provider" gateway-factory="offline" priority="-100" />
         </service>
 
         <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline\CapturePaymentRequestCommandProvider">
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml
index 4d9b255b2f..5f98c40e37 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml
@@ -18,34 +18,34 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\TokenPaymentRequestHandler" abstract="true">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\AfterTokenRequestProcessorInterface" />
         </service>
 
-        <service id="sylius.payment_request.payum.capture" parent="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\TokenPaymentRequestHandler">
+        <service id="sylius.payment_request.payum.capture" parent="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler">
             <argument type="service" id="sylius.factory.payum_capture" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\CapturePaymentRequest" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\CapturePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\CapturePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\CapturePaymentRequest" />
         </service>
 
-        <service id="sylius.payment_request.payum.authorize" parent="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\TokenPaymentRequestHandler">
+        <service id="sylius.payment_request.payum.authorize" parent="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler">
             <argument type="service" id="sylius.factory.payum_authorize" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\AuthorizePaymentRequest" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\AuthorizePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\AuthorizePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\AuthorizePaymentRequest" />
         </service>
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\ModelPaymentRequestHandler" abstract="true">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface" />
         </service>
 
         <service id="sylius.payment_request.payum.status" parent="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\ModelPaymentRequestHandler">
             <argument type="service" id="sylius.factory.payum_get_status_action" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\StatusPaymentRequest" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Command\StatusPaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\StatusPaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\StatusPaymentRequest" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
index 6f7b7aae29..3a2d64158c 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
@@ -20,7 +20,7 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProvider">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface" />
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="factory" />
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="gateway-factory" />
         </service>
 
     </services>

From 76e3689fdc4025883ee453485e04f77e8acd5770 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:01:32 +0100
Subject: [PATCH 042/200] Fix wrong type

---
 .../Offline/StatusPaymentRequestCommandProvider.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
index 39fbce1ca1..d1dcc7c8c3 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
@@ -21,7 +21,7 @@ final class StatusPaymentRequestCommandProvider implements PaymentRequestCommand
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
+        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_STATUS;
     }
 
     public function provide(PaymentRequestInterface $paymentRequest): object

From 873b4f3c423a292eec1549a765fdc3674935f66d Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:05:01 +0100
Subject: [PATCH 043/200] Lower down default uuid version to 6 for Sf 5.4

---
 config/packages/uid.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/packages/uid.yaml b/config/packages/uid.yaml
index 01520944f5..31926f02ff 100644
--- a/config/packages/uid.yaml
+++ b/config/packages/uid.yaml
@@ -1,4 +1,4 @@
 framework:
     uid:
-        default_uuid_version: 7
-        time_based_uuid_version: 7
+        default_uuid_version: 6
+        time_based_uuid_version: 6

From f8d2ee9f087ef537fae2166bf25df038d8404836 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:35:20 +0100
Subject: [PATCH 044/200] Remaning classes to move around

---
 .../Offline/CapturePaymentRequestHandler.php  |  8 ++---
 .../Payum/ModelPaymentRequestHandler.php      |  2 +-
 .../Payum/TokenPaymentRequestHandler.php      |  4 +--
 .../AfterCaptureProcessor.php}                |  4 +--
 .../AfterCaptureProcessorInterface.php}       |  4 +--
 .../CaptureProcessor.php}                     |  4 +--
 .../CaptureProcessorInterface.php}            |  4 +--
 .../Payum}/AfterTokenRequestProcessor.php     |  2 +-
 .../AfterTokenRequestProcessorInterface.php   |  2 +-
 .../Payum}/RequestProcessor.php               |  2 +-
 .../Payum}/RequestProcessorInterface.php      |  2 +-
 .../config/services/payment_request.xml       |  1 +
 .../offline/command_handlers.xml              | 30 +++++++++++++++++++
 .../command_providers.xml}                    | 14 ---------
 .../payment_request/offline/processors.xml    | 28 +++++++++++++++++
 ...mman_handlers.xml => command_handlers.xml} |  8 ++---
 .../payment_request/payum/factory.xml         |  5 ----
 .../payment_request/payum/processors.xml      |  7 ++++-
 18 files changed, 88 insertions(+), 43 deletions(-)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/{AfterOfflineCaptureProcessor.php => Offline/AfterCaptureProcessor.php} (91%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/{AfterOfflineCaptureProcessorInterface.php => Offline/AfterCaptureProcessorInterface.php} (77%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/{OfflineCaptureProcessor.php => Offline/CaptureProcessor.php} (86%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/{OfflineCaptureProcessorInterface.php => Offline/CaptureProcessorInterface.php} (78%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/Processor => Processor/Payum}/AfterTokenRequestProcessor.php (95%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/Processor => Processor/Payum}/AfterTokenRequestProcessorInterface.php (88%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/Processor => Processor/Payum}/RequestProcessor.php (95%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Payum/Processor => Processor/Payum}/RequestProcessorInterface.php (87%)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
 rename src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/{offline.xml => offline/command_providers.xml} (57%)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
 rename src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/{comman_handlers.xml => command_handlers.xml} (92%)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index 78d9da3436..80a4a95771 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\AfterOfflineCaptureProcessorInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\OfflineCaptureProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
@@ -28,8 +28,8 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
 
     public function __construct(
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
-        private OfflineCaptureProcessorInterface $offlineCaptureProcessor,
-        private AfterOfflineCaptureProcessorInterface $afterOfflineCaptureProcessor,
+        private CaptureProcessorInterface         $offlineCaptureProcessor,
+        private AfterCaptureProcessorInterface    $afterOfflineCaptureProcessor,
     ) {
     }
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
index 62ba179f49..6b47d0057a 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index 2e3a604530..c4bcd1c813 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -15,9 +15,9 @@ 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\Processor\AfterTokenRequestProcessorInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
similarity index 91%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessor.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
index 4c8d4ba58c..2ab5a7bfb4 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
 
 use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
 use Sylius\Abstraction\StateMachine\StateMachineInterface;
@@ -19,7 +19,7 @@ use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\PaymentTransitions;
 use Webmozart\Assert\Assert;
 
-final class AfterOfflineCaptureProcessor implements AfterOfflineCaptureProcessorInterface
+final class AfterCaptureProcessor implements AfterCaptureProcessorInterface
 {
     public function __construct(
         private StateMachineFactoryInterface|StateMachineInterface $stateMachineFactory,
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessorInterface.php
similarity index 77%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessorInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessorInterface.php
index 6fb6fc0ecb..9314b59b88 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/AfterOfflineCaptureProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessorInterface.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface AfterOfflineCaptureProcessorInterface
+interface AfterCaptureProcessorInterface
 {
     public function process(PaymentRequestInterface $paymentRequest): void;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
similarity index 86%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessor.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
index 7a43444829..000705d13b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
 
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Webmozart\Assert\Assert;
 
-final class OfflineCaptureProcessor implements OfflineCaptureProcessorInterface
+final class CaptureProcessor implements CaptureProcessorInterface
 {
     public function process(PaymentRequestInterface $paymentRequest): void
     {
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessorInterface.php
similarity index 78%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessorInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessorInterface.php
index c5fadd9a28..e645bb7892 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/OfflineCaptureProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessorInterface.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface OfflineCaptureProcessorInterface
+interface CaptureProcessorInterface
 {
     public function process(PaymentRequestInterface $paymentRequest): void;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
similarity index 95%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessor.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
index 72c6951fe5..946554ef30 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum;
 
 use Payum\Core\Security\TokenInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessorInterface.php
similarity index 88%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessorInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessorInterface.php
index 7efa21cc57..8a37ea1ec7 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/AfterTokenRequestProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum;
 
 use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/RequestProcessor.php
similarity index 95%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessor.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/RequestProcessor.php
index f7b284e3f2..2a222b024d 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/RequestProcessor.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum;
 
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenAggregateInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/RequestProcessorInterface.php
similarity index 87%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessorInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/RequestProcessorInterface.php
index 9240c8f35c..d45dcd64cc 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Processor/RequestProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/RequestProcessorInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml
index 88c557ee3d..0c3206a7ab 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request.xml
@@ -15,6 +15,7 @@
     <imports>
         <import resource="payment_request/*.xml" />
         <import resource="payment_request/payum/*.xml" />
+        <import resource="payment_request/offline/*.xml" />
     </imports>
 
     <services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
new file mode 100644
index 0000000000..90ffc8d14f
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
@@ -0,0 +1,30 @@
+<?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.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessorInterface" />
+            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius_default.bus" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
similarity index 57%
rename from src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
index d9e6255a39..841aa332f5 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
@@ -31,19 +31,5 @@
             <tag name="sylius.payment_request.command_provider.offline" type="status" />
         </service>
 
-        <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
-            <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\OfflineCaptureProcessorInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\AfterOfflineCaptureProcessorInterface" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" />
-            <tag name="messenger.message_handler" bus="sylius_default.bus" />
-        </service>
-
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\OfflineCaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\OfflineCaptureProcessor" />
-
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\AfterOfflineCaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\AfterOfflineCaptureProcessor">
-            <argument type="service" id="sylius_abstraction.state_machine" />
-        </service>
-
     </services>
 </container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
new file mode 100644
index 0000000000..d02b55a96a
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
@@ -0,0 +1,28 @@
+<?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\Processor\Offline\CaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessor" />
+
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessor">
+            <argument type="service" id="sylius_abstraction.state_machine" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
similarity index 92%
rename from src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
index 5f98c40e37..41f4acb861 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/comman_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
@@ -21,8 +21,8 @@
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\AfterTokenRequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface" />
         </service>
 
         <service id="sylius.payment_request.payum.capture" parent="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler">
@@ -39,10 +39,10 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
         </service>
 
-        <service id="sylius.payment_request.payum.status" parent="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandHandler\ModelPaymentRequestHandler">
+        <service id="sylius.payment_request.payum.status" parent="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler">
             <argument type="service" id="sylius.factory.payum_get_status_action" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\StatusPaymentRequest" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\StatusPaymentRequest" />
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml
index 1325861659..d437b72e59 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/factory.xml
@@ -18,11 +18,6 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\AfterTokenRequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\AfterTokenRequestProcessor">
-            <argument type="service" id="sylius.custom_factory.payment_request" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
-        </service>
-
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactory">
             <argument type="service" id="payum" />
         </service>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
index d06abf84ae..aa775ce196 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
@@ -18,7 +18,12 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Processor\RequestProcessor">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessor">
+            <argument type="service" id="sylius.custom_factory.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
+        </service>
+
+        <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" />
         </service>

From c021f6e757ac7fc9faa5cb7e28605cedb1d371c2 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 21:52:01 +0100
Subject: [PATCH 045/200] Missing service renaming

---
 .../services/integrations/payum/paypal_express_checkout.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
index ccdacd325b..dc6bcb18f9 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
@@ -23,15 +23,15 @@
             <tag name="sylius.payment_request.command_provider" gateway-factory="paypal_express_checkout" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\CaptureCommandProvider">
+        <service id="sylius.payment_request.payum.command_provider.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="capture" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\AuthorizeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\AuthorizeCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="authorize" />
         </service>
 
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\CommandProvider\StatusCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\StatusCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="status" />
         </service>
 

From 3e9c3cba9ef22417d0ea43abd9fcefe9a363c947 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 22:11:04 +0100
Subject: [PATCH 046/200] Fix PHPStan error on Sf 5.4

---
 .../CommandProvider/PaymentRequestCommandProvider.php        | 1 -
 .../CommandProvider/PaymentRequestTypeCommandProvider.php    | 1 -
 .../PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php  | 5 +++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
index 4ccf6cba73..a58e0156f4 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
@@ -23,7 +23,6 @@ final class PaymentRequestCommandProvider implements PaymentRequestCommandProvid
 {
     public function __construct(
         private PaymentRequestDuplicationCheckerInterface $paymentRequestDuplicationChecker,
-        /** @var ServiceProviderInterface<PaymentRequestCommandProviderInterface> */
         private ServiceProviderInterface $locator,
     ) {
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
index c0b548f70d..218bb5d588 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
@@ -19,7 +19,6 @@ use Symfony\Contracts\Service\ServiceProviderInterface;
 final class PaymentRequestTypeCommandProvider implements PaymentRequestCommandProviderInterface
 {
     public function __construct(
-        /** @var ServiceProviderInterface<PaymentRequestCommandProviderInterface> */
         private ServiceProviderInterface $locator,
     ) {
     }
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index 71aad1bca2..66e1e9acbf 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -16,7 +16,6 @@ namespace Sylius\Bundle\PaymentBundle\Doctrine\ORM;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
-use Symfony\Bridge\Doctrine\Types\UuidType;
 
 /**
  * @template T of PaymentRequestInterface
@@ -34,7 +33,9 @@ class PaymentRequestRepository extends EntityRepository implements PaymentReques
             ->andWhere('o.type = :type')
             ->andWhere('o.payment = :payment')
             ->andWhere('o.method = :method')
-            ->setParameter('paymentRequest', $paymentRequest->getHash(), UuidType::NAME)
+            // Symfony\Bridge\Doctrine\Types\UuidType has signature changes between sf 5.4 and 6.4
+            // We are forced to use type: "uuid" to use both Sf versions
+            ->setParameter('paymentRequest', $paymentRequest->getHash(), 'uuid')
             ->setParameter('type', $paymentRequest->getType())
             ->setParameter('method', $paymentRequest->getMethod())
             ->setParameter('payment', $paymentRequest->getPayment())

From eba9688871760b648d6196165d57381cfca7c8ff Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 22:50:32 +0100
Subject: [PATCH 047/200] Remove not required suggestion

---
 src/Sylius/Bundle/PayumBundle/composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json
index 792d1993a0..9f3b61ef4a 100644
--- a/src/Sylius/Bundle/PayumBundle/composer.json
+++ b/src/Sylius/Bundle/PayumBundle/composer.json
@@ -44,8 +44,7 @@
     },
     "suggest": {
         "payum/paypal-express-checkout-nvp": "To use PayPal Express Chekout NVP",
-        "payum/stripe": "To use Stripe Checkout",
-        "sylius/api-bundle": "To use Payum with the Sylius API Bundle"
+        "payum/stripe": "To use Stripe Checkout"
     },
     "config": {
         "allow-plugins": {

From 3a6ad1dafde04ccdbc97df8b7b3d446ee8797190 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 23:04:39 +0100
Subject: [PATCH 048/200] Readd ramsey uuid needed for AttributeBundle

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index bb1e4bdd96..822710b3ca 100644
--- a/composer.json
+++ b/composer.json
@@ -70,6 +70,7 @@
         "psr/http-client": "^1.0",
         "psr/http-message": "^1.0",
         "psr/log": "^2.0",
+        "ramsey/uuid": "^4.0",
         "sonata-project/block-bundle": "^4.2 || ^5.0",
         "stof/doctrine-extensions-bundle": "^1.4",
         "sylius-labs/association-hydrator": "^1.1 || ^1.2",

From 531a0c68ff9e4880d8848d05c50b81159e14bf1b Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 23:10:11 +0100
Subject: [PATCH 049/200] Rename type to action

---
 src/Sylius/Behat/Context/Api/PaypalContext.php   |  6 +++---
 .../Command/Payment/AddPaymentRequest.php        |  8 ++++----
 .../Payment/AddPaymentRequestHandler.php         |  2 +-
 .../Commands/Payment/AddPaymentRequest.xml       |  2 +-
 .../config/serialization/PaymentRequest.xml      |  2 +-
 .../config/validation/AddPaymentRequest.xml      |  2 +-
 .../Migrations/Version20231106190918.php         |  2 +-
 .../Migrations/Version20240203222417.php         |  2 +-
 .../CapturePaymentRequestCommandProvider.php     |  2 +-
 .../StatusPaymentRequestCommandProvider.php      |  2 +-
 .../PaymentRequestTypeCommandProvider.php        |  4 ++--
 .../Payum/AuthorizeCommandProvider.php           |  2 +-
 .../Payum/CaptureCommandProvider.php             |  2 +-
 .../Payum/StatusCommandProvider.php              |  2 +-
 .../Payum/AfterTokenRequestProcessor.php         |  2 +-
 .../Doctrine/ORM/PaymentRequestRepository.php    |  4 ++--
 .../config/doctrine/model/PaymentRequest.orm.xml |  2 +-
 .../Component/Payment/Model/PaymentRequest.php   | 10 +++++-----
 .../Payment/Model/PaymentRequestInterface.php    | 16 ++++++++--------
 .../Payment/spec/Model/PaymentRequestSpec.php    | 10 +++++-----
 20 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/Sylius/Behat/Context/Api/PaypalContext.php b/src/Sylius/Behat/Context/Api/PaypalContext.php
index fb14fb641d..f77234f36d 100644
--- a/src/Sylius/Behat/Context/Api/PaypalContext.php
+++ b/src/Sylius/Behat/Context/Api/PaypalContext.php
@@ -167,9 +167,9 @@ final class PaypalContext implements Context
         $request->setContent([
             'paymentId' => $payment['@id'],
             'paymentMethodCode' => $payment['method'],
-            'type' => $authorize
-                ? PaymentRequestInterface::DATA_TYPE_AUTHORIZE
-                : PaymentRequestInterface::DATA_TYPE_CAPTURE,
+            'action' => $authorize
+                ? PaymentRequestInterface::ACTION_AUTHORIZE
+                : PaymentRequestInterface::ACTION_CAPTURE,
             'requestPayload' => [
                 'target_path' => 'https://myshop.tld/target-path',
                 'after_path' => 'https://myshop.tld/after-path',
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index 0acf1e7922..1a0da80776 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -21,8 +21,8 @@ class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
     public function __construct(
         private string $paymentId,
         private string $paymentMethodCode,
-        private string $type,
-        private mixed $requestPayload = null,
+        private string $action,
+        private mixed  $requestPayload = null,
     ) {
     }
 
@@ -36,9 +36,9 @@ class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
         return $this->paymentMethodCode;
     }
 
-    public function getType(): string
+    public function getAction(): string
     {
-        return $this->type;
+        return $this->action;
     }
 
     public function getRequestPayload(): mixed
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 249988e148..2221ffc99c 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -62,7 +62,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         );
 
         $paymentRequest = $this->paymentRequestFactory->createWithPaymentAndPaymentMethod($payment, $paymentMethod);
-        $paymentRequest->setType($addPaymentRequest->getType());
+        $paymentRequest->setAction($addPaymentRequest->getAction());
         $paymentRequest->setRequestPayload($addPaymentRequest->getRequestPayload());
 
         return $paymentRequest;
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
index a0e768f6fd..50ef1971bd 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
@@ -22,7 +22,7 @@
         <attribute name="paymentMethodCode">
             <group>sylius:shop:payment_request:create</group>
         </attribute>
-        <attribute name="type">
+        <attribute name="action">
             <group>sylius:shop:payment_request:create</group>
         </attribute>
         <attribute name="requestPayload">
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
index fc41ca9a2e..59b364667b 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -34,7 +34,7 @@
             <group>sylius:shop:payment_request:show</group>
             <group>sylius:shop:payment_request:index</group>
         </attribute>
-        <attribute name="type">
+        <attribute name="action">
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:admin:payment_request:index</group>
             <group>sylius:shop:payment_request:show</group>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
index 0010c3cc42..c55d75edac 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
@@ -27,7 +27,7 @@
                 </option>
             </constraint>
         </property>
-        <property name="type">
+        <property name="action">
             <constraint name="NotBlank">
                 <option name="groups">
                     <value>sylius</value>
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
index 2a5e1ae996..2ff8060f5a 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
@@ -25,7 +25,7 @@ final class Version20231106190918 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE sylius_payment_request (hash BINARY(16) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, request_payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE sylius_payment_request (hash BINARY(16) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, request_payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id)');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id)');
     }
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
index 3f860852ec..11ec897a2e 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
@@ -25,7 +25,7 @@ final class Version20240203222417 extends AbstractPostgreSQLMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE sylius_payment_request (hash UUID NOT NULL, method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, request_payload TEXT NOT NULL, response_data JSON NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(hash))');
+        $this->addSql('CREATE TABLE sylius_payment_request (hash UUID NOT NULL, method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, request_payload TEXT NOT NULL, response_data JSON NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(hash))');
         $this->addSql('CREATE INDEX IDX_86D904B19883967 ON sylius_payment_request (method_id)');
         $this->addSql('CREATE INDEX IDX_86D904B4C3A3BB ON sylius_payment_request (payment_id)');
         $this->addSql('COMMENT ON COLUMN sylius_payment_request.hash IS \'(DC2Type:uuid)\'');
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
index 36169787a9..630badb22e 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/CapturePaymentRequestCommandProvider.php
@@ -21,7 +21,7 @@ final class CapturePaymentRequestCommandProvider implements PaymentRequestComman
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
+        return $paymentRequest->getAction() === PaymentRequestInterface::ACTION_CAPTURE;
     }
 
     public function provide(PaymentRequestInterface $paymentRequest): object
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
index d1dcc7c8c3..0c95c6172b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
@@ -21,7 +21,7 @@ final class StatusPaymentRequestCommandProvider implements PaymentRequestCommand
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_STATUS;
+        return $paymentRequest->getAction() === PaymentRequestInterface::ACTION_STATUS;
     }
 
     public function provide(PaymentRequestInterface $paymentRequest): object
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
index 218bb5d588..1eba818a5d 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
@@ -25,11 +25,11 @@ final class PaymentRequestTypeCommandProvider implements PaymentRequestCommandPr
 
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        return $this->locator->get($paymentRequest->getType())->supports($paymentRequest);
+        return $this->locator->get($paymentRequest->getAction())->supports($paymentRequest);
     }
 
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        return $this->locator->get($paymentRequest->getType())->provide($paymentRequest);
+        return $this->locator->get($paymentRequest->getAction())->provide($paymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/AuthorizeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/AuthorizeCommandProvider.php
index 6433d1f218..16d9a97b2e 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/AuthorizeCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/AuthorizeCommandProvider.php
@@ -21,7 +21,7 @@ final class AuthorizeCommandProvider implements PaymentRequestCommandProviderInt
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_AUTHORIZE;
+        return $paymentRequest->getAction() === PaymentRequestInterface::ACTION_AUTHORIZE;
     }
 
     public function provide(PaymentRequestInterface $paymentRequest): object
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/CaptureCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/CaptureCommandProvider.php
index 72c77e200a..959fdbbdcc 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/CaptureCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/CaptureCommandProvider.php
@@ -21,7 +21,7 @@ final class CaptureCommandProvider implements PaymentRequestCommandProviderInter
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_CAPTURE;
+        return $paymentRequest->getAction() === PaymentRequestInterface::ACTION_CAPTURE;
     }
 
     public function provide(PaymentRequestInterface $paymentRequest): object
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/StatusCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/StatusCommandProvider.php
index 3ec97d1d80..87cd9db4fc 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/StatusCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Payum/StatusCommandProvider.php
@@ -21,7 +21,7 @@ final class StatusCommandProvider implements PaymentRequestCommandProviderInterf
 {
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        return $paymentRequest->getType() === PaymentRequestInterface::DATA_TYPE_STATUS;
+        return $paymentRequest->getAction() === PaymentRequestInterface::ACTION_STATUS;
     }
 
     public function provide(PaymentRequestInterface $paymentRequest): object
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
index 946554ef30..a07a01c3e1 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
@@ -39,7 +39,7 @@ final class AfterTokenRequestProcessor implements AfterTokenRequestProcessorInte
         $paymentRequest->setResponseData($details);
 
         $newPaymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($paymentRequest);
-        $newPaymentRequest->setType(PaymentRequestInterface::DATA_TYPE_STATUS);
+        $newPaymentRequest->setAction(PaymentRequestInterface::ACTION_STATUS);
 
         $this->paymentRequestCommandDispatcher->add($newPaymentRequest);
     }
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index 66e1e9acbf..57af6835ef 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -30,13 +30,13 @@ class PaymentRequestRepository extends EntityRepository implements PaymentReques
             ->innerJoin('o.payment', 'payment')
             ->innerJoin('o.method', 'method')
             ->where('o != :paymentRequest')
-            ->andWhere('o.type = :type')
+            ->andWhere('o.action = :action')
             ->andWhere('o.payment = :payment')
             ->andWhere('o.method = :method')
             // Symfony\Bridge\Doctrine\Types\UuidType has signature changes between sf 5.4 and 6.4
             // We are forced to use type: "uuid" to use both Sf versions
             ->setParameter('paymentRequest', $paymentRequest->getHash(), 'uuid')
-            ->setParameter('type', $paymentRequest->getType())
+            ->setParameter('action', $paymentRequest->getAction())
             ->setParameter('method', $paymentRequest->getMethod())
             ->setParameter('payment', $paymentRequest->getPayment())
             ->getQuery()
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index 7fbb85b2c4..c915638aea 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -29,7 +29,7 @@
         </many-to-one>
 
         <field name="state" column="state" type="string" />
-        <field name="type" column="type" type="string" />
+        <field name="action" column="action" type="string" />
         <field name="requestPayload" column="request_payload" type="object" />
         <field name="responseData" column="response_data" type="json" />
 
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index b0da94ce9e..cbbeb51f3d 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -28,7 +28,7 @@ class PaymentRequest implements PaymentRequestInterface
 
     protected string $state = PaymentRequestInterface::STATE_NEW;
 
-    protected string $type = PaymentRequestInterface::DATA_TYPE_CAPTURE;
+    protected string $action = PaymentRequestInterface::ACTION_CAPTURE;
 
     protected mixed $requestPayload = null;
 
@@ -79,14 +79,14 @@ class PaymentRequest implements PaymentRequestInterface
         $this->state = $state;
     }
 
-    public function getType(): string
+    public function getAction(): string
     {
-        return $this->type;
+        return $this->action;
     }
 
-    public function setType(string $type): void
+    public function setAction(string $action): void
     {
-        $this->type = $type;
+        $this->action = $action;
     }
 
     public function getRequestPayload(): mixed
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index d9e35cb3f9..068c36380d 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -29,17 +29,17 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public const STATE_COMPLETED = 'completed';
 
-    public const DATA_TYPE_CAPTURE = 'capture';
+    public const ACTION_CAPTURE = 'capture';
 
-    public const DATA_TYPE_AUTHORIZE = 'authorize';
+    public const ACTION_AUTHORIZE = 'authorize';
 
-    public const DATA_TYPE_REFUND = 'refund';
+    public const ACTION_REFUND = 'refund';
 
-    public const DATA_TYPE_STATUS = 'status';
+    public const ACTION_STATUS = 'status';
 
-    public const DATA_TYPE_SYNC = 'sync';
+    public const ACTION_SYNC = 'sync';
 
-    public const DATA_TYPE_PAYOUT = 'payout';
+    public const ACTION_PAYOUT = 'payout';
 
     public function getHash(): ?Uuid;
 
@@ -55,9 +55,9 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public function setState(string $state): void;
 
-    public function getType(): string;
+    public function getAction(): string;
 
-    public function setType(string $type): void;
+    public function setAction(string $action): void;
 
     public function getRequestPayload(): mixed;
 
diff --git a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
index 7b3764573c..3db575e82d 100644
--- a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
+++ b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
@@ -64,15 +64,15 @@ final class PaymentRequestSpec extends ObjectBehavior
         $this->getState()->shouldReturn('test_state');
     }
 
-    function it_has_capture_type_by_default(): void
+    function it_has_capture_action_by_default(): void
     {
-        $this->getType()->shouldReturn(PaymentRequestInterface::DATA_TYPE_CAPTURE);
+        $this->getAction()->shouldReturn(PaymentRequestInterface::ACTION_CAPTURE);
     }
 
-    function its_type_is_mutable(): void
+    function its_action_is_mutable(): void
     {
-        $this->setType('test_type');
-        $this->getType()->shouldReturn('test_type');
+        $this->setAction('test_action');
+        $this->getAction()->shouldReturn('test_action');
     }
 
     function it_has_null_data_by_default(): void

From b1de72e677035688277b13fcb9ec9d0bca89d83c Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 22 Feb 2024 23:30:24 +0100
Subject: [PATCH 050/200] Rename requestPayload to payload

---
 src/Sylius/Behat/Context/Api/PaypalContext.php         |  4 ++--
 .../ApiBundle/Command/Payment/AddPaymentRequest.php    |  6 +++---
 .../ApiBundle/Command/Payment/UpdatePaymentRequest.php |  6 +++---
 .../Payment/AddPaymentRequestHandler.php               |  2 +-
 .../Payment/UpdatePaymentRequestHandler.php            |  2 +-
 .../Resources/config/api_resources/PaymentRequest.xml  |  2 +-
 .../Commands/Payment/AddPaymentRequest.xml             |  2 +-
 .../Commands/Payment/UpdatePaymentRequest.xml          |  2 +-
 .../Resources/config/serialization/PaymentRequest.xml  |  2 +-
 .../CoreBundle/Migrations/Version20231106190918.php    |  2 +-
 .../CoreBundle/Migrations/Version20240203222417.php    |  4 ++--
 .../Payum/Action/SyliusGetHttpRequestAction.php        |  2 +-
 .../PaymentRequest/Payum/Factory/PayumTokenFactory.php |  2 +-
 .../config/doctrine/model/PaymentRequest.orm.xml       |  2 +-
 src/Sylius/Component/Payment/Model/PaymentRequest.php  | 10 +++++-----
 .../Payment/Model/PaymentRequestInterface.php          |  4 ++--
 .../Payment/spec/Model/PaymentRequestSpec.php          |  6 +++---
 17 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Sylius/Behat/Context/Api/PaypalContext.php b/src/Sylius/Behat/Context/Api/PaypalContext.php
index f77234f36d..8b39c82379 100644
--- a/src/Sylius/Behat/Context/Api/PaypalContext.php
+++ b/src/Sylius/Behat/Context/Api/PaypalContext.php
@@ -170,7 +170,7 @@ final class PaypalContext implements Context
             'action' => $authorize
                 ? PaymentRequestInterface::ACTION_AUTHORIZE
                 : PaymentRequestInterface::ACTION_CAPTURE,
-            'requestPayload' => [
+            'payload' => [
                 'target_path' => 'https://myshop.tld/target-path',
                 'after_path' => 'https://myshop.tld/after-path',
             ],
@@ -189,7 +189,7 @@ final class PaypalContext implements Context
         );
 
         $request->setContent([
-            'requestPayload' => [
+            'payload' => [
                 'target_path' => 'https://myshop.tld/target-path',
                 'after_path' => 'https://myshop.tld/after-path',
                 'http_request' => $httpRequest,
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index 1a0da80776..eab12ab106 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -22,7 +22,7 @@ class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
         private string $paymentId,
         private string $paymentMethodCode,
         private string $action,
-        private mixed  $requestPayload = null,
+        private mixed $payload = null,
     ) {
     }
 
@@ -41,8 +41,8 @@ class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
         return $this->action;
     }
 
-    public function getRequestPayload(): mixed
+    public function getPayload(): mixed
     {
-        return $this->requestPayload;
+        return $this->payload;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
index 9250d43aa8..69c2d7d3dc 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
@@ -22,13 +22,13 @@ class UpdatePaymentRequest implements PaymentRequestHashAwareInterface, IriToIde
     protected ?string $hash = null;
 
     public function __construct(
-        private mixed $requestPayload = null,
+        private mixed $payload = null,
     ) {
     }
 
-    public function getRequestPayload(): mixed
+    public function getPayload(): mixed
     {
-        return $this->requestPayload;
+        return $this->payload;
     }
 
     public function getHash(): ?string
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 2221ffc99c..fe43649cbe 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -63,7 +63,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
 
         $paymentRequest = $this->paymentRequestFactory->createWithPaymentAndPaymentMethod($payment, $paymentMethod);
         $paymentRequest->setAction($addPaymentRequest->getAction());
-        $paymentRequest->setRequestPayload($addPaymentRequest->getRequestPayload());
+        $paymentRequest->setPayload($addPaymentRequest->getPayload());
 
         return $paymentRequest;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 28f59f4a47..3934269613 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -37,7 +37,7 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
         $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
         Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
 
-        $paymentRequest->setRequestPayload($updatePaymentRequest->getRequestPayload());
+        $paymentRequest->setPayload($updatePaymentRequest->getPayload());
 
         $this->paymentRequestCommandDispatcher->add($paymentRequest);
 
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
index 8203b85c8d..d6c7880296 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -77,7 +77,7 @@
         <property name="createdAt" writable="false" />
         <property name="updatedAt" writable="false" />
         <property name="state" writable="false" />
-        <property name="requestPayload" writable="true" />
+        <property name="payload" writable="true" />
         <property name="responseData" writable="false" />
     </resource>
 </resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
index 50ef1971bd..3c77fc6319 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/AddPaymentRequest.xml
@@ -25,7 +25,7 @@
         <attribute name="action">
             <group>sylius:shop:payment_request:create</group>
         </attribute>
-        <attribute name="requestPayload">
+        <attribute name="payload">
             <group>sylius:shop:payment_request:create</group>
         </attribute>
     </class>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml
index 141a328f66..0c1ba4ccf9 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Payment/UpdatePaymentRequest.xml
@@ -16,7 +16,7 @@
             xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
 >
     <class name="Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest">
-        <attribute name="requestPayload">
+        <attribute name="payload">
             <group>sylius:shop:payment_request:update</group>
         </attribute>
     </class>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
index 59b364667b..62f053ae3e 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -46,7 +46,7 @@
             <group>sylius:shop:payment_request:show</group>
             <group>sylius:shop:payment_request:index</group>
         </attribute>
-        <attribute name="requestPayload">
+        <attribute name="payload">
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:admin:payment_request:index</group>
             <group>sylius:shop:payment_request:show</group>
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
index 2ff8060f5a..c2c4e20aa5 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
@@ -25,7 +25,7 @@ final class Version20231106190918 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE sylius_payment_request (hash BINARY(16) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, request_payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE sylius_payment_request (hash BINARY(16) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id)');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id)');
     }
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
index 11ec897a2e..6f76210344 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
@@ -25,11 +25,11 @@ final class Version20240203222417 extends AbstractPostgreSQLMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE sylius_payment_request (hash UUID NOT NULL, method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, request_payload TEXT NOT NULL, response_data JSON NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(hash))');
+        $this->addSql('CREATE TABLE sylius_payment_request (hash UUID NOT NULL, method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, payload TEXT NOT NULL, response_data JSON NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(hash))');
         $this->addSql('CREATE INDEX IDX_86D904B19883967 ON sylius_payment_request (method_id)');
         $this->addSql('CREATE INDEX IDX_86D904B4C3A3BB ON sylius_payment_request (payment_id)');
         $this->addSql('COMMENT ON COLUMN sylius_payment_request.hash IS \'(DC2Type:uuid)\'');
-        $this->addSql('COMMENT ON COLUMN sylius_payment_request.request_payload IS \'(DC2Type:object)\'');
+        $this->addSql('COMMENT ON COLUMN sylius_payment_request.payload IS \'(DC2Type:object)\'');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
index 9fbe434966..0548841a13 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
@@ -52,7 +52,7 @@ final class SyliusGetHttpRequestAction implements ActionInterface
          *     },
          * } $payload
          */
-        $payload = $paymentRequest->getRequestPayload();
+        $payload = $paymentRequest->getPayload();
         $httpRequest = $payload['http_request'] ?? [];
 
         $request->query = $httpRequest['query'] ?? [];
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index a4f20030ca..ab47d603b8 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -46,7 +46,7 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
          *     'after_path_parameters'?: array<string, string>,
          * }|null $payload
          */
-        $payload = $paymentRequest->getRequestPayload();
+        $payload = $paymentRequest->getPayload();
         Assert::notNull($payload, 'The request payload need to be not null!');
 
         $targetPath = $payload['target_path'] ?? null;
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index c915638aea..28eeb26a03 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -30,7 +30,7 @@
 
         <field name="state" column="state" type="string" />
         <field name="action" column="action" type="string" />
-        <field name="requestPayload" column="request_payload" type="object" />
+        <field name="payload" column="payload" type="object" />
         <field name="responseData" column="response_data" type="json" />
 
         <field name="createdAt" column="created_at" type="datetime">
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index cbbeb51f3d..bdd75c3ed1 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -30,7 +30,7 @@ class PaymentRequest implements PaymentRequestInterface
 
     protected string $action = PaymentRequestInterface::ACTION_CAPTURE;
 
-    protected mixed $requestPayload = null;
+    protected mixed $payload = null;
 
     protected array $responseData = [];
 
@@ -89,14 +89,14 @@ class PaymentRequest implements PaymentRequestInterface
         $this->action = $action;
     }
 
-    public function getRequestPayload(): mixed
+    public function getPayload(): mixed
     {
-        return $this->requestPayload;
+        return $this->payload;
     }
 
-    public function setRequestPayload(mixed $requestPayload): void
+    public function setPayload(mixed $payload): void
     {
-        $this->requestPayload = $requestPayload;
+        $this->payload = $payload;
     }
 
     public function getResponseData(): array
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index 068c36380d..52ad92408b 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -59,9 +59,9 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public function setAction(string $action): void;
 
-    public function getRequestPayload(): mixed;
+    public function getPayload(): mixed;
 
-    public function setRequestPayload(mixed $requestPayload): void;
+    public function setPayload(mixed $payload): void;
 
     public function getResponseData(): array;
 
diff --git a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
index 3db575e82d..52c340ffe9 100644
--- a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
+++ b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
@@ -77,14 +77,14 @@ final class PaymentRequestSpec extends ObjectBehavior
 
     function it_has_null_data_by_default(): void
     {
-        $this->getRequestPayload()->shouldReturn(null);
+        $this->getPayload()->shouldReturn(null);
     }
 
     function its_data_is_mutable(): void
     {
         $stdClass = new stdClass();
-        $this->setRequestPayload($stdClass);
-        $this->getRequestPayload()->shouldReturn($stdClass);
+        $this->setPayload($stdClass);
+        $this->getPayload()->shouldReturn($stdClass);
     }
 
     function it_has_empty_array_details_by_default(): void

From 7863ad042f2bb70043cb94f91c829b614a6bf167 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:12:41 +0100
Subject: [PATCH 051/200] Validate the PaymentRequest action and return a list
 of available actions if it's possible

---
 phpstan-baseline.neon                         |  5 ++
 .../Resources/config/services/validator.xml   |  6 ++
 .../config/validation/AddPaymentRequest.xml   |  5 ++
 .../Resources/translations/validators.en.yaml |  3 +
 .../ChosenPaymentRequestActionEligibility.php | 33 ++++++++
 ...ymentRequestActionEligibilityValidator.php | 81 +++++++++++++++++++
 .../ActionsCommandProvider.php                | 56 +++++++++++++
 .../GatewayFactoryCommandProvider.php         | 79 ++++++++++++++++++
 .../PaymentRequestCommandProvider.php         | 58 -------------
 .../PaymentRequestTypeCommandProvider.php     | 35 --------
 ...eProviderAwareCommandProviderInterface.php | 15 ++++
 .../services/integrations/payum/offline.xml   |  2 +-
 .../payum/paypal_express_checkout.xml         |  4 +-
 .../services/integrations/payum/stripe.xml    |  2 +-
 .../payment_request/command_dispatcher.xml    |  2 +-
 .../{provider.xml => command_provider.xml}    |  2 +-
 .../offline/command_providers.xml             |  2 +-
 17 files changed, 290 insertions(+), 100 deletions(-)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
 delete mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
 delete mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
 rename src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/{provider.xml => command_provider.xml} (80%)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 14cb76378b..2c71e1e1b7 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1725,6 +1725,11 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibilityValidator.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\Validator\\\\Constraints\\\\ChosenPaymentRequestActionEligibilityValidator\\:\\:__construct\\(\\) has parameter \\$paymentMethodRepository with generic interface Sylius\\\\Component\\\\Core\\\\Repository\\\\PaymentMethodRepositoryInterface but does not specify its types\\: T$#"
+			count: 1
+			path: src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
+
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\Validator\\\\Constraints\\\\ChosenShippingMethodEligibilityValidator\\:\\:__construct\\(\\) has parameter \\$shipmentRepository with generic interface Sylius\\\\Component\\\\Core\\\\Repository\\\\ShipmentRepositoryInterface but does not specify its types\\: T$#"
 			count: 1
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
index 69d97e02c1..396f7ae68c 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
@@ -152,6 +152,12 @@
             <tag name="validator.constraint_validator" alias="sylius_api_validator_admin_non_expired_password_reset_token" />
         </service>
 
+        <service id="Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentRequestActionEligibilityValidator">
+            <argument type="service" id="sylius.repository.payment_method" />
+            <argument type="service" id="sylius.payment_request.command_provider.gateway_factory" />
+            <tag name="validator.constraint_validator" alias="sylius_api_chosen_payment_request_action_eligibility" />
+        </service>
+
         <service id="Sylius\Bundle\ApiBundle\Validator\CatalogPromotion\PercentageDiscountActionValidator">
             <argument type="service" id="Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface" />
             <tag name="sylius.catalog_promotion.action_validator" key="percentage_discount"/>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
index c55d75edac..0d3b8a2a18 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
@@ -13,6 +13,11 @@
 
 <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
     <class name="Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest">
+        <constraint name="Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentRequestActionEligibility">
+            <option name="groups">
+                <value>sylius</value>
+            </option>
+        </constraint>
         <property name="paymentId">
             <constraint name="NotBlank">
                 <option name="groups">
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/translations/validators.en.yaml b/src/Sylius/Bundle/ApiBundle/Resources/translations/validators.en.yaml
index 923817cb51..66b4cc5870 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/translations/validators.en.yaml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/translations/validators.en.yaml
@@ -26,6 +26,9 @@ sylius:
         cannot_change_payment_method_for_cancelled_order: 'You cannot change the payment method for a cancelled order.'
         not_available: 'The payment method %name% is not available for this order. Please choose another one.'
         not_exist: 'The payment method with %code% code does not exist.'
+    payment_request:
+        action_not_available: 'The payment request (method code "%code%" and payment id "%id%") has no handler. Please choose another payment method.'
+        not_available: 'The payment request is not supporting this action (actions available are: %actions%).'
     product:
         not_exist: 'The product %productName% does not exist.'
     product_variant:
diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php
new file mode 100644
index 0000000000..262340bab3
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+final class ChosenPaymentRequestActionEligibility extends Constraint
+{
+    public string $notAvailable = 'sylius.payment_request.action_not_available';
+
+    public string $notExist = 'sylius.payment_method.not_exist';
+
+    public function validatedBy(): string
+    {
+        return 'sylius_api_chosen_payment_request_action_eligibility';
+    }
+
+    public function getTargets(): string
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
new file mode 100644
index 0000000000..8bd4abf9d2
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Validator\Constraints;
+
+use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ServiceProviderAwareCommandProviderInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Webmozart\Assert\Assert;
+
+/** @experimental */
+final class ChosenPaymentRequestActionEligibilityValidator extends ConstraintValidator
+{
+    public function __construct(
+        private PaymentMethodRepositoryInterface $paymentMethodRepository,
+        private ServiceProviderAwareCommandProviderInterface $gatewayFactoryCommandProvider,
+    ) {
+    }
+    public function validate(mixed $value, Constraint $constraint): void
+    {
+        Assert::isInstanceOf($value, AddPaymentRequest::class);
+
+        /** @var ChosenPaymentRequestActionEligibility $constraint */
+        Assert::isInstanceOf($constraint, ChosenPaymentRequestActionEligibility::class);
+
+        $gatewayFactoryCommandProvider = $this->getCommandProvider($value);
+        if (null === $gatewayFactoryCommandProvider) {
+            $this->context->addViolation($constraint->notAvailable, [
+                '%code%' => $value->getPaymentMethodCode(),
+                '%id%' => $value->getPaymentId(),
+            ]);
+        }
+
+        if (false === $gatewayFactoryCommandProvider instanceof ServiceProviderAwareCommandProviderInterface) {
+            return;
+        }
+
+        $actionsCommandProvider = $gatewayFactoryCommandProvider->getCommandProvider($value->getAction());
+        if (null !== $actionsCommandProvider) {
+            return;
+        }
+
+        $availableActions = $gatewayFactoryCommandProvider->getCommandProviderIndex();
+
+        $this->context->addViolation($constraint->notAvailable, ['%actions%' => implode(', ', $availableActions)]);
+    }
+
+    private function getCommandProvider(AddPaymentRequest $addPaymentRequest): ?PaymentRequestCommandProviderInterface
+    {
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $this->paymentMethodRepository->findOneBy(['code' => $addPaymentRequest->getPaymentMethodCode()]);
+
+        if ($paymentMethod === null) {
+
+            return null;
+        }
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        if (null === $gatewayConfig) {
+            return null;
+        }
+
+        $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
+        $commandProvider = $this->gatewayFactoryCommandProvider->getCommandProvider($factoryName);
+        return $commandProvider ?? null;
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
new file mode 100644
index 0000000000..96ff0b3ef2
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
+
+use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+
+final class ActionsCommandProvider implements ServiceProviderAwareCommandProviderInterface
+{
+    public function __construct(
+        private ServiceProviderInterface $locator,
+    ) {
+    }
+
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        $commandProvider = $this->locator->get($paymentRequest->getAction());
+        if (null === $commandProvider) {
+            return false;
+        }
+
+        return $commandProvider->supports($paymentRequest);
+    }
+
+    public function provide(PaymentRequestInterface $paymentRequest): object
+    {
+        $commandProvider = $this->locator->get($paymentRequest->getAction());
+        if (null === $commandProvider) {
+            throw new PaymentRequestNotSupportedException();
+        }
+
+        return $commandProvider->provide($paymentRequest);
+    }
+
+    public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface
+    {
+        return $this->locator->get($index);
+    }
+
+    public function getCommandProviderIndex(): array
+    {
+        return $this->locator->getProvidedServices();
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
new file mode 100644
index 0000000000..d982345838
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
+
+use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface;
+use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+use Webmozart\Assert\Assert;
+
+final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommandProviderInterface
+{
+    public function __construct(
+        private PaymentRequestDuplicationCheckerInterface $paymentRequestDuplicationChecker,
+        private ServiceProviderInterface $locator,
+    ) {
+    }
+
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        $hasDuplicates = $this->paymentRequestDuplicationChecker->hasDuplicates($paymentRequest);
+
+        if ($hasDuplicates) {
+            return false;
+        }
+
+        $factoryName = $this->getFactoryName($paymentRequest);
+        $commandProvider = $this->getCommandProvider($factoryName);
+        if (null === $commandProvider) {
+            return false;
+        }
+
+        return $commandProvider->supports($paymentRequest);
+    }
+
+    public function provide(PaymentRequestInterface $paymentRequest): object
+    {
+        $factoryName = $this->getFactoryName($paymentRequest);
+        $commandProvider = $this->getCommandProvider($factoryName);
+        if (null === $commandProvider) {
+            throw new PaymentRequestNotSupportedException();
+        }
+
+        return $commandProvider->provide($paymentRequest);
+    }
+
+    public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface
+    {
+        return $this->locator->get($index);
+    }
+
+    public function getCommandProviderIndex(): array
+    {
+        return $this->locator->getProvidedServices();
+    }
+
+    private function getFactoryName(PaymentRequestInterface $paymentRequest): string
+    {
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+        Assert::notNull($paymentMethod, 'Payment method cannot be null.');
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        Assert::notNull($gatewayConfig, 'Gateway config cannot be null.');
+        return $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
deleted file mode 100644
index a58e0156f4..0000000000
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestCommandProvider.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
-
-use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Contracts\Service\ServiceProviderInterface;
-use Webmozart\Assert\Assert;
-
-final class PaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
-{
-    public function __construct(
-        private PaymentRequestDuplicationCheckerInterface $paymentRequestDuplicationChecker,
-        private ServiceProviderInterface $locator,
-    ) {
-    }
-
-    public function supports(PaymentRequestInterface $paymentRequest): bool
-    {
-        $hasDuplicates = $this->paymentRequestDuplicationChecker->hasDuplicates($paymentRequest);
-
-        if ($hasDuplicates) {
-            return false;
-        }
-
-        return $this->getCommandProvider($paymentRequest)->supports($paymentRequest);
-    }
-
-    public function provide(PaymentRequestInterface $paymentRequest): object
-    {
-        return $this->getCommandProvider($paymentRequest)->provide($paymentRequest);
-    }
-
-    private function getCommandProvider(PaymentRequestInterface $paymentRequest): PaymentRequestCommandProviderInterface
-    {
-        /** @var PaymentMethodInterface|null $paymentMethod */
-        $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod);
-
-        $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig);
-        $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
-
-        return $this->locator->get($factoryName);
-    }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
deleted file mode 100644
index 1eba818a5d..0000000000
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/PaymentRequestTypeCommandProvider.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
-
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Contracts\Service\ServiceProviderInterface;
-
-final class PaymentRequestTypeCommandProvider implements PaymentRequestCommandProviderInterface
-{
-    public function __construct(
-        private ServiceProviderInterface $locator,
-    ) {
-    }
-
-    public function supports(PaymentRequestInterface $paymentRequest): bool
-    {
-        return $this->locator->get($paymentRequest->getAction())->supports($paymentRequest);
-    }
-
-    public function provide(PaymentRequestInterface $paymentRequest): object
-    {
-        return $this->locator->get($paymentRequest->getAction())->provide($paymentRequest);
-    }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
new file mode 100644
index 0000000000..9f0a54eefd
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
+
+interface ServiceProviderAwareCommandProviderInterface extends PaymentRequestCommandProviderInterface
+{
+    public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface;
+
+    /**
+     * @return string[]
+     */
+    public function getCommandProviderIndex(): array;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
index d2f4b8db15..b4e7df5fa8 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.offline" index-by="type" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="offline" />
         </service>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
index dc6bcb18f9..6e2c38e481 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
@@ -18,12 +18,12 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.payum.command_provider.paypal_express_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.paypal_express_checkout" index-by="type" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="paypal_express_checkout" />
         </service>
 
-        <service id="sylius.payment_request.payum.command_provider.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
             <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="capture" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
index 0e565a19af..d1695fd786 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.payum.stripe_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.payum.stripe_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.stripe_checkout" index-by="type" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="stripe_checkout" />
         </service>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
index 81604384f2..00ca5eb676 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
@@ -20,7 +20,7 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcher">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface" />
+            <argument type="service" id="sylius.payment_request.command_provider.gateway_factory" />
             <argument type="service" id="sylius.command_bus" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
similarity index 80%
rename from src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
index 3a2d64158c..74b54fe523 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/provider.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProvider">
+        <service id="sylius.payment_request.command_provider.gateway_factory" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\GatewayFactoryCommandProvider">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface" />
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="gateway-factory" />
         </service>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
index 841aa332f5..7cd396be89 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.payment_request.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestTypeCommandProvider">
+        <service id="sylius.payment_request.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="type" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="offline" priority="-100" />
         </service>

From f3c438a5311825e36d59d86518effb12a483aa73 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:29:45 +0100
Subject: [PATCH 052/200] On-Delete cascade when the related payment id
 deleted, set null for the related payment method deletion

---
 .../Resources/config/doctrine/model/PaymentRequest.orm.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index 28eeb26a03..195b109e48 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -21,11 +21,11 @@
         </id>
 
         <many-to-one field="method" target-entity="Sylius\Component\Payment\Model\PaymentMethodInterface">
-            <join-column name="method_id" referenced-column-name="id" nullable="true" />
+            <join-column name="method_id" referenced-column-name="id" nullable="true" on-delete="CASCADE" />
         </many-to-one>
 
         <many-to-one field="payment" target-entity="Sylius\Component\Payment\Model\PaymentInterface">
-            <join-column name="payment_id" referenced-column-name="id" nullable="true" />
+            <join-column name="payment_id" referenced-column-name="id" nullable="true" on-delete="SET NULL" />
         </many-to-one>
 
         <field name="state" column="state" type="string" />

From dec0b4d86c0ad0749c724dc2aaf051311fdd4150 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 23 Feb 2024 18:48:09 +0100
Subject: [PATCH 053/200] Refactor to minimize payment requests command
 handlers

---
 .../Resources/config/services/validator.xml   |  1 +
 ...ymentRequestActionEligibilityValidator.php |  5 ++-
 .../PaymentRequestIntegrityChecker.php        | 40 +++++++++++++++++++
 ...aymentRequestIntegrityCheckerInterface.php | 13 ++++++
 .../Offline/CapturePaymentRequestHandler.php  | 29 +++-----------
 .../Payum/ModelPaymentRequestHandler.php      | 28 ++++++-------
 .../Payum/TokenPaymentRequestHandler.php      | 17 ++++----
 .../GatewayFactoryCommandProvider.php         |  9 +++--
 .../PayumRequirementsChecker.php}             | 16 ++------
 .../PayumRequirementsCheckerInterface.php}    |  6 +--
 .../Provider/GatewayFactoryNameProvider.php   | 20 ++++++++++
 .../GatewayFactoryNameProviderInterface.php   | 12 ++++++
 .../services/payment_request/checker.xml      |  4 ++
 .../payment_request/command_provider.xml      |  1 +
 .../offline/command_handlers.xml              |  2 +-
 .../payum/{providers.xml => checkers.xml}     |  3 +-
 .../payum/command_handlers.xml                |  6 ++-
 .../services/payment_request/providers.xml    | 24 +++++++++++
 18 files changed, 160 insertions(+), 76 deletions(-)
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/{Provider/PaymentRequestProvider.php => Checker/PayumRequirementsChecker.php} (63%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/{Provider/PaymentRequestProviderInterface.php => Checker/PayumRequirementsCheckerInterface.php} (62%)
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
 rename src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/{providers.xml => checkers.xml} (77%)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
index 396f7ae68c..3ff97b81b0 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
@@ -155,6 +155,7 @@
         <service id="Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentRequestActionEligibilityValidator">
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.payment_request.command_provider.gateway_factory" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProviderInterface" />
             <tag name="validator.constraint_validator" alias="sylius_api_chosen_payment_request_action_eligibility" />
         </service>
 
diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
index 8bd4abf9d2..81df42cd68 100644
--- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
+++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
@@ -16,6 +16,7 @@ namespace Sylius\Bundle\ApiBundle\Validator\Constraints;
 use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ServiceProviderAwareCommandProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProviderInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
 use Symfony\Component\Validator\Constraint;
@@ -28,6 +29,7 @@ final class ChosenPaymentRequestActionEligibilityValidator extends ConstraintVal
     public function __construct(
         private PaymentMethodRepositoryInterface $paymentMethodRepository,
         private ServiceProviderAwareCommandProviderInterface $gatewayFactoryCommandProvider,
+        private GatewayFactoryNameProviderInterface $gatewayFactoryNameProvider,
     ) {
     }
     public function validate(mixed $value, Constraint $constraint): void
@@ -65,7 +67,6 @@ final class ChosenPaymentRequestActionEligibilityValidator extends ConstraintVal
         $paymentMethod = $this->paymentMethodRepository->findOneBy(['code' => $addPaymentRequest->getPaymentMethodCode()]);
 
         if ($paymentMethod === null) {
-
             return null;
         }
 
@@ -74,7 +75,7 @@ final class ChosenPaymentRequestActionEligibilityValidator extends ConstraintVal
             return null;
         }
 
-        $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
+        $factoryName = $this->gatewayFactoryNameProvider->provide($paymentMethod);
         $commandProvider = $this->gatewayFactoryCommandProvider->getCommandProvider($factoryName);
         return $commandProvider ?? null;
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
new file mode 100644
index 0000000000..e98ec34f3c
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
+
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Webmozart\Assert\Assert;
+
+final class PaymentRequestIntegrityChecker implements PaymentRequestIntegrityCheckerInterface
+{
+    public function __construct(
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+    ) {
+    }
+
+    public function check(PaymentRequestHashAwareInterface $command): PaymentRequestInterface
+    {
+        $hash = $command->getHash();
+        Assert::notNull($hash, 'Payment request hash cannot be null.');
+
+        $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
+        Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
+
+        /** @var PaymentMethodInterface|null $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+        Assert::notNull($paymentMethod, 'Payment cannot be null.');
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        Assert::notNull($gatewayConfig, 'Payment method cannot be null.');
+
+        $payment = $paymentRequest->getPayment();
+        Assert::notNull($payment, 'Payment cannot be null.');
+
+        return $paymentRequest;
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php
new file mode 100644
index 0000000000..f3bfecdc59
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
+
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface PaymentRequestIntegrityCheckerInterface
+{
+    public function check(PaymentRequestHashAwareInterface $command): PaymentRequestInterface;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index 80a4a95771..cdafc42642 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -13,45 +13,26 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Webmozart\Assert\Assert;
 
 /** @experimental */
 final class CapturePaymentRequestHandler implements MessageHandlerInterface
 {
-    public const FACTORY_NAME = 'offline';
 
     public function __construct(
-        private PaymentRequestRepositoryInterface $paymentRequestRepository,
-        private CaptureProcessorInterface         $offlineCaptureProcessor,
-        private AfterCaptureProcessorInterface    $afterOfflineCaptureProcessor,
+        private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        private CaptureProcessorInterface $offlineCaptureProcessor,
+        private AfterCaptureProcessorInterface $afterOfflineCaptureProcessor,
     ) {
     }
 
     public function __invoke(CapturePaymentRequest $capturePaymentRequest): void
     {
-        $hash = $capturePaymentRequest->getHash();
-        Assert::notNull($hash, 'Payment request hash cannot be null.');
-
-        $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
-        Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
-
-        /** @var PaymentMethodInterface|null $paymentMethod */
-        $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod, 'Payment cannot be null.');
-
-        $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig, 'Payment method cannot be null.');
-        $factoryName = $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
-        Assert::eq($factoryName, self::FACTORY_NAME, 'Expected a factory name equal to %2$s. Got: %s');
-
-        $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment);
+        $paymentRequest = $this->paymentRequestIntegrityChecker->check($capturePaymentRequest);
 
         $this->offlineCaptureProcessor->process($paymentRequest);
         $this->afterOfflineCaptureProcessor->process($paymentRequest);
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
index 6b47d0057a..49357b14e6 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
@@ -13,18 +13,21 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Webmozart\Assert\Assert;
 
 final class ModelPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private PaymentRequestProviderInterface $paymentRequestProvider,
+        private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        private PayumRequirementsCheckerInterface $payumRequirementsChecker,
         private RequestProcessorInterface $requestProcessor,
         private GetStatusFactoryInterface $factory,
     ) {
@@ -32,26 +35,19 @@ final class ModelPaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
-        $hash = $command->getHash();
-        Assert::notNull($hash, 'Payment request hash cannot be null.');
-
-        $paymentRequest = $this->paymentRequestProvider->provideFromHash($hash);
-        Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
+        $paymentRequest = $this->paymentRequestIntegrityChecker->check($command);
+        $this->payumRequirementsChecker->check($paymentRequest);
 
+        /** @var PaymentInterface $payment */
         $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment, 'Payment cannot be null.');
-
         $request = $this->factory->createNewWithModel($payment);
 
-        /** @var PaymentMethodInterface|null $paymentMethod */
+        /** @var PaymentMethodInterface $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod, 'Payment method cannot be null.');
 
+        /** @var GatewayConfigInterface $gatewayConfig */
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig, 'Gateway config cannot be null.');
 
-        $gatewayName = $gatewayConfig->getGatewayName();
-
-        $this->requestProcessor->process($paymentRequest, $request, $gatewayName);
+        $this->requestProcessor->process($paymentRequest, $request, $gatewayConfig->getGatewayName());
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index c4bcd1c813..e60b5c38f4 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -13,9 +13,10 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
@@ -25,7 +26,8 @@ use Webmozart\Assert\Assert;
 final class TokenPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private PaymentRequestProviderInterface $paymentRequestProvider,
+        private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        private PayumRequirementsCheckerInterface $payumRequirementsChecker,
         private PayumTokenFactoryInterface $payumTokenFactory,
         private RequestProcessorInterface $requestProcessor,
         private AfterTokenRequestProcessorInterface $afterTokenRequestProcessor,
@@ -35,21 +37,16 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
-        $hash = $command->getHash();
-        Assert::notNull($hash, 'The payment request hash cannot be null.');
-
-        $paymentRequest = $this->paymentRequestProvider->provideFromHash($hash);
-        Assert::notNull($paymentRequest);
+        $paymentRequest = $this->paymentRequestIntegrityChecker->check($command);
+        $this->payumRequirementsChecker->check($paymentRequest);
 
         $token = $this->payumTokenFactory->createNew($paymentRequest);
-
         $request = $this->payumRequestFactory->createNewWithToken($token);
 
         $token = $request->getToken();
-        Assert::notNull($token);
+        Assert::notNull($token, 'A Payum token cannot be null.');
 
         $this->requestProcessor->process($paymentRequest, $request, $token->getGatewayName());
-
         $this->afterTokenRequestProcessor->process($paymentRequest, $token);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
index d982345838..68832ab705 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProviderInterface;
 use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
@@ -24,6 +25,7 @@ final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommand
 {
     public function __construct(
         private PaymentRequestDuplicationCheckerInterface $paymentRequestDuplicationChecker,
+        private GatewayFactoryNameProviderInterface $gatewayFactoryNameProvider,
         private ServiceProviderInterface $locator,
     ) {
     }
@@ -72,8 +74,9 @@ final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommand
         $paymentMethod = $paymentRequest->getMethod();
         Assert::notNull($paymentMethod, 'Payment method cannot be null.');
 
-        $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig, 'Gateway config cannot be null.');
-        return $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
+        $factoryName = $this->gatewayFactoryNameProvider->provide($paymentMethod);
+        Assert::notNull($factoryName, 'Gateway config cannot be null.');
+
+        return $factoryName;
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsChecker.php
similarity index 63%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProvider.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsChecker.php
index 3be2cde94d..4c1a7fe0be 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsChecker.php
@@ -11,30 +11,22 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\Proxy;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 
-final class PaymentRequestProvider implements PaymentRequestProviderInterface
+final class PayumRequirementsChecker implements PayumRequirementsCheckerInterface
 {
     public function __construct(
-        private PaymentRequestRepositoryInterface $paymentRequestRepository,
         private EntityManagerInterface $entityManager,
     ) {
     }
 
-    public function provideFromHash(string $hash): ?PaymentRequestInterface
+    public function check(PaymentRequestInterface $paymentRequest): void
     {
-        $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
-
-        if (null === $paymentRequest) {
-            return null;
-        }
-
         // Needed to get a real object to give to Payum which is not handling
         // Proxy class from Doctrine when a token is created for ex.
         $payment = $paymentRequest->getPayment();
@@ -43,7 +35,5 @@ final class PaymentRequestProvider implements PaymentRequestProviderInterface
             $payment = $this->entityManager->find(PaymentInterface::class, $payment->getId());
             $paymentRequest->setPayment($payment);
         }
-
-        return $paymentRequest;
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsCheckerInterface.php
similarity index 62%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProviderInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsCheckerInterface.php
index ed9b7dee32..f6acea5c10 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Provider/PaymentRequestProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsCheckerInterface.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface PaymentRequestProviderInterface
+interface PayumRequirementsCheckerInterface
 {
-    public function provideFromHash(string $hash): ?PaymentRequestInterface;
+    public function check(PaymentRequestInterface $paymentRequest): void;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
new file mode 100644
index 0000000000..facaf0a68d
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+
+final class GatewayFactoryNameProvider implements GatewayFactoryNameProviderInterface
+{
+    public function provide(PaymentMethodInterface $paymentMethod): ?string
+    {
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        if (null === $gatewayConfig) {
+            return null;
+        }
+
+        return $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
new file mode 100644
index 0000000000..b8210e527e
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+
+interface GatewayFactoryNameProviderInterface
+{
+    public function provide(PaymentMethodInterface $paymentMethod): ?string;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
index 2891bd9c47..e1ef27c5c3 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
@@ -22,5 +22,9 @@
             <argument type="service" id="sylius.repository.payment_request" />
         </service>
 
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityChecker">
+            <argument type="service" id="sylius.repository.payment_request" />
+        </service>
+
     </services>
 </container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
index 74b54fe523..d7c85aea13 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
@@ -20,6 +20,7 @@
 
         <service id="sylius.payment_request.command_provider.gateway_factory" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\GatewayFactoryCommandProvider">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProviderInterface" />
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="gateway-factory" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
index 90ffc8d14f..6c4c6cf9a1 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
@@ -19,7 +19,7 @@
         <defaults public="true" />
 
         <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
-            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
similarity index 77%
rename from src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/providers.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
index beef4bd035..dcea122341 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
@@ -18,8 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProvider">
-            <argument type="service" id="sylius.repository.payment_request" />
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsChecker">
             <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
index 41f4acb861..388451f650 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
@@ -19,7 +19,8 @@
         <defaults public="true" />
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler" abstract="true">
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface" />
@@ -38,7 +39,8 @@
         </service>
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler" abstract="true">
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Provider\PaymentRequestProviderInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
new file mode 100644
index 0000000000..37d1ef4f24
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
@@ -0,0 +1,24 @@
+<?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\Provider\GatewayFactoryNameProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProvider" />
+
+    </services>
+</container>

From 383b451f4c4f8bbe8b57d991c577eac882a4ffe8 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 23 Feb 2024 18:53:54 +0100
Subject: [PATCH 054/200] ECS fix

---
 .../Api/Shop/Checkout/CheckoutOrderDetailsContext.php    | 1 -
 .../ChosenPaymentRequestActionEligibilityValidator.php   | 2 ++
 .../Checker/PaymentRequestIntegrityChecker.php           | 9 +++++++++
 .../Checker/PaymentRequestIntegrityCheckerInterface.php  | 9 +++++++++
 .../Offline/CapturePaymentRequestHandler.php             | 1 -
 .../CommandHandler/Payum/TokenPaymentRequestHandler.php  | 2 +-
 .../ServiceProviderAwareCommandProviderInterface.php     | 9 +++++++++
 .../Provider/GatewayFactoryNameProvider.php              | 9 +++++++++
 .../Provider/GatewayFactoryNameProviderInterface.php     | 9 +++++++++
 .../DependencyInjection/SyliusPayumExtension.php         | 1 -
 10 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
index c05130fc41..223a11ddb4 100644
--- a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
+++ b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
@@ -59,7 +59,6 @@ final class CheckoutOrderDetailsContext implements Context
         Assert::notEq($state, PaymentInterface::STATE_NEW);
     }
 
-
     private function getLatestPaymentState(): ?string
     {
         $response = $this->client->show(Resources::ORDERS, $this->sharedStorage->get('cart_token'));
diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
index 81df42cd68..f404e921fe 100644
--- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
+++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
@@ -32,6 +32,7 @@ final class ChosenPaymentRequestActionEligibilityValidator extends ConstraintVal
         private GatewayFactoryNameProviderInterface $gatewayFactoryNameProvider,
     ) {
     }
+
     public function validate(mixed $value, Constraint $constraint): void
     {
         Assert::isInstanceOf($value, AddPaymentRequest::class);
@@ -77,6 +78,7 @@ final class ChosenPaymentRequestActionEligibilityValidator extends ConstraintVal
 
         $factoryName = $this->gatewayFactoryNameProvider->provide($paymentMethod);
         $commandProvider = $this->gatewayFactoryCommandProvider->getCommandProvider($factoryName);
+
         return $commandProvider ?? null;
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
index e98ec34f3c..23ff9bfd9c 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php
index f3bfecdc59..549dbf1fd6 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index cdafc42642..92fef70933 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -22,7 +22,6 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 /** @experimental */
 final class CapturePaymentRequestHandler implements MessageHandlerInterface
 {
-
     public function __construct(
         private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
         private CaptureProcessorInterface $offlineCaptureProcessor,
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index e60b5c38f4..6cb44f488b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -15,8 +15,8 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
index 9f0a54eefd..40ae45672d 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
index facaf0a68d..8564fdadd4 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
index b8210e527e..e17a6f11a1 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
index 6ec8ebce9d..7cb47ead5e 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\DependencyInjection;
 
-use Payum\Offline\OfflineGatewayFactory;
 use Payum\Paypal\ExpressCheckout\Nvp\PaypalExpressCheckoutGatewayFactory;
 use Payum\Stripe\StripeCheckoutGatewayFactory;
 use Sylius\Bundle\PayumBundle\Attribute\AsGatewayConfigurationType;

From 74f003fefafb4894817b93c373406efd3a5b69b6 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 23 Feb 2024 19:34:13 +0100
Subject: [PATCH 055/200] Re-Delete unecessary spec test

---
 .../PaymentStateMachineTransitionApplicatorSpec.php   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/spec/Applicator/PaymentStateMachineTransitionApplicatorSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Applicator/PaymentStateMachineTransitionApplicatorSpec.php
index 17697f8551..3b568d505b 100644
--- a/src/Sylius/Bundle/ApiBundle/spec/Applicator/PaymentStateMachineTransitionApplicatorSpec.php
+++ b/src/Sylius/Bundle/ApiBundle/spec/Applicator/PaymentStateMachineTransitionApplicatorSpec.php
@@ -40,17 +40,6 @@ final class PaymentStateMachineTransitionApplicatorSpec extends ObjectBehavior
         $this->complete($payment);
     }
 
-    function it_process_payment(
-        StateMachineFactoryInterface $stateMachineFactory,
-        PaymentInterface $payment,
-        WinzouStateMachine $stateMachine,
-    ): void {
-        $stateMachineFactory->get($payment, PaymentTransitions::GRAPH)->willReturn($stateMachine);
-        $stateMachine->apply(PaymentTransitions::TRANSITION_PROCESS)->shouldBeCalled();
-
-        $this->process($payment);
-    }
-
     function it_throws_exception_if_cannot_complete_payment(
         StateMachineFactoryInterface $stateMachineFactory,
         PaymentInterface $payment,

From acd6e8c5ad5a3e435383a18cc828bb2014dc1bbc Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 11:13:19 +0100
Subject: [PATCH 056/200] Rename and refactor duplication checker repository
 method

---
 .../Checker/PaymentRequestDuplicationChecker.php           | 4 +---
 .../Doctrine/ORM/PaymentRequestRepository.php              | 7 +++++--
 .../Repository/PaymentRequestRepositoryInterface.php       | 5 +----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
index 69ba683192..58f3e0f57c 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
@@ -25,8 +25,6 @@ final class PaymentRequestDuplicationChecker implements PaymentRequestDuplicatio
 
     public function hasDuplicates(PaymentRequestInterface $paymentRequest): bool
     {
-        $paymentRequests = $this->paymentRequestRepository->findOtherExisting($paymentRequest);
-
-        return count($paymentRequests) > 0;
+        return $this->paymentRequestRepository->duplicateExists($paymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index 57af6835ef..afc8f1bcd1 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -24,9 +24,10 @@ use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
  */
 class PaymentRequestRepository extends EntityRepository implements PaymentRequestRepositoryInterface
 {
-    public function findOtherExisting(PaymentRequestInterface $paymentRequest): array
+    public function duplicateExists(PaymentRequestInterface $paymentRequest): bool
     {
-        return $this->createQueryBuilder('o')
+        /** @var PaymentRequestInterface[] $paymentRequests */
+        $paymentRequests = $this->createQueryBuilder('o')
             ->innerJoin('o.payment', 'payment')
             ->innerJoin('o.method', 'method')
             ->where('o != :paymentRequest')
@@ -42,6 +43,8 @@ class PaymentRequestRepository extends EntityRepository implements PaymentReques
             ->getQuery()
             ->getResult()
         ;
+
+        return count($paymentRequests) > 0;
     }
 
     public function findOneByHash(string $hash): ?PaymentRequestInterface
diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
index 00331ede59..bb4712e5a6 100644
--- a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -23,10 +23,7 @@ use Sylius\Component\Resource\Repository\RepositoryInterface;
  */
 interface PaymentRequestRepositoryInterface extends RepositoryInterface
 {
-    /**
-     * @return PaymentRequestInterface[]
-     */
-    public function findOtherExisting(PaymentRequestInterface $paymentRequest): array;
+    public function duplicateExists(PaymentRequestInterface $paymentRequest): bool;
 
     public function findOneByHash(string $hash): ?PaymentRequestInterface;
 }

From d32475c9386218180f85a1666ddbd600f5cd1efa Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 12:57:35 +0100
Subject: [PATCH 057/200] Payment and Method are now required

---
 .../Payment/AddPaymentRequestHandler.php      |  2 +-
 .../Migrations/Version20231106190918.php      |  4 +--
 .../Migrations/Version20240203222417.php      |  4 +--
 .../PaymentRequestIntegrityChecker.php        |  8 ++---
 .../Payum/ModelPaymentRequestHandler.php      |  2 --
 .../GatewayFactoryCommandProvider.php         |  3 +-
 .../Payum/Factory/PayumTokenFactory.php       |  6 ++--
 .../Offline/AfterCaptureProcessor.php         |  2 --
 .../Processor/Offline/CaptureProcessor.php    |  2 --
 .../DependencyInjection/Configuration.php     |  3 +-
 .../doctrine/model/PaymentRequest.orm.xml     |  4 +--
 .../Payment/Factory/PaymentRequestFactory.php | 34 +++++++++----------
 .../PaymentRequestFactoryInterface.php        |  2 +-
 .../Payment/Model/PaymentRequest.php          | 18 +++++-----
 .../Payment/Model/PaymentRequestInterface.php |  8 ++---
 .../Payment/spec/Model/PaymentRequestSpec.php | 27 +++++++++------
 16 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index fe43649cbe..bdff6a045b 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -61,7 +61,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
             sprintf('Payment (id "%s") not found.', $addPaymentRequest->getPaymentId()),
         );
 
-        $paymentRequest = $this->paymentRequestFactory->createWithPaymentAndPaymentMethod($payment, $paymentMethod);
+        $paymentRequest = $this->paymentRequestFactory->create($payment, $paymentMethod);
         $paymentRequest->setAction($addPaymentRequest->getAction());
         $paymentRequest->setPayload($addPaymentRequest->getPayload());
 
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
index c2c4e20aa5..6724aba8a8 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20231106190918.php
@@ -25,8 +25,8 @@ final class Version20231106190918 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE sylius_payment_request (hash BINARY(16) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id)');
+        $this->addSql('CREATE TABLE sylius_payment_request (hash BINARY(16) NOT NULL COMMENT \'(DC2Type:uuid)\', method_id INT NOT NULL, payment_id INT NOT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, payload LONGTEXT NOT NULL COMMENT \'(DC2Type:object)\', response_data JSON NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_86D904B19883967 (method_id), INDEX IDX_86D904B4C3A3BB (payment_id), PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id) ON DELETE CASCADE');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id)');
     }
 
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
index 6f76210344..ad3315b49f 100644
--- a/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
+++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20240203222417.php
@@ -25,12 +25,12 @@ final class Version20240203222417 extends AbstractPostgreSQLMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql('CREATE TABLE sylius_payment_request (hash UUID NOT NULL, method_id INT DEFAULT NULL, payment_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, payload TEXT NOT NULL, response_data JSON NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(hash))');
+        $this->addSql('CREATE TABLE sylius_payment_request (hash UUID NOT NULL, method_id INT NOT NULL, payment_id INT NOT NULL, state VARCHAR(255) NOT NULL, action VARCHAR(255) NOT NULL, payload TEXT NOT NULL, response_data JSON NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(hash))');
         $this->addSql('CREATE INDEX IDX_86D904B19883967 ON sylius_payment_request (method_id)');
         $this->addSql('CREATE INDEX IDX_86D904B4C3A3BB ON sylius_payment_request (payment_id)');
         $this->addSql('COMMENT ON COLUMN sylius_payment_request.hash IS \'(DC2Type:uuid)\'');
         $this->addSql('COMMENT ON COLUMN sylius_payment_request.payload IS \'(DC2Type:object)\'');
-        $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B19883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE sylius_payment_request ADD CONSTRAINT FK_86D904B4C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
index 23ff9bfd9c..601aecea2f 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
@@ -34,15 +34,11 @@ final class PaymentRequestIntegrityChecker implements PaymentRequestIntegrityChe
         $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
         Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
 
-        /** @var PaymentMethodInterface|null $paymentMethod */
+        /** @var PaymentMethodInterface $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod, 'Payment cannot be null.');
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig, 'Payment method cannot be null.');
-
-        $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment, 'Payment cannot be null.');
+        Assert::notNull($gatewayConfig, 'Gateway config cannot be null.');
 
         return $paymentRequest;
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
index 49357b14e6..b6102be78b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
@@ -19,7 +19,6 @@ use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheck
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
-use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
@@ -38,7 +37,6 @@ final class ModelPaymentRequestHandler implements MessageHandlerInterface
         $paymentRequest = $this->paymentRequestIntegrityChecker->check($command);
         $this->payumRequirementsChecker->check($paymentRequest);
 
-        /** @var PaymentInterface $payment */
         $payment = $paymentRequest->getPayment();
         $request = $this->factory->createNewWithModel($payment);
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
index 68832ab705..3dec6e3be7 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
@@ -70,9 +70,8 @@ final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommand
 
     private function getFactoryName(PaymentRequestInterface $paymentRequest): string
     {
-        /** @var PaymentMethodInterface|null $paymentMethod */
+        /** @var PaymentMethodInterface $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod, 'Payment method cannot be null.');
 
         $factoryName = $this->gatewayFactoryNameProvider->provide($paymentMethod);
         Assert::notNull($factoryName, 'Gateway config cannot be null.');
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index ab47d603b8..48104ad406 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -28,14 +28,12 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
     public function createNew(PaymentRequestInterface $paymentRequest): TokenInterface
     {
         $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment);
 
-        /** @var PaymentMethodInterface|null $paymentMethod */
+        /** @var PaymentMethodInterface $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
-        Assert::notNull($paymentMethod);
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig);
+        Assert::notNull($gatewayConfig, 'Gateway config cannot be null.');
 
         $gatewayName = $gatewayConfig->getGatewayName();
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
index 2ab5a7bfb4..bd77bbc3af 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
@@ -17,7 +17,6 @@ use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
 use Sylius\Abstraction\StateMachine\StateMachineInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\PaymentTransitions;
-use Webmozart\Assert\Assert;
 
 final class AfterCaptureProcessor implements AfterCaptureProcessorInterface
 {
@@ -40,7 +39,6 @@ final class AfterCaptureProcessor implements AfterCaptureProcessorInterface
     public function process(PaymentRequestInterface $paymentRequest): void
     {
         $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment);
 
         $stateMachine = $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH);
         if ($paymentRequest->getResponseData()['paid']) {
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
index 000705d13b..3d962122b0 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
@@ -15,14 +15,12 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
 
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Webmozart\Assert\Assert;
 
 final class CaptureProcessor implements CaptureProcessorInterface
 {
     public function process(PaymentRequestInterface $paymentRequest): void
     {
         $payment = $paymentRequest->getPayment();
-        Assert::notNull($payment);
 
         $responseData = $payment->getDetails();
         if (PaymentInterface::STATE_NEW === $payment->getState()) {
diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
index f525bae9cb..0111312d81 100644
--- a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
@@ -18,6 +18,7 @@ use Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodType;
 use Sylius\Bundle\PaymentBundle\Form\Type\PaymentType;
 use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
+use Sylius\Component\Payment\Factory\PaymentRequestFactory;
 use Sylius\Component\Payment\Model\Payment;
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentMethod;
@@ -131,7 +132,7 @@ final class Configuration implements ConfigurationInterface
                                         ->scalarNode('interface')->defaultValue(PaymentRequestInterface::class)->cannotBeEmpty()->end()
                                         ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
                                         ->scalarNode('repository')->cannotBeEmpty()->end()
-                                        ->scalarNode('factory')->defaultValue(Factory::class)->end()
+                                        ->scalarNode('factory')->defaultValue(PaymentRequestFactory::class)->end()
                                         ->scalarNode('form')->defaultValue(null)->end()
                                     ->end()
                                 ->end()
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index 195b109e48..476b0bf906 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -21,11 +21,11 @@
         </id>
 
         <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="CASCADE" />
+            <join-column name="method_id" referenced-column-name="id" nullable="false" on-delete="CASCADE" />
         </many-to-one>
 
         <many-to-one field="payment" target-entity="Sylius\Component\Payment\Model\PaymentInterface">
-            <join-column name="payment_id" referenced-column-name="id" nullable="true" on-delete="SET NULL" />
+            <join-column name="payment_id" referenced-column-name="id" nullable="false" />
         </many-to-one>
 
         <field name="state" column="state" type="string" />
diff --git a/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php b/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
index 5c65ab32a1..15bc73eff0 100644
--- a/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
+++ b/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
@@ -16,39 +16,39 @@ namespace Sylius\Component\Payment\Factory;
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
+use Sylius\Component\Resource\Exception\UnsupportedMethodException;
+use Webmozart\Assert\Assert;
 
 /**
  * @implements PaymentRequestFactoryInterface<PaymentRequestInterface>
  */
 final class PaymentRequestFactory implements PaymentRequestFactoryInterface
 {
-    public function __construct(private FactoryInterface $factory)
+    public function __construct(private string $className)
     {
+        if (!is_a($className, PaymentRequestInterface::class, true)) {
+            throw new \DomainException(sprintf(
+                'This factory requires %s or its descend to be used as resource',
+                PaymentRequestInterface::class,
+            ));
+        }
     }
 
-    public function createNew(): PaymentRequestInterface
+    /**
+     * @throws UnsupportedMethodException
+     */
+    public function createNew(): object
     {
-        return $this->factory->createNew();
+        throw new UnsupportedMethodException('createNew');
     }
 
-    public function createWithPaymentAndPaymentMethod(PaymentInterface $payment, PaymentMethodInterface $paymentMethod): PaymentRequestInterface
+    public function create(PaymentInterface $payment, PaymentMethodInterface $paymentMethod): PaymentRequestInterface
     {
-        $paymentRequest = $this->createNew();
-
-        $paymentRequest->setPayment($payment);
-        $paymentRequest->setMethod($paymentMethod);
-
-        return $paymentRequest;
+        return new $this->className($payment, $paymentMethod);
     }
 
     public function createFromPaymentRequest(PaymentRequestInterface $paymentRequest): PaymentRequestInterface
     {
-        $newPaymentRequest = $this->createNew();
-
-        $newPaymentRequest->setPayment($paymentRequest->getPayment());
-        $newPaymentRequest->setMethod($paymentRequest->getMethod());
-
-        return $newPaymentRequest;
+        return $this->create($paymentRequest->getPayment(), $paymentRequest->getMethod());
     }
 }
diff --git a/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php b/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php
index 2b0243783a..a2ff987ea5 100644
--- a/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php
+++ b/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php
@@ -25,7 +25,7 @@ use Sylius\Component\Resource\Factory\FactoryInterface;
  */
 interface PaymentRequestFactoryInterface extends FactoryInterface
 {
-    public function createWithPaymentAndPaymentMethod(PaymentInterface $payment, PaymentMethodInterface $paymentMethod): PaymentRequestInterface;
+    public function create(PaymentInterface $payment, PaymentMethodInterface $paymentMethod): PaymentRequestInterface;
 
     public function createFromPaymentRequest(PaymentRequestInterface $paymentRequest): PaymentRequestInterface;
 }
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index bdd75c3ed1..da7f901efe 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -22,10 +22,6 @@ class PaymentRequest implements PaymentRequestInterface
 
     protected ?Uuid $hash = null;
 
-    protected ?PaymentMethodInterface $method = null;
-
-    protected ?PaymentInterface $payment = null;
-
     protected string $state = PaymentRequestInterface::STATE_NEW;
 
     protected string $action = PaymentRequestInterface::ACTION_CAPTURE;
@@ -34,8 +30,10 @@ class PaymentRequest implements PaymentRequestInterface
 
     protected array $responseData = [];
 
-    public function __construct()
-    {
+    public function __construct(
+        protected PaymentInterface $payment,
+        protected PaymentMethodInterface $method,
+    ) {
         $this->createdAt = new \DateTime();
     }
 
@@ -49,22 +47,22 @@ class PaymentRequest implements PaymentRequestInterface
         return $this->hash;
     }
 
-    public function getMethod(): ?PaymentMethodInterface
+    public function getMethod(): PaymentMethodInterface
     {
         return $this->method;
     }
 
-    public function setMethod(?PaymentMethodInterface $method): void
+    public function setMethod(PaymentMethodInterface $method): void
     {
         $this->method = $method;
     }
 
-    public function getPayment(): ?PaymentInterface
+    public function getPayment(): PaymentInterface
     {
         return $this->payment;
     }
 
-    public function setPayment(?PaymentInterface $payment): void
+    public function setPayment(PaymentInterface $payment): void
     {
         $this->payment = $payment;
     }
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index 52ad92408b..ddd205ee35 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -43,13 +43,13 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public function getHash(): ?Uuid;
 
-    public function getMethod(): ?PaymentMethodInterface;
+    public function getMethod(): PaymentMethodInterface;
 
-    public function setMethod(?PaymentMethodInterface $method): void;
+    public function setMethod(PaymentMethodInterface $method): void;
 
-    public function getPayment(): ?PaymentInterface;
+    public function getPayment(): PaymentInterface;
 
-    public function setPayment(?PaymentInterface $payment): void;
+    public function setPayment(PaymentInterface $payment): void;
 
     public function getState(): string;
 
diff --git a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
index 52c340ffe9..ee6731a38b 100644
--- a/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
+++ b/src/Sylius/Component/Payment/spec/Model/PaymentRequestSpec.php
@@ -21,6 +21,11 @@ use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class PaymentRequestSpec extends ObjectBehavior
 {
+    function let(PaymentInterface $payment, PaymentMethodInterface $method): void
+    {
+        $this->beConstructedWith($payment, $method);
+    }
+
     function it_implements_sylius_payment_request_interface(): void
     {
         $this->shouldImplement(PaymentRequestInterface::class);
@@ -31,9 +36,14 @@ final class PaymentRequestSpec extends ObjectBehavior
         $this->getId()->shouldReturn(null);
     }
 
-    function it_has_no_payment_method_by_default(): void
+    function it_has_a_payment_by_default(): void
     {
-        $this->getMethod()->shouldReturn(null);
+        $this->getPayment()->shouldReturnAnInstanceOf(PaymentInterface::class);
+    }
+
+    function it_has_a_payment_method_by_default(): void
+    {
+        $this->getMethod()->shouldReturnAnInstanceOf(PaymentMethodInterface::class);
     }
 
     function its_payment_method_is_mutable(PaymentMethodInterface $method): void
@@ -42,11 +52,6 @@ final class PaymentRequestSpec extends ObjectBehavior
         $this->getMethod()->shouldReturn($method);
     }
 
-    function it_has_no_payment_by_default(): void
-    {
-        $this->getPayment()->shouldReturn(null);
-    }
-
     function its_payment_is_mutable(PaymentInterface $payment): void
     {
         $this->setPayment($payment);
@@ -75,24 +80,24 @@ final class PaymentRequestSpec extends ObjectBehavior
         $this->getAction()->shouldReturn('test_action');
     }
 
-    function it_has_null_data_by_default(): void
+    function it_has_null_payload_by_default(): void
     {
         $this->getPayload()->shouldReturn(null);
     }
 
-    function its_data_is_mutable(): void
+    function its_payload_is_mutable(): void
     {
         $stdClass = new stdClass();
         $this->setPayload($stdClass);
         $this->getPayload()->shouldReturn($stdClass);
     }
 
-    function it_has_empty_array_details_by_default(): void
+    function it_has_empty_array_response_data_by_default(): void
     {
         $this->getResponseData()->shouldReturn([]);
     }
 
-    function its_details_are_mutable(): void
+    function its_response_data_are_mutable(): void
     {
         $this->setResponseData(['foo', 'bar']);
         $this->getResponseData()->shouldReturn(['foo', 'bar']);

From dc447097a8aab835e88519dcdc28028552b38d85 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:55:46 +0100
Subject: [PATCH 058/200] Fix service definition

---
 .../Resources/config/services/command_handlers.xml     |  2 +-
 .../CoreBundle/Resources/config/app/messenger.yaml     | 10 ++++++++++
 .../services/payment_request/payum/processors.xml      |  2 +-
 .../Bundle/PaymentBundle/Resources/config/services.xml |  5 -----
 .../Payment/Factory/PaymentRequestFactory.php          |  1 -
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 0c1daf639c..0ad827abc2 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -240,7 +240,7 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\AddPaymentRequestHandler">
-            <argument type="service" id="sylius.custom_factory.payment_request" />
+            <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
index d1d1e47018..7e6dac8e74 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
@@ -3,11 +3,15 @@ parameters:
     env(SYLIUS_MESSENGER_TRANSPORT_MAIN_FAILED_DSN): 'doctrine://default?queue_name=main_failed'
     env(SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_DSN): 'doctrine://default?queue_name=catalog_promotion_removal'
     env(SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_FAILED_DSN): 'doctrine://default?queue_name=catalog_promotion_removal_failed'
+    env(SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_DSN): 'doctrine://default?queue_name=payment_request'
+    env(SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_FAILED_DSN): 'doctrine://default?queue_name=payment_request_failed'
 
     sylius_messenger_transport_main_dsn: '%env(resolve:SYLIUS_MESSENGER_TRANSPORT_MAIN_DSN)%'
     sylius_messenger_transport_main_failed_dsn: '%env(resolve:SYLIUS_MESSENGER_TRANSPORT_MAIN_FAILED_DSN)%'
     sylius_messenger_transport_catalog_promotion_removal_dsn: '%env(resolve:SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_DSN)%'
     sylius_messenger_transport_catalog_promotion_removal_failed_dsn: '%env(resolve:SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_FAILED_DSN)%'
+    sylius_messenger_transport_payment_request_dsn: '%env(resolve:SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_DSN)%'
+    sylius_messenger_transport_payment_request_failed_dsn: '%env(resolve:SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_FAILED_DSN)%'
 
 framework:
     messenger:
@@ -22,11 +26,17 @@ framework:
                 failure_transport: 'catalog_promotion_removal_failed'
             catalog_promotion_removal_failed:
                 dsn: '%sylius_messenger_transport_catalog_promotion_removal_failed_dsn%'
+            payment_request:
+                dsn: '%sylius_messenger_transport_payment_request_dsn%'
+                failure_transport: 'payment_request_failed'
+            payment_request_failed:
+                dsn: '%sylius_messenger_transport_payment_request_failed_dsn%'
         reset_on_message: true
         routing:
             'Sylius\Bundle\CoreBundle\CatalogPromotion\Command\ApplyCatalogPromotionsOnVariants': main
             'Sylius\Bundle\CoreBundle\CatalogPromotion\Command\DisableCatalogPromotion': main
             'Sylius\Bundle\CoreBundle\CatalogPromotion\Command\RemoveCatalogPromotion': catalog_promotion_removal
+            'Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface': payment_request
             'Sylius\Bundle\CoreBundle\PriceHistory\Command\ApplyLowestPriceOnChannelPricings': main
             'Sylius\Component\Promotion\Event\CatalogPromotionCreated': main
             'Sylius\Component\Promotion\Event\CatalogPromotionEnded': main
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
index aa775ce196..16c1cb9d4a 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
@@ -19,7 +19,7 @@
         <defaults public="true" />
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessor">
-            <argument type="service" id="sylius.custom_factory.payment_request" />
+            <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
         </service>
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index a8a5f3cbeb..fb9fadbbe9 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -28,11 +28,6 @@
         </service>
         <service id="Sylius\Component\Payment\Factory\PaymentFactoryInterface" alias="sylius.factory.payment" />
 
-        <service id="sylius.custom_factory.payment_request" class="Sylius\Component\Payment\Factory\PaymentRequestFactory" decorates="sylius.factory.payment_request" decoration-priority="256" public="false">
-            <argument type="service" id="sylius.custom_factory.payment_request.inner" />
-        </service>
-        <service id="Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface" alias="sylius.factory.payment_request" />
-
         <service id="sylius.registry.payment_methods_resolver" class="Sylius\Component\Registry\PrioritizedServiceRegistry">
             <argument>%sylius.payment_methods_resolver.interface%</argument>
             <argument>Payment methods resolver</argument>
diff --git a/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php b/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
index 15bc73eff0..61e8f17b99 100644
--- a/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
+++ b/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
@@ -17,7 +17,6 @@ use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Resource\Exception\UnsupportedMethodException;
-use Webmozart\Assert\Assert;
 
 /**
  * @implements PaymentRequestFactoryInterface<PaymentRequestInterface>

From e83fa8f5c46c231375607ae2e6927cc3a0b50363 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:58:38 +0100
Subject: [PATCH 059/200] Use new transport for payment_request

---
 .env             | 2 ++
 .env.test        | 2 ++
 .env.test_cached | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/.env b/.env
index ae9dd9a66a..23eeec1158 100644
--- a/.env
+++ b/.env
@@ -36,6 +36,8 @@ SYLIUS_MESSENGER_TRANSPORT_MAIN_DSN=doctrine://default
 SYLIUS_MESSENGER_TRANSPORT_MAIN_FAILED_DSN=doctrine://default?queue_name=main_failed
 SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_DSN=doctrine://default?queue_name=catalog_promotion_removal
 SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_FAILED_DSN=doctrine://default?queue_name=catalog_promotion_removal_failed
+SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_DSN=doctrine://default?queue_name=payment_request
+SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_FAILED_DSN=doctrine://default?queue_name=payment_request_failed
 ###< symfony/messenger ###
 
 ###> symfony/mailer ###
diff --git a/.env.test b/.env.test
index f77c248753..ac192d5cad 100644
--- a/.env.test
+++ b/.env.test
@@ -13,6 +13,8 @@ SYLIUS_MESSENGER_TRANSPORT_MAIN_DSN=sync://
 SYLIUS_MESSENGER_TRANSPORT_MAIN_FAILED_DSN=sync://
 SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_DSN=sync://
 SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_FAILED_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_FAILED_DSN=sync://
 ###< symfony/messenger ###
 
 MAILER_DSN=null://null
diff --git a/.env.test_cached b/.env.test_cached
index ea9c95ca96..e278eea0cc 100644
--- a/.env.test_cached
+++ b/.env.test_cached
@@ -14,6 +14,8 @@ SYLIUS_MESSENGER_TRANSPORT_MAIN_DSN=sync://
 SYLIUS_MESSENGER_TRANSPORT_MAIN_FAILED_DSN=sync://
 SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_DSN=sync://
 SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_FAILED_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_FAILED_DSN=sync://
 ###< symfony/messenger ###
 
 MAILER_DSN=null://null

From 7858f82eb45efd4b716aa8ec2b2c5e657bf9bb21 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 16:18:09 +0100
Subject: [PATCH 060/200] Revert, even if it works it's not the purpose of this
 PR

---
 .../CoreBundle/Resources/config/services/fixtures_factories.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml
index bcc182fde8..90c9ca561a 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml
@@ -32,7 +32,7 @@
         </service>
 
         <service id="sylius.fixture.example_factory.payment_method" class="Sylius\Bundle\CoreBundle\Fixture\Factory\PaymentMethodExampleFactory">
-            <argument type="service" id="sylius.custom_factory.payment_method" />
+            <argument type="service" id="sylius.factory.payment_method" />
             <argument type="service" id="sylius.repository.locale" />
             <argument type="service" id="sylius.repository.channel" />
         </service>

From ff0842df35b586a5e8ff625cff931d2d0ea370e6 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 16:39:06 +0100
Subject: [PATCH 061/200] Fix Postgresql error when select UUID binary value

---
 .../PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index afc8f1bcd1..e4d17dda10 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Doctrine\ORM;
 
+use Doctrine\DBAL\ParameterType;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
@@ -55,7 +56,7 @@ class PaymentRequestRepository extends EntityRepository implements PaymentReques
             ->innerJoin('o.payment', 'payment')
             ->innerJoin('o.method', 'method')
             ->where('o.hash = :hash')
-            ->setParameter('hash', $hash)
+            ->setParameter('hash', $hash, ParameterType::BINARY)
             ->getQuery()
             ->getOneOrNullResult()
         ;

From f2b5a1fe341c780a9cb6f2b8f2cc39803b8892f8 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:06:04 +0100
Subject: [PATCH 062/200] Fix typo

Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
---
 src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php b/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
index 61e8f17b99..a1ecd8025f 100644
--- a/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
+++ b/src/Sylius/Component/Payment/Factory/PaymentRequestFactory.php
@@ -27,7 +27,7 @@ final class PaymentRequestFactory implements PaymentRequestFactoryInterface
     {
         if (!is_a($className, PaymentRequestInterface::class, true)) {
             throw new \DomainException(sprintf(
-                'This factory requires %s or its descend to be used as resource',
+                'This factory requires %s or its descendant to be used as resource',
                 PaymentRequestInterface::class,
             ));
         }

From f774574c758623989a99fc85921d61f6f0291dd3 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:10:04 +0100
Subject: [PATCH 063/200] Add Cancel action

---
 src/Sylius/Component/Payment/Model/PaymentRequestInterface.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index ddd205ee35..171c71034e 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -35,6 +35,8 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public const ACTION_REFUND = 'refund';
 
+    public const ACTION_CANCEL = 'cancel';
+
     public const ACTION_STATUS = 'status';
 
     public const ACTION_SYNC = 'sync';

From 58bc3e19089c81ea0c7a732ee2748b3e3bfadbb4 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:35:07 +0100
Subject: [PATCH 064/200] Fix typo

Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
---
 .../PaymentRequest/Payum/Factory/PayumTokenFactory.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index 48104ad406..aea7b77aab 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -48,7 +48,7 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
         Assert::notNull($payload, 'The request payload need to be not null!');
 
         $targetPath = $payload['target_path'] ?? null;
-        Assert::notNull($targetPath, 'The request payload must have a "target_path" field!');
+        Assert::notNull($targetPath, 'The request payload must have a "target_path" field not null.');
 
         $targetPathParameters = $payload['target_path_parameters'] ?? [];
 

From dee9312473cd946d500cb372887ac0e7d116ee7f Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:36:49 +0100
Subject: [PATCH 065/200] Drop "!"

Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
---
 .../PaymentRequest/Payum/Factory/PayumTokenFactory.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index aea7b77aab..15543978fc 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -45,7 +45,7 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
          * }|null $payload
          */
         $payload = $paymentRequest->getPayload();
-        Assert::notNull($payload, 'The request payload need to be not null!');
+        Assert::notNull($payload, 'The request payload need to be not null');
 
         $targetPath = $payload['target_path'] ?? null;
         Assert::notNull($targetPath, 'The request payload must have a "target_path" field not null.');

From 03f0d29ad34e16a155f9027e0dfc2933d8bea411 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:37:51 +0100
Subject: [PATCH 066/200] Reorder methods

---
 .../Payment/Model/PaymentRequest.php          | 30 +++++++++----------
 .../Payment/Model/PaymentRequestInterface.php | 18 ++++++-----
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index da7f901efe..efb67fc8b7 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -47,26 +47,11 @@ class PaymentRequest implements PaymentRequestInterface
         return $this->hash;
     }
 
-    public function getMethod(): PaymentMethodInterface
-    {
-        return $this->method;
-    }
-
-    public function setMethod(PaymentMethodInterface $method): void
-    {
-        $this->method = $method;
-    }
-
     public function getPayment(): PaymentInterface
     {
         return $this->payment;
     }
 
-    public function setPayment(PaymentInterface $payment): void
-    {
-        $this->payment = $payment;
-    }
-
     public function getState(): string
     {
         return $this->state;
@@ -106,4 +91,19 @@ class PaymentRequest implements PaymentRequestInterface
     {
         $this->responseData = $responseData;
     }
+
+    public function setPayment(PaymentInterface $payment): void
+    {
+        $this->payment = $payment;
+    }
+
+    public function getMethod(): PaymentMethodInterface
+    {
+        return $this->method;
+    }
+
+    public function setMethod(PaymentMethodInterface $method): void
+    {
+        $this->method = $method;
+    }
 }
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index 171c71034e..627be94c1d 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -43,16 +43,10 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public const ACTION_PAYOUT = 'payout';
 
+    public function getId(): ?string;
+
     public function getHash(): ?Uuid;
 
-    public function getMethod(): PaymentMethodInterface;
-
-    public function setMethod(PaymentMethodInterface $method): void;
-
-    public function getPayment(): PaymentInterface;
-
-    public function setPayment(PaymentInterface $payment): void;
-
     public function getState(): string;
 
     public function setState(string $state): void;
@@ -68,4 +62,12 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
     public function getResponseData(): array;
 
     public function setResponseData(array $responseData): void;
+
+    public function getPayment(): PaymentInterface;
+
+    public function setPayment(PaymentInterface $payment): void;
+
+    public function getMethod(): PaymentMethodInterface;
+
+    public function setMethod(PaymentMethodInterface $method): void;
 }

From bac9402bb36e2b8f4fb6553462d6f76bc63f1052 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:38:41 +0100
Subject: [PATCH 067/200] Fix sentences

---
 .../PaymentRequest/Payum/Factory/PayumTokenFactory.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index 15543978fc..0ceec53d64 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -48,12 +48,12 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
         Assert::notNull($payload, 'The request payload need to be not null');
 
         $targetPath = $payload['target_path'] ?? null;
-        Assert::notNull($targetPath, 'The request payload must have a "target_path" field not null.');
+        Assert::notNull($targetPath, 'The request payload must have a "target_path" field not null');
 
         $targetPathParameters = $payload['target_path_parameters'] ?? [];
 
         $afterPath = $payload['after_path'] ?? null;
-        Assert::notNull($afterPath, 'The request payload must have an "after_path" field!');
+        Assert::notNull($afterPath, 'The request payload must have an "after_path" field not null');
 
         $afterPathParameters = $payload['after_path_parameters'] ?? [];
 

From 2766c0109ed6e810277b1e5893e402d2e592cba0 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:50:51 +0100
Subject: [PATCH 068/200] Inline type

---
 .../ServiceProviderAwareCommandProviderInterface.php          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
index 40ae45672d..3c0412c52e 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
@@ -17,8 +17,6 @@ interface ServiceProviderAwareCommandProviderInterface extends PaymentRequestCom
 {
     public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface;
 
-    /**
-     * @return string[]
-     */
+    /** @return string[] */
     public function getCommandProviderIndex(): array;
 }

From 980b517e75465ec3fc8d66469427efc596fcd90f Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:51:19 +0100
Subject: [PATCH 069/200] Refactor to a Resolver

---
 .../CommandHandler/Payum/ModelPaymentRequestHandler.php    | 6 +++---
 .../CommandHandler/Payum/TokenPaymentRequestHandler.php    | 6 +++---
 ...irementsChecker.php => DoctrineProxyObjectResolver.php} | 7 +++----
 ...erface.php => DoctrineProxyObjectResolverInterface.php} | 4 ++--
 .../config/services/payment_request/payum/checkers.xml     | 2 +-
 .../services/payment_request/payum/command_handlers.xml    | 4 ++--
 6 files changed, 14 insertions(+), 15 deletions(-)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/{PayumRequirementsChecker.php => DoctrineProxyObjectResolver.php} (75%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/{PayumRequirementsCheckerInterface.php => DoctrineProxyObjectResolverInterface.php} (75%)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
index b6102be78b..e641daa822 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
@@ -26,7 +26,7 @@ final class ModelPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
-        private PayumRequirementsCheckerInterface $payumRequirementsChecker,
+        private DoctrineProxyObjectResolverInterface $doctrineProxyObjectResolver,
         private RequestProcessorInterface $requestProcessor,
         private GetStatusFactoryInterface $factory,
     ) {
@@ -35,7 +35,7 @@ final class ModelPaymentRequestHandler implements MessageHandlerInterface
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
         $paymentRequest = $this->paymentRequestIntegrityChecker->check($command);
-        $this->payumRequirementsChecker->check($paymentRequest);
+        $this->doctrineProxyObjectResolver->resolve($paymentRequest);
 
         $payment = $paymentRequest->getPayment();
         $request = $this->factory->createNewWithModel($payment);
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index 6cb44f488b..b9c75df49c 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
@@ -27,7 +27,7 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
-        private PayumRequirementsCheckerInterface $payumRequirementsChecker,
+        private DoctrineProxyObjectResolverInterface $doctrineProxyObjectResolver,
         private PayumTokenFactoryInterface $payumTokenFactory,
         private RequestProcessorInterface $requestProcessor,
         private AfterTokenRequestProcessorInterface $afterTokenRequestProcessor,
@@ -38,7 +38,7 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
         $paymentRequest = $this->paymentRequestIntegrityChecker->check($command);
-        $this->payumRequirementsChecker->check($paymentRequest);
+        $this->doctrineProxyObjectResolver->resolve($paymentRequest);
 
         $token = $this->payumTokenFactory->createNew($paymentRequest);
         $request = $this->payumRequestFactory->createNewWithToken($token);
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolver.php
similarity index 75%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsChecker.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolver.php
index 4c1a7fe0be..a2477fabcb 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsChecker.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolver.php
@@ -18,17 +18,16 @@ use Doctrine\Persistence\Proxy;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-final class PayumRequirementsChecker implements PayumRequirementsCheckerInterface
+final class DoctrineProxyObjectResolver implements DoctrineProxyObjectResolverInterface
 {
     public function __construct(
         private EntityManagerInterface $entityManager,
     ) {
     }
 
-    public function check(PaymentRequestInterface $paymentRequest): void
+    public function resolve(PaymentRequestInterface $paymentRequest): void
     {
-        // Needed to get a real object to give to Payum which is not handling
-        // Proxy class from Doctrine when a token is created for ex.
+        // Resolve doctrine proxy object to 'real" one to be able to use it in Payum.
         $payment = $paymentRequest->getPayment();
         if ($payment instanceof Proxy) {
             $this->entityManager->detach($payment);
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsCheckerInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolverInterface.php
similarity index 75%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsCheckerInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolverInterface.php
index f6acea5c10..728cdc11e2 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/PayumRequirementsCheckerInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolverInterface.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface PayumRequirementsCheckerInterface
+interface DoctrineProxyObjectResolverInterface
 {
-    public function check(PaymentRequestInterface $paymentRequest): void;
+    public function resolve(PaymentRequestInterface $paymentRequest): void;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
index dcea122341..eec5fd0430 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsChecker">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolver">
             <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
index 388451f650..5706e729cd 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
@@ -20,7 +20,7 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface" />
@@ -40,7 +40,7 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\PayumRequirementsCheckerInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
         </service>
 

From 97703d4ba7851f1a1bb738c4d97a9a073909f9ce Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 29 Feb 2024 22:50:23 +0100
Subject: [PATCH 070/200] Rename Checker to Resolver

---
 .../CommandHandler/Payum/ModelPaymentRequestHandler.php       | 2 +-
 .../CommandHandler/Payum/TokenPaymentRequestHandler.php       | 2 +-
 .../{Checker => Resolver}/DoctrineProxyObjectResolver.php     | 2 +-
 .../DoctrineProxyObjectResolverInterface.php                  | 2 +-
 .../config/services/payment_request/payum/checkers.xml        | 2 +-
 .../services/payment_request/payum/command_handlers.xml       | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/{Checker => Resolver}/DoctrineProxyObjectResolver.php (94%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/{Checker => Resolver}/DoctrineProxyObjectResolverInterface.php (86%)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
index e641daa822..dacb23b649 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index b9c75df49c..5a80e63299 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory\PayumTokenFactoryInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolver.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Resolver/DoctrineProxyObjectResolver.php
similarity index 94%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolver.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Resolver/DoctrineProxyObjectResolver.php
index a2477fabcb..051d5ac5f7 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolver.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Resolver/DoctrineProxyObjectResolver.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\Proxy;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolverInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Resolver/DoctrineProxyObjectResolverInterface.php
similarity index 86%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolverInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Resolver/DoctrineProxyObjectResolverInterface.php
index 728cdc11e2..2d63309145 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Checker/DoctrineProxyObjectResolverInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Resolver/DoctrineProxyObjectResolverInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
index eec5fd0430..2901d3a7ad 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolver">
+        <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>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
index 5706e729cd..34e17d3d9e 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
@@ -20,7 +20,7 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface" />
+            <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\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface" />
@@ -40,7 +40,7 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler" abstract="true">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Checker\DoctrineProxyObjectResolverInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
         </service>
 

From 11e5adf3c5611f1d37f0f23607aa893d6d620810 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:24:41 +0100
Subject: [PATCH 071/200] Introducing PaymentRequestAnnoncer same as
 CatalogPromotionAnnouncer

---
 .../Payment/AddPaymentRequestHandler.php      |  8 +--
 .../Payment/UpdatePaymentRequestHandler.php   |  4 --
 .../PaymentRequestEventSubscriber.php         | 56 +++++++++++++++++++
 .../config/services/command_handlers.xml      |  5 +-
 .../config/services/event_subscribers.xml     |  5 ++
 .../PaymentRequestAnnouncer.php}              | 15 +----
 .../PaymentRequestAnnouncerInterface.php}     |  8 +--
 .../Payum/TokenPaymentRequestHandler.php      |  2 +-
 .../Payum/AfterTokenRequestProcessor.php      | 10 +++-
 .../{command_dispatcher.xml => announcer.xml} |  3 +-
 .../payment_request/payum/processors.xml      |  3 +-
 .../payum/{checkers.xml => resolver.xml}      |  0
 12 files changed, 84 insertions(+), 35 deletions(-)
 create mode 100644 src/Sylius/Bundle/ApiBundle/EventSubscriber/PaymentRequestEventSubscriber.php
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{CommandDispatcher/PaymentRequestCommandDispatcher.php => Announcer/PaymentRequestAnnouncer.php} (63%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{CommandDispatcher/PaymentRequestCommandDispatcherInterface.php => Announcer/PaymentRequestAnnouncerInterface.php} (53%)
 rename src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/{command_dispatcher.xml => announcer.xml} (71%)
 rename src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/{checkers.xml => resolver.xml} (100%)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index bdff6a045b..56c10c3de1 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -14,13 +14,13 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
 use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
@@ -28,10 +28,10 @@ use Webmozart\Assert\Assert;
 final class AddPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private PaymentRequestFactoryInterface $paymentRequestFactory,
         private PaymentMethodRepositoryInterface $paymentMethodRepository,
         private PaymentRepositoryInterface $paymentRepository,
-        private PaymentRequestCommandDispatcherInterface $paymentRequestCommandDispatcher,
+        private PaymentRequestFactoryInterface $paymentRequestFactory,
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
     ) {
     }
 
@@ -39,7 +39,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
     {
         $paymentRequest = $this->createPaymentRequest($addPaymentRequest);
 
-        $this->paymentRequestCommandDispatcher->add($paymentRequest);
+        $this->paymentRequestRepository->add($paymentRequest);
 
         return $paymentRequest;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 3934269613..1424640c06 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
@@ -25,7 +24,6 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
-        private PaymentRequestCommandDispatcherInterface $paymentRequestCommandDispatcher,
     ) {
     }
 
@@ -39,8 +37,6 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
 
         $paymentRequest->setPayload($updatePaymentRequest->getPayload());
 
-        $this->paymentRequestCommandDispatcher->add($paymentRequest);
-
         return $paymentRequest;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/EventSubscriber/PaymentRequestEventSubscriber.php b/src/Sylius/Bundle/ApiBundle/EventSubscriber/PaymentRequestEventSubscriber.php
new file mode 100644
index 0000000000..7aa2f39558
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/EventSubscriber/PaymentRequestEventSubscriber.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\EventSubscriber;
+
+use ApiPlatform\Core\EventListener\EventPriorities;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\ViewEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+final class PaymentRequestEventSubscriber implements EventSubscriberInterface
+{
+    public function __construct(private PaymentRequestAnnouncerInterface $paymentMethodAnnouncer)
+    {
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            KernelEvents::VIEW => ['postWrite', EventPriorities::POST_WRITE],
+        ];
+    }
+
+    public function postWrite(ViewEvent $event): void
+    {
+        $paymentRequest = $event->getControllerResult();
+
+        if (!$paymentRequest instanceof PaymentRequestInterface) {
+            return;
+        }
+
+        $method = $event->getRequest()->getMethod();
+        if ($method === Request::METHOD_POST) {
+            $this->paymentMethodAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
+
+            return;
+        }
+
+        if (in_array($method, [Request::METHOD_PUT, Request::METHOD_PATCH], true)) {
+            $this->paymentMethodAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
+        }
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 0ad827abc2..8f3b90b4f7 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -240,17 +240,16 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\AddPaymentRequestHandler">
-            <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.repository.payment" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
+            <argument type="service" id="sylius.factory.payment_request" />
+            <argument type="service" id="sylius.repository.payment_request" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\CommandHandler\Payment\UpdatePaymentRequestHandler">
             <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml
index 6e6b43702b..5f86bcdda4 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml
@@ -34,6 +34,11 @@
             <tag name="kernel.event_subscriber" />
         </service>
 
+        <service id="Sylius\Bundle\ApiBundle\EventSubscriber\PaymentRequestEventSubscriber">
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
+            <tag name="kernel.event_subscriber" />
+        </service>
+
         <service id="Sylius\Bundle\ApiBundle\EventSubscriber\ProductDeletionEventSubscriber">
             <argument type="service" id="Sylius\Component\Core\Promotion\Checker\ProductInPromotionRuleCheckerInterface" />
             <tag name="kernel.event_subscriber" />
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
similarity index 63%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
index 68e08b13d2..87558d0146 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcher.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
@@ -11,31 +11,22 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Announcer;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 
-final class PaymentRequestCommandDispatcher implements PaymentRequestCommandDispatcherInterface
+final class PaymentRequestAnnouncer implements PaymentRequestAnnouncerInterface
 {
     public function __construct(
-        private PaymentRequestRepositoryInterface $paymentRequestRepository,
         private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
         private MessageBusInterface $commandBus,
     ) {
     }
 
-    public function add(PaymentRequestInterface $paymentRequest): void
-    {
-        $this->paymentRequestRepository->add($paymentRequest);
-
-        $this->update($paymentRequest);
-    }
-
-    public function update(PaymentRequestInterface $paymentRequest): void
+    public function dispatchPaymentRequestCommand(PaymentRequestInterface $paymentRequest): void
     {
         if (!$this->paymentRequestCommandProvider->supports($paymentRequest)) {
             throw new PaymentRequestNotSupportedException();
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncerInterface.php
similarity index 53%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncerInterface.php
index 6012579785..60f3357a40 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandDispatcher/PaymentRequestCommandDispatcherInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncerInterface.php
@@ -11,13 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Announcer;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface PaymentRequestCommandDispatcherInterface
+interface PaymentRequestAnnouncerInterface
 {
-    public function add(PaymentRequestInterface $paymentRequest): void;
-
-    public function update(PaymentRequestInterface $paymentRequest): void;
+    public function dispatchPaymentRequestCommand(PaymentRequestInterface $paymentRequest): void;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index 5a80e63299..bdd4fe820f 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -15,8 +15,8 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectResolverInterface;
 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\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
index a07a01c3e1..e3074a5e4a 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
@@ -14,15 +14,17 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum;
 
 use Payum\Core\Security\TokenInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 
 final class AfterTokenRequestProcessor implements AfterTokenRequestProcessorInterface
 {
     public function __construct(
         private PaymentRequestFactoryInterface $paymentRequestFactory,
-        private PaymentRequestCommandDispatcherInterface $paymentRequestCommandDispatcher,
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private PaymentRequestAnnouncerInterface $paymentRequestCommandDispatcher,
     ) {
     }
 
@@ -41,6 +43,8 @@ final class AfterTokenRequestProcessor implements AfterTokenRequestProcessorInte
         $newPaymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($paymentRequest);
         $newPaymentRequest->setAction(PaymentRequestInterface::ACTION_STATUS);
 
-        $this->paymentRequestCommandDispatcher->add($newPaymentRequest);
+        $this->paymentRequestRepository->add($newPaymentRequest);
+
+        $this->paymentRequestCommandDispatcher->dispatchPaymentRequestCommand($newPaymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
similarity index 71%
rename from src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
index 00ca5eb676..a66e9436a4 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_dispatcher.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
@@ -18,8 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcher">
-            <argument type="service" id="sylius.repository.payment_request" />
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncer">
             <argument type="service" id="sylius.payment_request.command_provider.gateway_factory" />
             <argument type="service" id="sylius.command_bus" />
         </service>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
index 16c1cb9d4a..007e7e0590 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/processors.xml
@@ -20,7 +20,8 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessor">
             <argument type="service" id="sylius.factory.payment_request" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandDispatcher\PaymentRequestCommandDispatcherInterface" />
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
         </service>
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessor">
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/resolver.xml
similarity index 100%
rename from src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/checkers.xml
rename to src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/resolver.xml

From b0e743be0e5c1be3e30d661333ebcdb82f21886a Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 7 Mar 2024 13:29:30 +0100
Subject: [PATCH 072/200] [CoreBundle] Resolve Offline payment request

---
 .../Command/Offline/StatusPaymentRequest.php  | 27 ---------
 .../Offline/CapturePaymentRequestHandler.php  |  7 +--
 .../StatusPaymentRequestCommandProvider.php   | 31 ----------
 .../Offline/AfterCaptureProcessor.php         | 50 ----------------
 .../Processor/Offline/CaptureProcessor.php    | 15 ++---
 .../offline/command_handlers.xml              |  4 --
 .../offline/command_providers.xml             |  7 ---
 .../payment_request/offline/processors.xml    |  7 +--
 .../CapturePaymentRequestHandlerSpec.php      | 43 ++++++++++++++
 .../Offline/CaptureProcessorSpec.php          | 57 +++++++++++++++++++
 10 files changed, 111 insertions(+), 137 deletions(-)
 delete mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
 delete mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
 delete mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/Processor/Offline/CaptureProcessorSpec.php

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
deleted file mode 100644
index b934dca71b..0000000000
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/Offline/StatusPaymentRequest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline;
-
-use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareTrait;
-
-class StatusPaymentRequest implements PaymentRequestHashAwareInterface
-{
-    use PaymentRequestHashAwareTrait;
-
-    public function __construct(
-        protected ?string $hash,
-    ) {
-    }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index 92fef70933..a8c65c8fab 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -15,7 +15,6 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
@@ -23,9 +22,8 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 final class CapturePaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
-        private CaptureProcessorInterface $offlineCaptureProcessor,
-        private AfterCaptureProcessorInterface $afterOfflineCaptureProcessor,
+        private readonly PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        private readonly CaptureProcessorInterface $offlineCaptureProcessor
     ) {
     }
 
@@ -34,6 +32,5 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
         $paymentRequest = $this->paymentRequestIntegrityChecker->check($capturePaymentRequest);
 
         $this->offlineCaptureProcessor->process($paymentRequest);
-        $this->afterOfflineCaptureProcessor->process($paymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
deleted file mode 100644
index 0c95c6172b..0000000000
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/Offline/StatusPaymentRequestCommandProvider.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline;
-
-use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\StatusPaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-
-final class StatusPaymentRequestCommandProvider implements PaymentRequestCommandProviderInterface
-{
-    public function supports(PaymentRequestInterface $paymentRequest): bool
-    {
-        return $paymentRequest->getAction() === PaymentRequestInterface::ACTION_STATUS;
-    }
-
-    public function provide(PaymentRequestInterface $paymentRequest): object
-    {
-        return new StatusPaymentRequest($paymentRequest->getHash()?->toBinary());
-    }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
deleted file mode 100644
index bd77bbc3af..0000000000
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessor.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
-
-use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
-use Sylius\Abstraction\StateMachine\StateMachineInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\PaymentTransitions;
-
-final class AfterCaptureProcessor implements AfterCaptureProcessorInterface
-{
-    public function __construct(
-        private StateMachineFactoryInterface|StateMachineInterface $stateMachineFactory,
-    ) {
-        if ($this->stateMachineFactory instanceof StateMachineFactoryInterface) {
-            trigger_deprecation(
-                'sylius/payment-bundle',
-                '1.13',
-                sprintf(
-                    'Passing an instance of "%s" as the first argument is deprecated. It will accept only instances of "%s" in Sylius 2.0.',
-                    StateMachineFactoryInterface::class,
-                    StateMachineInterface::class,
-                ),
-            );
-        }
-    }
-
-    public function process(PaymentRequestInterface $paymentRequest): void
-    {
-        $payment = $paymentRequest->getPayment();
-
-        $stateMachine = $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH);
-        if ($paymentRequest->getResponseData()['paid']) {
-            $stateMachine->apply(PaymentTransitions::TRANSITION_COMPLETE);
-        } else {
-            $stateMachine->apply(PaymentTransitions::TRANSITION_PROCESS);
-        }
-    }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
index 3d962122b0..91269e08ab 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
@@ -13,23 +13,24 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
 
-use Sylius\Component\Payment\Model\PaymentInterface;
+use Sylius\Abstraction\StateMachine\StateMachineInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\PaymentTransitions;
 
 final class CaptureProcessor implements CaptureProcessorInterface
 {
+    public function __construct(private readonly StateMachineInterface $stateMachine)
+    {
+    }
+
     public function process(PaymentRequestInterface $paymentRequest): void
     {
         $payment = $paymentRequest->getPayment();
 
-        $responseData = $payment->getDetails();
-        if (PaymentInterface::STATE_NEW === $payment->getState()) {
-            $responseData = [
-                'paid' => false,
-            ];
+        if ($this->stateMachine->can($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)) {
+            $this->stateMachine->apply($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS);
         }
 
-        $paymentRequest->setResponseData($responseData);
         $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
index 6c4c6cf9a1..bfe7166e70 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
@@ -16,15 +16,11 @@
            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.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
         </service>
-
     </services>
 </container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
index 7cd396be89..3b54b48e12 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
@@ -16,8 +16,6 @@
            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.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="type" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="offline" priority="-100" />
@@ -26,10 +24,5 @@
         <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline\CapturePaymentRequestCommandProvider">
             <tag name="sylius.payment_request.command_provider.offline" type="capture" />
         </service>
-
-        <service id="sylius.payment_request.command_provider.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline\StatusPaymentRequestCommandProvider">
-            <tag name="sylius.payment_request.command_provider.offline" type="status" />
-        </service>
-
     </services>
 </container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
index d02b55a96a..ac0645be05 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
@@ -16,13 +16,8 @@
            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\Processor\Offline\CaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessor" />
-
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\AfterCaptureProcessor">
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessor">
             <argument type="service" id="sylius_abstraction.state_machine" />
         </service>
-
     </services>
 </container>
diff --git a/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
new file mode 100644
index 0000000000..7a992e4d0a
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class CapturePaymentRequestHandlerSpec extends ObjectBehavior
+{
+    function let(
+        PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        CaptureProcessorInterface $offlineCaptureProcessor
+    ): void {
+        $this->beConstructedWith($paymentRequestIntegrityChecker, $offlineCaptureProcessor);
+    }
+
+    function it_processes_offline_capture(
+        PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        CaptureProcessorInterface $offlineCaptureProcessor,
+        PaymentRequestInterface $paymentRequest
+    ): void {
+        $capturePaymentRequest = new CapturePaymentRequest('hash');
+        $paymentRequestIntegrityChecker->check($capturePaymentRequest)->willReturn($paymentRequest);
+
+        $this->__invoke($capturePaymentRequest);
+
+        $offlineCaptureProcessor->process($paymentRequest)->shouldHaveBeenCalled();
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/Processor/Offline/CaptureProcessorSpec.php b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/Processor/Offline/CaptureProcessorSpec.php
new file mode 100644
index 0000000000..f00210696b
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/Processor/Offline/CaptureProcessorSpec.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Abstraction\StateMachine\StateMachineInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\PaymentTransitions;
+
+final class CaptureProcessorSpec extends ObjectBehavior
+{
+    function let(
+        StateMachineInterface $stateMachine
+    ): void {
+        $this->beConstructedWith($stateMachine);
+    }
+
+    function it_processes_offline_capture(
+        StateMachineInterface $stateMachine,
+        PaymentRequestInterface $paymentRequest,
+        PaymentInterface $payment
+    ): void {
+        $paymentRequest->getPayment()->willReturn($payment);
+        $stateMachine->can($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)->willReturn(true);
+
+        $this->process($paymentRequest);
+
+        $stateMachine->apply($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)->shouldHaveBeenCalledOnce();
+        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED)->shouldHaveBeenCalledOnce();
+    }
+
+    function it_processes_offline_capture_if_payment_cannot_be_processed(
+        StateMachineInterface $stateMachine,
+        PaymentRequestInterface $paymentRequest,
+        PaymentInterface $payment
+    ): void {
+        $paymentRequest->getPayment()->willReturn($payment);
+        $stateMachine->can($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)->willReturn(false);
+
+        $this->process($paymentRequest);
+
+        $stateMachine->apply($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)->shouldNotHaveBeenCalled();
+        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED)->shouldHaveBeenCalledOnce();
+    }
+}

From 717fb0f733b1edeca68845170c77a8169d3643f4 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 7 Mar 2024 13:30:07 +0100
Subject: [PATCH 073/200] [ApiBundle] Add
 UpdatePaymentRequestEligibilityChecker class

---
 ...UpdatePaymentRequestEligibilityChecker.php | 24 ++++++++
 ...entRequestEligibilityCheckerInterface.php} |  6 +-
 .../ApiBundle/Resources/config/services.xml   |  3 +
 ...tePaymentRequestEligibilityCheckerSpec.php | 60 +++++++++++++++++++
 4 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Checker/UpdatePaymentRequestEligibilityChecker.php
 rename src/Sylius/Bundle/{CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessorInterface.php => ApiBundle/Checker/UpdatePaymentRequestEligibilityCheckerInterface.php} (62%)
 create mode 100644 src/Sylius/Bundle/ApiBundle/spec/Checker/UpdatePaymentRequestEligibilityCheckerSpec.php

diff --git a/src/Sylius/Bundle/ApiBundle/Checker/UpdatePaymentRequestEligibilityChecker.php b/src/Sylius/Bundle/ApiBundle/Checker/UpdatePaymentRequestEligibilityChecker.php
new file mode 100644
index 0000000000..275a153691
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Checker/UpdatePaymentRequestEligibilityChecker.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Checker;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class UpdatePaymentRequestEligibilityChecker implements UpdatePaymentRequestEligibilityCheckerInterface
+{
+    public function isEligible(PaymentRequestInterface $paymentRequest): bool
+    {
+        return in_array($paymentRequest->getState(), [PaymentRequestInterface::STATE_NEW, PaymentRequestInterface::STATE_PROCESSING]);
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessorInterface.php b/src/Sylius/Bundle/ApiBundle/Checker/UpdatePaymentRequestEligibilityCheckerInterface.php
similarity index 62%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessorInterface.php
rename to src/Sylius/Bundle/ApiBundle/Checker/UpdatePaymentRequestEligibilityCheckerInterface.php
index 9314b59b88..1554e8a515 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/AfterCaptureProcessorInterface.php
+++ b/src/Sylius/Bundle/ApiBundle/Checker/UpdatePaymentRequestEligibilityCheckerInterface.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
+namespace Sylius\Bundle\ApiBundle\Checker;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface AfterCaptureProcessorInterface
+interface UpdatePaymentRequestEligibilityCheckerInterface
 {
-    public function process(PaymentRequestInterface $paymentRequest): void;
+    public function isEligible(PaymentRequestInterface $paymentRequest): bool;
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml
index b50b971f63..8b355bb301 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml
@@ -146,6 +146,9 @@
             <argument type="service" id="sylius.promotion_coupon_eligibility_checker" />
         </service>
 
+        <service id="sylius.api.checker.update_payment_request_eligibility" class="Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityChecker" />
+        <service id="Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityCheckerInterface" alias="sylius.api.checker.update_payment_request_eligibility"/>
+
         <service id="Sylius\Bundle\ApiBundle\Modifier\OrderAddressModifierInterface" class="Sylius\Bundle\ApiBundle\Modifier\OrderAddressModifier" public="true">
             <argument type="service" id="sylius_abstraction.state_machine" />
             <argument type="service" id="Sylius\Bundle\ApiBundle\Mapper\AddressMapperInterface" />
diff --git a/src/Sylius/Bundle/ApiBundle/spec/Checker/UpdatePaymentRequestEligibilityCheckerSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Checker/UpdatePaymentRequestEligibilityCheckerSpec.php
new file mode 100644
index 0000000000..ad0253eafd
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/spec/Checker/UpdatePaymentRequestEligibilityCheckerSpec.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\ApiBundle\Checker;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class UpdatePaymentRequestEligibilityCheckerSpec extends ObjectBehavior
+{
+    function it_returns_true_if_payment_request_is_in_new_state(
+        PaymentRequestInterface $paymentRequest
+    ): void
+    {
+        $paymentRequest->getState()->willReturn(PaymentRequestInterface::STATE_NEW);
+        $this->isEligible($paymentRequest)->shouldReturn(true);
+    }
+
+    function it_returns_true_if_payment_request_is_in_processing_state(
+        PaymentRequestInterface $paymentRequest
+    ): void
+    {
+        $paymentRequest->getState()->willReturn(PaymentRequestInterface::STATE_PROCESSING);
+        $this->isEligible($paymentRequest)->shouldReturn(true);
+    }
+
+    function it_returns_false_if_payment_request_is_not_in_completed_state(
+        PaymentRequestInterface $paymentRequest
+    ): void
+    {
+        $paymentRequest->getState()->willReturn(PaymentRequestInterface::STATE_COMPLETED);
+        $this->isEligible($paymentRequest)->shouldReturn(false);
+    }
+
+    function it_returns_false_if_payment_request_is_not_in_failed_state(
+        PaymentRequestInterface $paymentRequest
+    ): void
+    {
+        $paymentRequest->getState()->willReturn(PaymentRequestInterface::STATE_FAILED);
+        $this->isEligible($paymentRequest)->shouldReturn(false);
+    }
+
+    function it_returns_false_if_payment_request_is_not_in_cancelled_state(
+        PaymentRequestInterface $paymentRequest
+    ): void
+    {
+        $paymentRequest->getState()->willReturn(PaymentRequestInterface::STATE_CANCELLED);
+        $this->isEligible($paymentRequest)->shouldReturn(false);
+    }
+}

From c1592c3895610dd0236014d16c4803b12e35fe71 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 7 Mar 2024 13:30:28 +0100
Subject: [PATCH 074/200] [ApiBundle] Add PaymentRequestDataProvider class

---
 .../PaymentRequestDataProvider.php            | 55 ++++++++++++
 .../config/services/data_providers.xml        |  6 ++
 .../PaymentRequestDataProviderSpec.php        | 84 +++++++++++++++++++
 3 files changed, 145 insertions(+)
 create mode 100644 src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestDataProvider.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestDataProviderSpec.php

diff --git a/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestDataProvider.php b/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestDataProvider.php
new file mode 100644
index 0000000000..d85af83741
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestDataProvider.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\DataProvider;
+
+use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
+use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
+use Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityCheckerInterface;
+use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/** @experimental */
+final class PaymentRequestDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface
+{
+    /** @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository */
+    public function __construct(
+        private readonly PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private readonly UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker
+    ){
+    }
+
+    /**
+     * @param string $id
+     * @param array<array-key, mixed> $context
+     */
+    public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
+    {
+        $paymentRequest = $this->paymentRequestRepository->find($id);
+
+        if ($this->updatePaymentRequestEligibilityChecker->isEligible($paymentRequest)) {
+            return $paymentRequest;
+        }
+
+        return null;
+    }
+
+    /** @param array<array-key, mixed> $context */
+    public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
+    {
+        return is_a($resourceClass, PaymentRequestInterface::class, true) &&
+            Request::METHOD_PUT === $context[ContextKeys::HTTP_REQUEST_METHOD_TYPE];
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml
index 5162b76afd..e259ff96ee 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml
@@ -116,5 +116,11 @@
             <argument type="service" id="sylius.section_resolver.uri_based_section_resolver" />
             <tag name="api_platform.subresource_data_provider" priority="10" />
         </service>
+
+        <service id="Sylius\Bundle\ApiBundle\DataProvider\PaymentRequestDataProvider">
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="sylius.api.checker.update_payment_request_eligibility" />
+            <tag name="api_platform.item_data_provider" priority="10" />
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestDataProviderSpec.php b/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestDataProviderSpec.php
new file mode 100644
index 0000000000..4b7c634947
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestDataProviderSpec.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\ApiBundle\DataProvider;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityCheckerInterface;
+use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
+use Sylius\Component\Core\Model\ProductInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+final class PaymentRequestDataProviderSpec extends ObjectBehavior
+{
+    function let(
+        PaymentRequestRepositoryInterface $paymentRequestRepository,
+        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
+    ): void {
+        $this->beConstructedWith($paymentRequestRepository, $updatePaymentRequestEligibilityChecker);
+    }
+
+    function it_does_not_support_not_payment_request_resource(): void
+    {
+        $this
+            ->supports(ProductInterface::class, Request::METHOD_PUT, [])
+            ->shouldReturn(false)
+        ;
+    }
+
+    function it_does_not_support_not_put_request_method_type(): void
+    {
+        $this
+            ->supports(PaymentRequestInterface::class, 'shop_get', [ContextKeys::HTTP_REQUEST_METHOD_TYPE => Request::METHOD_GET])
+            ->shouldReturn(false)
+        ;
+    }
+
+    function it_supports_payment_request_resource_and_put_request_method_type(): void
+    {
+        $this
+            ->supports(PaymentRequestInterface::class, 'shop_get', [ContextKeys::HTTP_REQUEST_METHOD_TYPE => Request::METHOD_PUT])
+            ->shouldReturn(true)
+        ;
+    }
+
+    function it_providers_null_when_update_payment_request_is_not_eligible(
+        PaymentRequestRepositoryInterface $paymentRequestRepository,
+        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
+        PaymentRequestInterface $paymentRequest
+    ): void {
+        $hash = 'hash123!@#';
+        $paymentRequestRepository->find($hash)->willReturn($paymentRequest);
+        $updatePaymentRequestEligibilityChecker->isEligible($paymentRequest)->willReturn(false);
+
+        $this
+            ->getItem(PaymentRequestInterface::class, $hash, 'shop_get')
+            ->shouldReturn(null);
+    }
+
+    function it_providers_payment_request_when_update_payment_request_is_eligible(
+        PaymentRequestRepositoryInterface $paymentRequestRepository,
+        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
+        PaymentRequestInterface $paymentRequest
+    ): void {
+        $hash = 'hash123!@#';
+        $paymentRequestRepository->find($hash)->willReturn($paymentRequest);
+        $updatePaymentRequestEligibilityChecker->isEligible($paymentRequest)->willReturn(true);
+
+        $this
+            ->getItem(PaymentRequestInterface::class, $hash, 'shop_get')
+            ->shouldReturn($paymentRequest);
+    }
+}

From 9054721d76c92ce4bc318c16deb677aa8f1e71b1 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 7 Mar 2024 13:30:45 +0100
Subject: [PATCH 075/200] [ApiBundle] Add serialization group payment request

---
 .../config/api_resources/PaymentRequest.xml   | 14 ++++++++---
 .../config/serialization/PaymentMethod.xml    |  4 +--
 .../config/serialization/PaymentRequest.xml   | 25 +++++--------------
 .../Resources/config/services/filters.xml     |  1 -
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
index d6c7880296..c813f6d672 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -30,7 +30,7 @@
                     <attribute>sylius.api.search_payment_request_filter</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">sylius:admin:payment_request:show</attribute>
+                    <attribute name="groups">sylius:admin:payment_request:index</attribute>
                 </attribute>
             </collectionOperation>
 
@@ -49,6 +49,14 @@
         </collectionOperations>
 
         <itemOperations>
+            <itemOperation name="admin_get">
+                <attribute name="method">GET</attribute>
+                <attribute name="path">/admin/payment-requests/{hash}</attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">sylius:admin:payment_request:show</attribute>
+                </attribute>
+            </itemOperation>
+
             <itemOperation name="shop_get">
                 <attribute name="method">GET</attribute>
                 <attribute name="path">/shop/payment-requests/{hash}</attribute>
@@ -74,10 +82,10 @@
         </itemOperations>
 
         <property name="hash" identifier="true" writable="false" />
-        <property name="createdAt" writable="false" />
-        <property name="updatedAt" writable="false" />
         <property name="state" writable="false" />
         <property name="payload" writable="true" />
         <property name="responseData" writable="false" />
+        <property name="createdAt" writable="false" />
+        <property name="updatedAt" writable="false" />
     </resource>
 </resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
index 10e86f6afb..15d75277d7 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
@@ -40,7 +40,6 @@
             <group>sylius:admin:payment_method:show</group>
             <group>admin:payment_method:update</group>
             <group>sylius:admin:payment_method:update</group>
-            <group>sylius:admin:payment_request:index</group>
             <group>sylius:admin:payment_request:show</group>
         </attribute>
 
@@ -51,7 +50,6 @@
             <group>sylius:shop:payment_method:index</group>
             <group>shop:payment_method:show</group>
             <group>sylius:shop:payment_method:show</group>
-            <group>sylius:shop:payment_request:index</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
 
@@ -64,6 +62,7 @@
             <group>sylius:admin:payment_method:show</group>
             <group>admin:payment_method:update</group>
             <group>sylius:admin:payment_method:update</group>
+            <group>sylius:admin:payment_request:show</group>
         </attribute>
 
         <attribute name="code">
@@ -77,6 +76,7 @@
             <group>sylius:shop:payment_method:index</group>
             <group>shop:payment_method:show</group>
             <group>sylius:shop:payment_method:show</group>
+            <group>sylius:admin:payment_request:show</group>
         </attribute>
 
         <attribute name="description">
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
index 62f053ae3e..8ba5f06b92 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -15,60 +15,47 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
 >
-    <class name="Sylius\Component\Core\Model\PaymentRequest">
+    <class name="Sylius\Component\Payment\Model\PaymentRequest">
         <attribute name="hash">
-            <group>sylius:admin:payment_request:show</group>
             <group>sylius:admin:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="payment">
-            <group>sylius:admin:payment_request:show</group>
             <group>sylius:admin:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="method">
-            <group>sylius:admin:payment_request:show</group>
             <group>sylius:admin:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="action">
-            <group>sylius:admin:payment_request:show</group>
             <group>sylius:admin:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="state">
-            <group>sylius:admin:payment_request:show</group>
             <group>sylius:admin:payment_request:index</group>
+            <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="payload">
             <group>sylius:admin:payment_request:show</group>
-            <group>sylius:admin:payment_request:index</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="responseData">
             <group>sylius:admin:payment_request:show</group>
-            <group>sylius:admin:payment_request:index</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="createdAt">
             <group>sylius:admin:payment_request:show</group>
-            <group>sylius:admin:payment_request:index</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
         <attribute name="updatedAt">
             <group>sylius:admin:payment_request:show</group>
-            <group>sylius:admin:payment_request:index</group>
             <group>sylius:shop:payment_request:show</group>
-            <group>sylius:shop:payment_request:index</group>
         </attribute>
     </class>
 </serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
index 20a5546da0..3a27546800 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
@@ -20,7 +20,6 @@
         <service id="sylius.api.search_payment_request_filter" parent="api_platform.doctrine.orm.search_filter" public="true">
             <argument type="collection">
                 <argument key="state">exact</argument>
-                <argument key="type">exact</argument>
                 <argument key="method.code">exact</argument>
             </argument>
             <tag name="api_platform.filter" />

From 24036f6832ad62a816ae9b809ac2b84c2a706e9d Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 7 Mar 2024 13:31:01 +0100
Subject: [PATCH 076/200] [Test][Admin] Add contracts test for payment request

---
 tests/Api/Admin/PaymentRequestsTest.php       | 66 +++++++++++++++++++
 .../ORM/payment_request/order.yaml            | 17 +++++
 .../ORM/payment_request/payment_request.yaml  | 33 ++++++++++
 .../payment_request/get_payment_request.json  | 27 ++++++++
 .../payment_request/get_payment_requests.json | 66 +++++++++++++++++++
 5 files changed, 209 insertions(+)
 create mode 100644 tests/Api/Admin/PaymentRequestsTest.php
 create mode 100644 tests/Api/DataFixtures/ORM/payment_request/order.yaml
 create mode 100644 tests/Api/DataFixtures/ORM/payment_request/payment_request.yaml
 create mode 100644 tests/Api/Responses/admin/payment_request/get_payment_request.json
 create mode 100644 tests/Api/Responses/admin/payment_request/get_payment_requests.json

diff --git a/tests/Api/Admin/PaymentRequestsTest.php b/tests/Api/Admin/PaymentRequestsTest.php
new file mode 100644
index 0000000000..592258fd8b
--- /dev/null
+++ b/tests/Api/Admin/PaymentRequestsTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Tests\Api\Admin;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Tests\Api\JsonApiTestCase;
+
+final class PaymentRequestsTest extends JsonApiTestCase
+{
+    protected function setUp(): void
+    {
+        $this->setUpAdminContext();
+
+        parent::setUp();
+    }
+
+    /** @test */
+    public function it_gets_payment_requests(): void
+    {
+        $this->setUpDefaultGetHeaders();
+
+        $this->loadFixturesFromFiles([
+            'authentication/api_administrator.yaml',
+            'channel.yaml',
+            'payment_method.yaml',
+            'payment_request/payment_request.yaml',
+            'payment_request/order.yaml',
+        ]);
+
+        $this->requestGet(uri: '/api/v2/admin/payment-requests');
+
+        $this->assertResponseSuccessful('admin/payment_request/get_payment_requests');
+    }
+
+    /** @test */
+    public function it_gets_a_payment_request(): void
+    {
+        $this->setUpDefaultGetHeaders();
+
+        $fixtures = $this->loadFixturesFromFiles([
+            'authentication/api_administrator.yaml',
+            'channel.yaml',
+            'payment_method.yaml',
+            'payment_request/payment_request.yaml',
+            'payment_request/order.yaml',
+        ]);
+
+        /** @var PaymentRequestInterface $paymentRequest */
+        $paymentRequest = $fixtures['payment_request_authorize'];
+
+        $this->requestGet(uri: sprintf('/api/v2/admin/payment-requests/%s', $paymentRequest->getHash()));
+
+        $this->assertResponseSuccessful('admin/payment_request/get_payment_request');
+    }
+}
diff --git a/tests/Api/DataFixtures/ORM/payment_request/order.yaml b/tests/Api/DataFixtures/ORM/payment_request/order.yaml
new file mode 100644
index 0000000000..fcd3cc2d49
--- /dev/null
+++ b/tests/Api/DataFixtures/ORM/payment_request/order.yaml
@@ -0,0 +1,17 @@
+Sylius\Component\Core\Model\Payment:
+    payment:
+        method: "@payment_method_cash_on_delivery"
+        order: "@order"
+        state: "processing"
+        amount: 1000
+        currencyCode: "USD"
+    
+Sylius\Component\Core\Model\Order:
+    order:
+        channel: "@channel_web"
+        currencyCode: "USD"
+        localeCode: "en_US"
+        state: "new"
+        paymentState: "awaiting_payment"
+        shippingState: "ready"
+        tokenValue: "token"
diff --git a/tests/Api/DataFixtures/ORM/payment_request/payment_request.yaml b/tests/Api/DataFixtures/ORM/payment_request/payment_request.yaml
new file mode 100644
index 0000000000..f4be623365
--- /dev/null
+++ b/tests/Api/DataFixtures/ORM/payment_request/payment_request.yaml
@@ -0,0 +1,33 @@
+Sylius\Component\Payment\Model\PaymentRequest:
+    payment_request_status:
+        __construct: [ '@payment', '@payment_method_cash_on_delivery' ]
+        state: "completed"
+        action: "status"
+        payload: null
+        responseData: []
+    payment_request_authorize:
+        __construct: [ '@payment', '@payment_method_cash_on_delivery' ]
+        state: "completed"
+        action: "authorize"
+        payload: {
+            "target_path": "https://myshop.tld/target-path",
+            "after_path": "https://myshop.tld/after-path",
+        }
+        responseData: {
+            "after_url": "https://myshop.tld/after-path",
+        }
+    payment_request_capture:
+        __construct: [ '@payment', '@payment_method_cash_on_delivery' ]
+        state: "processing"
+        action: "capture"
+        payload: {
+            "http_request": {
+                "query": {
+                    "token": "EC-2d9EV13959UR209410U",
+                    "PayerID": "UX8WBNYWGBVMG"
+                }
+            }
+        }
+        responseData: {
+            "after_url": "https://myshop.tld/after-path",
+        }
diff --git a/tests/Api/Responses/admin/payment_request/get_payment_request.json b/tests/Api/Responses/admin/payment_request/get_payment_request.json
new file mode 100644
index 0000000000..acbe1239f7
--- /dev/null
+++ b/tests/Api/Responses/admin/payment_request/get_payment_request.json
@@ -0,0 +1,27 @@
+{
+    "@context": "\/api\/v2\/contexts\/PaymentRequest",
+    "@id": "\/api\/v2\/admin\/payment-requests\/@string@",
+    "@type": "PaymentRequest",
+    "hash": "@string@",
+    "state": "completed",
+    "action": "authorize",
+    "payload": {
+        "target_path": "https:\/\/myshop.tld\/target-path",
+        "after_path": "https:\/\/myshop.tld\/after-path"
+    },
+    "responseData": {
+        "after_url": "https:\/\/myshop.tld\/after-path"
+    },
+    "payment": "\/api\/v2\/admin\/payments\/@integer@",
+    "method": {
+        "@id": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY",
+        "@type": "PaymentMethod",
+        "code": "CASH_ON_DELIVERY",
+        "enabled": true,
+        "translations": {
+            "en_US": "\/api\/v2\/admin\/payment-method-translations\/@integer@"
+        }
+    },
+    "createdAt": @datetime@,
+    "updatedAt": @datetime@
+}
diff --git a/tests/Api/Responses/admin/payment_request/get_payment_requests.json b/tests/Api/Responses/admin/payment_request/get_payment_requests.json
new file mode 100644
index 0000000000..b8cabfe08b
--- /dev/null
+++ b/tests/Api/Responses/admin/payment_request/get_payment_requests.json
@@ -0,0 +1,66 @@
+{
+    "@context": "\/api\/v2\/contexts\/PaymentRequest",
+    "@id": "\/api\/v2\/admin\/payment-requests",
+    "@type": "hydra:Collection",
+    "hydra:member": [
+        {
+            "@id": "\/api\/v2\/admin\/payment-requests\/@string@",
+            "@type": "PaymentRequest",
+            "hash": "@string@",
+            "state": "completed",
+            "action": "status",
+            "payment": "\/api\/v2\/admin\/payments\/@integer@",
+            "method": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY"
+        },
+        {
+            "@id": "\/api\/v2\/admin\/payment-requests\/@string@",
+            "@type": "PaymentRequest",
+            "hash": "@string@",
+            "state": "completed",
+            "action": "authorize",
+            "payment": "\/api\/v2\/admin\/payments\/@integer@",
+            "method": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY"
+        },
+        {
+            "@id": "\/api\/v2\/admin\/payment-requests\/@string@",
+            "@type": "PaymentRequest",
+            "hash": "@string@",
+            "state": "processing",
+            "action": "capture",
+            "payment": "\/api\/v2\/admin\/payments\/@integer@",
+            "method": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY"
+        }
+    ],
+    "hydra:totalItems": 3,
+    "hydra:search": {
+        "@type": "hydra:IriTemplate",
+        "hydra:template": "\/api\/v2\/admin\/payment-requests{?state,state[],method.code,method.code[]}",
+        "hydra:variableRepresentation": "BasicRepresentation",
+        "hydra:mapping": [
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "state",
+                "property": "state",
+                "required": false
+            },
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "state[]",
+                "property": "state",
+                "required": false
+            },
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "method.code",
+                "property": "method.code",
+                "required": false
+            },
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "method.code[]",
+                "property": "method.code",
+                "required": false
+            }
+        ]
+    }
+}

From 266812aa4cce56bfde9dcbcdf8ffbceb19e8e4ad Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 7 Mar 2024 13:31:08 +0100
Subject: [PATCH 077/200] [Test][Shop] Add contracts test for payment request

---
 .../payment_request/order_with_customer.yaml  |  18 ++
 .../payment_request/get_payment_request.json  |  27 +++
 .../payment_request/post_payment_request.json |  21 ++
 ...payment_request_without_required_data.json |   4 +
 .../payment_request/put_payment_request.json  |  23 +++
 tests/Api/Shop/PaymentRequestsTest.php        | 187 ++++++++++++++++++
 6 files changed, 280 insertions(+)
 create mode 100644 tests/Api/DataFixtures/ORM/payment_request/order_with_customer.yaml
 create mode 100644 tests/Api/Responses/shop/payment_request/get_payment_request.json
 create mode 100644 tests/Api/Responses/shop/payment_request/post_payment_request.json
 create mode 100644 tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json
 create mode 100644 tests/Api/Responses/shop/payment_request/put_payment_request.json
 create mode 100644 tests/Api/Shop/PaymentRequestsTest.php

diff --git a/tests/Api/DataFixtures/ORM/payment_request/order_with_customer.yaml b/tests/Api/DataFixtures/ORM/payment_request/order_with_customer.yaml
new file mode 100644
index 0000000000..17271ac86c
--- /dev/null
+++ b/tests/Api/DataFixtures/ORM/payment_request/order_with_customer.yaml
@@ -0,0 +1,18 @@
+Sylius\Component\Core\Model\Payment:
+    payment:
+        method: "@payment_method_cash_on_delivery"
+        order: "@order"
+        state: "processing"
+        amount: 1000
+        currencyCode: "USD"
+    
+Sylius\Component\Core\Model\Order:
+    order:
+        channel: "@channel_web"
+        currencyCode: "USD"
+        localeCode: "en_US"
+        state: "new"
+        paymentState: "awaiting_payment"
+        shippingState: "ready"
+        tokenValue: "token"
+        customer: "@customer_oliver"
diff --git a/tests/Api/Responses/shop/payment_request/get_payment_request.json b/tests/Api/Responses/shop/payment_request/get_payment_request.json
new file mode 100644
index 0000000000..352c126ed1
--- /dev/null
+++ b/tests/Api/Responses/shop/payment_request/get_payment_request.json
@@ -0,0 +1,27 @@
+{
+    "@context": "\/api\/v2\/contexts\/PaymentRequest",
+    "@id": "\/api\/v2\/shop\/payment-requests\/@string@",
+    "@type": "PaymentRequest",
+    "hash": "@string@",
+    "state": "processing",
+    "action": "capture",
+    "payload": {
+        "http_request": {
+            "query": {
+                "token": "EC-2d9EV13959UR209410U",
+                "PayerID": "UX8WBNYWGBVMG"
+            }
+        }
+    },
+    "responseData": {
+        "after_url": "https:\/\/myshop.tld\/after-path"
+    },
+    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "method": {
+        "@id": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
+        "@type": "PaymentMethod",
+        "name": "Cash on delivery"
+    },
+    "createdAt": @datetime@,
+    "updatedAt": @datetime@
+}
diff --git a/tests/Api/Responses/shop/payment_request/post_payment_request.json b/tests/Api/Responses/shop/payment_request/post_payment_request.json
new file mode 100644
index 0000000000..6e9e77f018
--- /dev/null
+++ b/tests/Api/Responses/shop/payment_request/post_payment_request.json
@@ -0,0 +1,21 @@
+{
+    "@context": "\/api\/v2\/contexts\/PaymentRequest",
+    "@id": "\/api\/v2\/shop\/payment-requests\/@string@",
+    "@type": "PaymentRequest",
+    "hash": "@string@",
+    "state": "completed",
+    "action": "capture",
+    "payload": {
+        "target_path": "https:\/\/myshop.tld\/target-path",
+        "after_path": "https:\/\/myshop.tld\/after-path"
+    },
+    "responseData": [],
+    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "method": {
+        "@id": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
+        "@type": "PaymentMethod",
+        "name": "Cash on delivery"
+    },
+    "createdAt": @datetime@,
+    "updatedAt": @datetime@
+}
diff --git a/tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json b/tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json
new file mode 100644
index 0000000000..2375544bfe
--- /dev/null
+++ b/tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json
@@ -0,0 +1,4 @@
+{
+    "code": 400,
+    "message": "Request does not have the following required fields specified: paymentId, paymentMethodCode, action."
+}
diff --git a/tests/Api/Responses/shop/payment_request/put_payment_request.json b/tests/Api/Responses/shop/payment_request/put_payment_request.json
new file mode 100644
index 0000000000..d4cae7fb9a
--- /dev/null
+++ b/tests/Api/Responses/shop/payment_request/put_payment_request.json
@@ -0,0 +1,23 @@
+{
+    "@context": "\/api\/v2\/contexts\/PaymentRequest",
+    "@id": "\/api\/v2\/shop\/payment-requests\/@string@",
+    "@type": "PaymentRequest",
+    "hash": "@string@",
+    "state": "completed",
+    "action": "capture",
+    "payload": {
+        "target_path": "https:\/\/myshop.tld\/new-target-path",
+        "after_path": "https:\/\/myshop.tld\/new-after-path"
+    },
+    "responseData": {
+        "after_url": "https:\/\/myshop.tld\/after-path"
+    },
+    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "method": {
+        "@id": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
+        "@type": "PaymentMethod",
+        "name": "Cash on delivery"
+    },
+    "createdAt": @datetime@,
+    "updatedAt": @datetime@
+}
diff --git a/tests/Api/Shop/PaymentRequestsTest.php b/tests/Api/Shop/PaymentRequestsTest.php
new file mode 100644
index 0000000000..bfdac8291f
--- /dev/null
+++ b/tests/Api/Shop/PaymentRequestsTest.php
@@ -0,0 +1,187 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Tests\Api\Shop;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Tests\Api\JsonApiTestCase;
+use Sylius\Tests\Api\Utils\OrderPlacerTrait;
+use Sylius\Tests\Api\Utils\ShopUserLoginTrait;
+use Symfony\Component\HttpFoundation\Response;
+
+final class PaymentRequestsTest extends JsonApiTestCase
+{
+    use ShopUserLoginTrait;
+    use OrderPlacerTrait;
+
+    protected function setUp(): void
+    {
+        $this->setUpOrderPlacer();
+
+        parent::setUp();
+    }
+
+    /** @test */
+    public function it_gets_a_payment_request(): void
+    {
+        $this->setUpDefaultGetHeaders();
+
+        $fixtures = $this->loadFixturesFromFiles([
+            'authentication/customer.yaml',
+            'channel.yaml',
+            'payment_method.yaml',
+            'payment_request/payment_request.yaml',
+            'payment_request/order_with_customer.yaml',
+        ]);
+
+        /** @var PaymentRequestInterface $paymentRequest */
+        $paymentRequest = $fixtures['payment_request_capture'];
+
+        $this->client->request(
+            method: 'GET',
+            uri: sprintf('/api/v2/shop/payment-requests/%s', $paymentRequest->getHash()),
+            server: $this->headerBuilder()->withJsonLdAccept()->withJsonLdContentType()->withShopUserAuthorization('oliver@doe.com')->build(),
+        );
+
+        $this->assertResponseSuccessful('shop/payment_request/get_payment_request');
+    }
+
+    /** @test */
+    public function it_creates_a_payment_request(): void
+    {
+        $this->loadFixturesFromFiles([
+            'authentication/customer.yaml',
+            'channel.yaml',
+            'cart.yaml',
+            'country.yaml',
+            'shipping_method.yaml',
+            'payment_method.yaml',
+        ]);
+
+        $order = $this->placeOrder('nAWw2jewpA', 'oliver@doe.com');
+        $payment = $order->getLastPayment();
+
+        $this->client->request(
+            method: 'POST',
+            uri: '/api/v2/shop/payment-requests',
+            server: $this->headerBuilder()->withJsonLdAccept()->withJsonLdContentType()->withShopUserAuthorization('oliver@doe.com')->build(),
+            content: json_encode([
+                'paymentId' => sprintf('/api/v2/shop/payments/%s', $payment->getId()),
+                'paymentMethodCode' => $payment->getMethod()->getCode(),
+                'action' => 'capture',
+                'payload' => [
+                    'target_path' => 'https://myshop.tld/target-path',
+                    'after_path' => 'https://myshop.tld/after-path'
+                ],
+            ], \JSON_THROW_ON_ERROR)
+        );
+
+
+        $this->assertResponse(
+            $this->client->getResponse(),
+            'shop/payment_request/post_payment_request',
+            Response::HTTP_CREATED,
+        );
+    }
+
+    /** @test */
+    public function it_does_not_create_a_payment_request_without_required_data(): void
+    {
+        $this->loadFixturesFromFiles([
+            'authentication/customer.yaml',
+            'channel.yaml',
+            'cart.yaml',
+            'country.yaml',
+            'shipping_method.yaml',
+            'payment_method.yaml',
+        ]);
+
+        $this->placeOrder('nAWw2jewpA', 'oliver@doe.com');
+
+        $this->client->request(
+            method: 'POST',
+            uri: '/api/v2/shop/payment-requests',
+            server: $this->headerBuilder()->withJsonLdAccept()->withJsonLdContentType()->withShopUserAuthorization('oliver@doe.com')->build(),
+            content: json_encode([], \JSON_THROW_ON_ERROR)
+        );
+
+        $this->assertResponse(
+            $this->client->getResponse(),
+            'shop/payment_request/post_payment_request_without_required_data',
+            Response::HTTP_BAD_REQUEST,
+        );
+    }
+
+    /** @test */
+    public function it_updates_a_payment_request(): void
+    {
+        $this->setUpDefaultGetHeaders();
+
+        $fixtures = $this->loadFixturesFromFiles([
+            'authentication/customer.yaml',
+            'channel.yaml',
+            'payment_method.yaml',
+            'payment_request/payment_request.yaml',
+            'payment_request/order_with_customer.yaml',
+        ]);
+
+        /** @var PaymentRequestInterface $paymentRequest */
+        $paymentRequest = $fixtures['payment_request_capture'];
+
+        $this->client->request(
+            method: 'PUT',
+            uri: sprintf('/api/v2/shop/payment-requests/%s', $paymentRequest->getHash()),
+            server: $this->headerBuilder()->withJsonLdAccept()->withJsonLdContentType()->withShopUserAuthorization('oliver@doe.com')->build(),
+            content: json_encode([
+                'payload' => [
+                    'target_path' => 'https://myshop.tld/new-target-path',
+                    'after_path' => 'https://myshop.tld/new-after-path'
+                ],
+            ], \JSON_THROW_ON_ERROR)
+        );
+
+        $this->assertResponseSuccessful('shop/payment_request/put_payment_request');
+    }
+
+    /** @test */
+    public function it_does_not_update_a_payment_request_in_wrong_state(): void
+    {
+        $this->setUpDefaultGetHeaders();
+
+        $fixtures = $this->loadFixturesFromFiles([
+            'authentication/customer.yaml',
+            'channel.yaml',
+            'payment_method.yaml',
+            'payment_request/payment_request.yaml',
+            'payment_request/order_with_customer.yaml',
+        ]);
+
+        /** @var PaymentRequestInterface $paymentRequest */
+        $paymentRequest = $fixtures['payment_request_authorize'];
+
+        $this->client->request(
+            method: 'PUT',
+            uri: sprintf('/api/v2/shop/payment-requests/%s', $paymentRequest->getHash()),
+            server: $this->headerBuilder()->withJsonLdAccept()->withJsonLdContentType()->withShopUserAuthorization('oliver@doe.com')->build(),
+            content: json_encode([
+                'payload' => [
+                    'target_path' => 'https://myshop.tld/new-target-path',
+                    'after_path' => 'https://myshop.tld/new-after-path'
+                ],
+            ], \JSON_THROW_ON_ERROR)
+        );
+        $response = $this->client->getResponse();
+
+        $this->assertSame(Response::HTTP_NOT_FOUND, $response->getStatusCode());
+    }
+}

From 1711b5872d131fad76ad6dc681bc074b96bda65f Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Mon, 11 Mar 2024 11:09:04 +0100
Subject: [PATCH 078/200] [ApiBundle] Rename PaymentRequestDataProvider to
 PaymentRequestUpdateDataProvider

---
 ...estDataProvider.php => PaymentRequestUpdateDataProvider.php} | 2 +-
 .../ApiBundle/Resources/config/services/data_providers.xml      | 2 +-
 ...roviderSpec.php => PaymentRequestUpdateDataProviderSpec.php} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Sylius/Bundle/ApiBundle/DataProvider/{PaymentRequestDataProvider.php => PaymentRequestUpdateDataProvider.php} (94%)
 rename src/Sylius/Bundle/ApiBundle/spec/DataProvider/{PaymentRequestDataProviderSpec.php => PaymentRequestUpdateDataProviderSpec.php} (97%)

diff --git a/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestDataProvider.php b/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestUpdateDataProvider.php
similarity index 94%
rename from src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestDataProvider.php
rename to src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestUpdateDataProvider.php
index d85af83741..be9cb70cce 100644
--- a/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestDataProvider.php
+++ b/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestUpdateDataProvider.php
@@ -22,7 +22,7 @@ use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /** @experimental */
-final class PaymentRequestDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface
+final class PaymentRequestUpdateDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface
 {
     /** @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository */
     public function __construct(
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml
index e259ff96ee..0fae54e6f1 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_providers.xml
@@ -117,7 +117,7 @@
             <tag name="api_platform.subresource_data_provider" priority="10" />
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\DataProvider\PaymentRequestDataProvider">
+        <service id="Sylius\Bundle\ApiBundle\DataProvider\PaymentRequestUpdateDataProvider">
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="sylius.api.checker.update_payment_request_eligibility" />
             <tag name="api_platform.item_data_provider" priority="10" />
diff --git a/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestDataProviderSpec.php b/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
similarity index 97%
rename from src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestDataProviderSpec.php
rename to src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
index 4b7c634947..253827432f 100644
--- a/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestDataProviderSpec.php
+++ b/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
@@ -21,7 +21,7 @@ use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-final class PaymentRequestDataProviderSpec extends ObjectBehavior
+final class PaymentRequestUpdateDataProviderSpec extends ObjectBehavior
 {
     function let(
         PaymentRequestRepositoryInterface $paymentRequestRepository,

From 270e894f3c87a6197f85bf4feb060d56fba2527b Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Mon, 11 Mar 2024 12:02:04 +0100
Subject: [PATCH 079/200] [ApiBundle][PaymentRequest] Return only iri for
 payment method

---
 .../Resources/config/serialization/PaymentMethod.xml   |  4 ----
 .../admin/payment_request/get_payment_request.json     | 10 +---------
 .../shop/payment_request/get_payment_request.json      |  6 +-----
 .../shop/payment_request/post_payment_request.json     |  6 +-----
 .../shop/payment_request/put_payment_request.json      |  6 +-----
 5 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
index 15d75277d7..0781097cdf 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
@@ -40,7 +40,6 @@
             <group>sylius:admin:payment_method:show</group>
             <group>admin:payment_method:update</group>
             <group>sylius:admin:payment_method:update</group>
-            <group>sylius:admin:payment_request:show</group>
         </attribute>
 
         <attribute name="name">
@@ -50,7 +49,6 @@
             <group>sylius:shop:payment_method:index</group>
             <group>shop:payment_method:show</group>
             <group>sylius:shop:payment_method:show</group>
-            <group>sylius:shop:payment_request:show</group>
         </attribute>
 
         <attribute name="enabled">
@@ -62,7 +60,6 @@
             <group>sylius:admin:payment_method:show</group>
             <group>admin:payment_method:update</group>
             <group>sylius:admin:payment_method:update</group>
-            <group>sylius:admin:payment_request:show</group>
         </attribute>
 
         <attribute name="code">
@@ -76,7 +73,6 @@
             <group>sylius:shop:payment_method:index</group>
             <group>shop:payment_method:show</group>
             <group>sylius:shop:payment_method:show</group>
-            <group>sylius:admin:payment_request:show</group>
         </attribute>
 
         <attribute name="description">
diff --git a/tests/Api/Responses/admin/payment_request/get_payment_request.json b/tests/Api/Responses/admin/payment_request/get_payment_request.json
index acbe1239f7..d374b5c12c 100644
--- a/tests/Api/Responses/admin/payment_request/get_payment_request.json
+++ b/tests/Api/Responses/admin/payment_request/get_payment_request.json
@@ -13,15 +13,7 @@
         "after_url": "https:\/\/myshop.tld\/after-path"
     },
     "payment": "\/api\/v2\/admin\/payments\/@integer@",
-    "method": {
-        "@id": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY",
-        "@type": "PaymentMethod",
-        "code": "CASH_ON_DELIVERY",
-        "enabled": true,
-        "translations": {
-            "en_US": "\/api\/v2\/admin\/payment-method-translations\/@integer@"
-        }
-    },
+    "method": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY",
     "createdAt": @datetime@,
     "updatedAt": @datetime@
 }
diff --git a/tests/Api/Responses/shop/payment_request/get_payment_request.json b/tests/Api/Responses/shop/payment_request/get_payment_request.json
index 352c126ed1..14fb48324c 100644
--- a/tests/Api/Responses/shop/payment_request/get_payment_request.json
+++ b/tests/Api/Responses/shop/payment_request/get_payment_request.json
@@ -17,11 +17,7 @@
         "after_url": "https:\/\/myshop.tld\/after-path"
     },
     "payment": "\/api\/v2\/shop\/payments\/@integer@",
-    "method": {
-        "@id": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
-        "@type": "PaymentMethod",
-        "name": "Cash on delivery"
-    },
+    "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
     "createdAt": @datetime@,
     "updatedAt": @datetime@
 }
diff --git a/tests/Api/Responses/shop/payment_request/post_payment_request.json b/tests/Api/Responses/shop/payment_request/post_payment_request.json
index 6e9e77f018..d6edf35e34 100644
--- a/tests/Api/Responses/shop/payment_request/post_payment_request.json
+++ b/tests/Api/Responses/shop/payment_request/post_payment_request.json
@@ -11,11 +11,7 @@
     },
     "responseData": [],
     "payment": "\/api\/v2\/shop\/payments\/@integer@",
-    "method": {
-        "@id": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
-        "@type": "PaymentMethod",
-        "name": "Cash on delivery"
-    },
+    "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
     "createdAt": @datetime@,
     "updatedAt": @datetime@
 }
diff --git a/tests/Api/Responses/shop/payment_request/put_payment_request.json b/tests/Api/Responses/shop/payment_request/put_payment_request.json
index d4cae7fb9a..8250100f0d 100644
--- a/tests/Api/Responses/shop/payment_request/put_payment_request.json
+++ b/tests/Api/Responses/shop/payment_request/put_payment_request.json
@@ -13,11 +13,7 @@
         "after_url": "https:\/\/myshop.tld\/after-path"
     },
     "payment": "\/api\/v2\/shop\/payments\/@integer@",
-    "method": {
-        "@id": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
-        "@type": "PaymentMethod",
-        "name": "Cash on delivery"
-    },
+    "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
     "createdAt": @datetime@,
     "updatedAt": @datetime@
 }

From d3393998f8e3daa262e7c31d67a61b6c9a21d195 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Mon, 11 Mar 2024 12:42:29 +0100
Subject: [PATCH 080/200] [Payment] Add relation to PaymentRequest

---
 .../Resources/config/doctrine/model/Payment.orm.xml   | 10 ++++++++++
 src/Sylius/Component/Payment/Model/Payment.php        | 11 +++++++++++
 .../Component/Payment/Model/PaymentInterface.php      |  3 +++
 3 files changed, 24 insertions(+)

diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml
index ddd3e7b39b..041779d977 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml
@@ -23,6 +23,16 @@
             <join-column name="method_id" referenced-column-name="id" nullable="true" />
         </many-to-one>
 
+        <one-to-many field="paymentRequests" target-entity="Sylius\Component\Payment\Model\PaymentRequestInterface" mapped-by="payment" orphan-removal="true">
+            <cascade>
+                <cascade-all/>
+            </cascade>
+
+            <order-by>
+                <order-by-field name="id" />
+            </order-by>
+        </one-to-many>
+
         <field name="currencyCode" column="currency_code" length="3" type="string" />
         <field name="amount" column="amount" type="integer" />
         <field name="state" column="state" type="string" />
diff --git a/src/Sylius/Component/Payment/Model/Payment.php b/src/Sylius/Component/Payment/Model/Payment.php
index efe6935e8d..e08d15ee57 100644
--- a/src/Sylius/Component/Payment/Model/Payment.php
+++ b/src/Sylius/Component/Payment/Model/Payment.php
@@ -13,6 +13,8 @@ declare(strict_types=1);
 
 namespace Sylius\Component\Payment\Model;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Resource\Model\TimestampableTrait;
 
 class Payment implements PaymentInterface
@@ -37,9 +39,13 @@ class Payment implements PaymentInterface
     /** @var mixed[] */
     protected $details = [];
 
+    /** @var Collection<array-key, PaymentRequestInterface> */
+    protected Collection $paymentRequests;
+
     public function __construct()
     {
         $this->createdAt = new \DateTime();
+        $this->paymentRequests = new ArrayCollection();
     }
 
     public function getId()
@@ -96,4 +102,9 @@ class Payment implements PaymentInterface
     {
         $this->details = $details;
     }
+
+    public function getPaymentRequests(): Collection
+    {
+        return $this->paymentRequests;
+    }
 }
diff --git a/src/Sylius/Component/Payment/Model/PaymentInterface.php b/src/Sylius/Component/Payment/Model/PaymentInterface.php
index 1fb2f1b340..645b449571 100644
--- a/src/Sylius/Component/Payment/Model/PaymentInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentInterface.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Component\Payment\Model;
 
+use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Sylius\Component\Resource\Model\TimestampableInterface;
 
@@ -58,4 +59,6 @@ interface PaymentInterface extends TimestampableInterface, ResourceInterface
     public function getDetails(): array;
 
     public function setDetails(array $details): void;
+
+    public function getPaymentRequests(): Collection;
 }

From 592090fe1f4339b4c8ebebfcab8def8e2c98e020 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Mon, 11 Mar 2024 12:43:18 +0100
Subject: [PATCH 081/200] [ApiBundle][Payment] Add subresource for payment
 request

---
 .../Resources/config/api_resources/Order.xml  |  2 +-
 .../config/api_resources/Payment.xml          |  8 +++++
 .../config/api_resources/PaymentRequest.xml   | 19 +++++-----
 .../Resources/config/services/filters.xml     |  8 -----
 tests/Api/Admin/PaymentRequestsTest.php       | 12 ++++---
 ... => get_payment_requests_for_payment.json} | 35 ++-----------------
 6 files changed, 27 insertions(+), 57 deletions(-)
 rename tests/Api/Responses/admin/payment_request/{get_payment_requests.json => get_payment_requests_for_payment.json} (52%)

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Order.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Order.xml
index 293b0986ea..817a8e4565 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Order.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Order.xml
@@ -502,7 +502,7 @@
             <subresource resourceClass="%sylius.model.shipment.class%" />
         </property>
         <property name="payments" writable="false">
-            <subresource resourceClass="%sylius.model.payment.class%" />
+            <subresource resourceClass="%sylius.model.payment.class%" maxDepth="1"/>
         </property>
         <property name="state" writable="false" />
         <property name="paymentState" writable="false" />
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Payment.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Payment.xml
index 9fafd2cd61..5e317937b5 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Payment.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Payment.xml
@@ -73,6 +73,11 @@
         </itemOperations>
 
         <subresourceOperations>
+            <subresourceOperation name="payment_requests_get_subresource">
+                <attribute name="method">GET</attribute>
+                <attribute name="path">/admin/payments/{id}/payment-requests</attribute>
+            </subresourceOperation>
+
             <subresourceOperation name="api_orders_payments_get_subresource">
                 <attribute name="normalization_context">
                     <attribute name="groups">
@@ -91,5 +96,8 @@
         <property name="state" writable="false" />
         <property name="details" writable="false" />
         <property name="order" writable="false" />
+        <property name="paymentRequests" readable="true" writable="false">
+            <subresource resourceClass="%sylius.model.payment_request.class%" />
+        </property>
     </resource>
 </resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
index c813f6d672..51cc46e6f4 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentRequest.xml
@@ -23,17 +23,6 @@
         </attribute>
 
         <collectionOperations>
-            <collectionOperation name="admin_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/payment-requests</attribute>
-                <attribute name="filters">
-                    <attribute>sylius.api.search_payment_request_filter</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">sylius:admin:payment_request:index</attribute>
-                </attribute>
-            </collectionOperation>
-
             <collectionOperation name="shop_post">
                 <attribute name="method">POST</attribute>
                 <attribute name="path">/shop/payment-requests</attribute>
@@ -81,6 +70,14 @@
             </itemOperation>
         </itemOperations>
 
+        <subresourceOperations>
+            <subresourceOperation name="api_payments_payment_requests_get_subresource">
+                <attribute name="normalization_context">
+                    <attribute name="groups">sylius:admin:payment_request:index</attribute>
+                </attribute>
+            </subresourceOperation>
+        </subresourceOperations>
+
         <property name="hash" identifier="true" writable="false" />
         <property name="state" writable="false" />
         <property name="payload" writable="true" />
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
index 3a27546800..5edc5c55d3 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
@@ -17,14 +17,6 @@
             <tag name="api_platform.filter" />
         </service>
 
-        <service id="sylius.api.search_payment_request_filter" parent="api_platform.doctrine.orm.search_filter" public="true">
-            <argument type="collection">
-                <argument key="state">exact</argument>
-                <argument key="method.code">exact</argument>
-            </argument>
-            <tag name="api_platform.filter" />
-        </service>
-
         <service id="sylius.api.search_shipment_filter" parent="api_platform.doctrine.orm.search_filter" public="true">
             <argument type="collection">
                 <argument key="state">exact</argument>
diff --git a/tests/Api/Admin/PaymentRequestsTest.php b/tests/Api/Admin/PaymentRequestsTest.php
index 592258fd8b..b8ecaed7ac 100644
--- a/tests/Api/Admin/PaymentRequestsTest.php
+++ b/tests/Api/Admin/PaymentRequestsTest.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Tests\Api\Admin;
 
+use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Tests\Api\JsonApiTestCase;
 
@@ -26,11 +27,11 @@ final class PaymentRequestsTest extends JsonApiTestCase
     }
 
     /** @test */
-    public function it_gets_payment_requests(): void
+    public function it_gets_payment_requests_for_payment(): void
     {
         $this->setUpDefaultGetHeaders();
 
-        $this->loadFixturesFromFiles([
+        $fixtures = $this->loadFixturesFromFiles([
             'authentication/api_administrator.yaml',
             'channel.yaml',
             'payment_method.yaml',
@@ -38,9 +39,12 @@ final class PaymentRequestsTest extends JsonApiTestCase
             'payment_request/order.yaml',
         ]);
 
-        $this->requestGet(uri: '/api/v2/admin/payment-requests');
+        /** @var PaymentInterface $payment */
+        $payment = $fixtures['payment'];
 
-        $this->assertResponseSuccessful('admin/payment_request/get_payment_requests');
+        $this->requestGet(uri: sprintf('/api/v2/admin/payments/%s/payment-requests', $payment->getId()));
+
+        $this->assertResponseSuccessful('admin/payment_request/get_payment_requests_for_payment');
     }
 
     /** @test */
diff --git a/tests/Api/Responses/admin/payment_request/get_payment_requests.json b/tests/Api/Responses/admin/payment_request/get_payment_requests_for_payment.json
similarity index 52%
rename from tests/Api/Responses/admin/payment_request/get_payment_requests.json
rename to tests/Api/Responses/admin/payment_request/get_payment_requests_for_payment.json
index b8cabfe08b..3f3ebee59c 100644
--- a/tests/Api/Responses/admin/payment_request/get_payment_requests.json
+++ b/tests/Api/Responses/admin/payment_request/get_payment_requests_for_payment.json
@@ -1,6 +1,6 @@
 {
     "@context": "\/api\/v2\/contexts\/PaymentRequest",
-    "@id": "\/api\/v2\/admin\/payment-requests",
+    "@id": "\/api\/v2\/admin\/payments\/@integer@\/payment-requests",
     "@type": "hydra:Collection",
     "hydra:member": [
         {
@@ -31,36 +31,5 @@
             "method": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY"
         }
     ],
-    "hydra:totalItems": 3,
-    "hydra:search": {
-        "@type": "hydra:IriTemplate",
-        "hydra:template": "\/api\/v2\/admin\/payment-requests{?state,state[],method.code,method.code[]}",
-        "hydra:variableRepresentation": "BasicRepresentation",
-        "hydra:mapping": [
-            {
-                "@type": "IriTemplateMapping",
-                "variable": "state",
-                "property": "state",
-                "required": false
-            },
-            {
-                "@type": "IriTemplateMapping",
-                "variable": "state[]",
-                "property": "state",
-                "required": false
-            },
-            {
-                "@type": "IriTemplateMapping",
-                "variable": "method.code",
-                "property": "method.code",
-                "required": false
-            },
-            {
-                "@type": "IriTemplateMapping",
-                "variable": "method.code[]",
-                "property": "method.code",
-                "required": false
-            }
-        ]
-    }
+    "hydra:totalItems": 3
 }

From c33d0957cc1df419a32a40892c000333d242e80f Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Mon, 11 Mar 2024 12:50:19 +0100
Subject: [PATCH 082/200] Fix phpstan

---
 src/Sylius/Component/Payment/Model/PaymentInterface.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Sylius/Component/Payment/Model/PaymentInterface.php b/src/Sylius/Component/Payment/Model/PaymentInterface.php
index 645b449571..aade908c18 100644
--- a/src/Sylius/Component/Payment/Model/PaymentInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentInterface.php
@@ -60,5 +60,8 @@ interface PaymentInterface extends TimestampableInterface, ResourceInterface
 
     public function setDetails(array $details): void;
 
+    /**
+     * @return Collection<array-key, PaymentRequestInterface>
+     */
     public function getPaymentRequests(): Collection;
 }

From e786fb486a32c9f153156652799a033f2f0ae278 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Mon, 11 Mar 2024 13:42:20 +0100
Subject: [PATCH 083/200] [ApiBundle] Add normalization group to payment
 complete endpoint

---
 .../ApiBundle/Resources/config/api_resources/Payment.xml    | 6 ++++++
 .../Resources/config/doctrine/model/Payment.orm.xml         | 4 ----
 .../admin/payment/patch_complete_payment_response.json      | 6 +++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Payment.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Payment.xml
index 5e317937b5..755d3aae09 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Payment.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Payment.xml
@@ -69,6 +69,12 @@
                 <attribute name="openapi_context">
                     <attribute name="summary">Completes Payment.</attribute>
                 </attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">
+                        <attribute>shop:payment:show</attribute>
+                        <attribute>sylius:shop:payment:show</attribute>
+                    </attribute>
+                </attribute>
             </itemOperation>
         </itemOperations>
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml
index 041779d977..27e17cc3d0 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/Payment.orm.xml
@@ -27,10 +27,6 @@
             <cascade>
                 <cascade-all/>
             </cascade>
-
-            <order-by>
-                <order-by-field name="id" />
-            </order-by>
         </one-to-many>
 
         <field name="currencyCode" column="currency_code" length="3" type="string" />
diff --git a/tests/Api/Responses/admin/payment/patch_complete_payment_response.json b/tests/Api/Responses/admin/payment/patch_complete_payment_response.json
index 2e136356fd..6308190e6f 100644
--- a/tests/Api/Responses/admin/payment/patch_complete_payment_response.json
+++ b/tests/Api/Responses/admin/payment/patch_complete_payment_response.json
@@ -4,7 +4,11 @@
     "@type": "Payment",
     "order": "\/api\/v2\/admin\/orders\/nAWw2jewpA",
     "id": @integer@,
-    "method": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY",
+    "method": {
+        "@id": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY",
+        "@type": "PaymentMethod",
+        "name": "Cash on delivery"
+    },
     "currencyCode": "USD",
     "amount": 6500,
     "state": "completed",

From 1d2f327c745ff7caeb762ec0a42c3476d538153f Mon Sep 17 00:00:00 2001
From: Jacob Tobiasz <jakub.tobiasz@icloud.com>
Date: Mon, 11 Mar 2024 15:20:36 +0100
Subject: [PATCH 084/200] Create an environment for payumless tests

---
 .env.test_cached_payumless                    | 21 +++++++++++++++++++
 config/bundles.php                            | 12 +++++------
 .../test_cached_payumless/_sylius.yaml        |  2 ++
 .../test_cached_payumless/doctrine.yaml       |  2 ++
 .../fidry_alice_data_fixtures.yaml            |  2 ++
 .../test_cached_payumless/fos_rest.yaml       |  2 ++
 .../test_cached_payumless/framework.yaml      |  2 ++
 .../test_cached_payumless/mailer.yaml         |  2 ++
 .../test_cached_payumless/monolog.yaml        |  2 ++
 .../test_cached_payumless/nelmio_alice.yaml   |  2 ++
 .../test_cached_payumless/security.yaml       |  2 ++
 .../test_cached_payumless/sylius_channel.yaml |  2 ++
 .../test_cached_payumless/sylius_theme.yaml   |  2 ++
 .../sylius_uploader.yaml                      |  2 ++
 .../packages/test_cached_payumless/twig.yaml  |  2 ++
 .../test_cached_payumless/web_profiler.yaml   |  2 ++
 .../test_cached_payumless/webpack_encore.yaml |  2 ++
 .../routes/test_cached_payumless/routing.yaml |  5 +++++
 config/services_test_cached_payumless.yaml    |  3 +++
 .../Resources/config/app/config.yml           |  5 +++++
 20 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 .env.test_cached_payumless
 create mode 100644 config/packages/test_cached_payumless/_sylius.yaml
 create mode 100644 config/packages/test_cached_payumless/doctrine.yaml
 create mode 100644 config/packages/test_cached_payumless/fidry_alice_data_fixtures.yaml
 create mode 100644 config/packages/test_cached_payumless/fos_rest.yaml
 create mode 100644 config/packages/test_cached_payumless/framework.yaml
 create mode 100644 config/packages/test_cached_payumless/mailer.yaml
 create mode 100644 config/packages/test_cached_payumless/monolog.yaml
 create mode 100644 config/packages/test_cached_payumless/nelmio_alice.yaml
 create mode 100644 config/packages/test_cached_payumless/security.yaml
 create mode 100644 config/packages/test_cached_payumless/sylius_channel.yaml
 create mode 100644 config/packages/test_cached_payumless/sylius_theme.yaml
 create mode 100644 config/packages/test_cached_payumless/sylius_uploader.yaml
 create mode 100644 config/packages/test_cached_payumless/twig.yaml
 create mode 100644 config/packages/test_cached_payumless/web_profiler.yaml
 create mode 100644 config/packages/test_cached_payumless/webpack_encore.yaml
 create mode 100644 config/routes/test_cached_payumless/routing.yaml
 create mode 100644 config/services_test_cached_payumless.yaml

diff --git a/.env.test_cached_payumless b/.env.test_cached_payumless
new file mode 100644
index 0000000000..e278eea0cc
--- /dev/null
+++ b/.env.test_cached_payumless
@@ -0,0 +1,21 @@
+APP_DEBUG=0
+APP_SECRET='s$cretf0rt3st'
+
+KERNEL_CLASS='App\Kernel'
+
+###> lexik/jwt-authentication-bundle ###
+JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private-test.pem
+JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public-test.pem
+JWT_PASSPHRASE=ALL_THAT_IS_GOLD_DOES_NOT_GLITTER_NOT_ALL_THOSE_WHO_WANDER_ARE_LOST
+###< lexik/jwt-authentication-bundle ###
+
+###> symfony/messenger ###
+SYLIUS_MESSENGER_TRANSPORT_MAIN_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_MAIN_FAILED_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_FAILED_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_DSN=sync://
+SYLIUS_MESSENGER_TRANSPORT_PAYMENT_REQUEST_FAILED_DSN=sync://
+###< symfony/messenger ###
+
+MAILER_DSN=null://null
diff --git a/config/bundles.php b/config/bundles.php
index 67cabd4d94..c9dcaf8b16 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -49,12 +49,12 @@ return [
     Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
     ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
-    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
-    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
-    Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
-    Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
-    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true],
-    Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
+    Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
+    Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
+    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
+    Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
     SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
diff --git a/config/packages/test_cached_payumless/_sylius.yaml b/config/packages/test_cached_payumless/_sylius.yaml
new file mode 100644
index 0000000000..c37a7353a0
--- /dev/null
+++ b/config/packages/test_cached_payumless/_sylius.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/_sylius.yaml" }
diff --git a/config/packages/test_cached_payumless/doctrine.yaml b/config/packages/test_cached_payumless/doctrine.yaml
new file mode 100644
index 0000000000..c3263c8bb9
--- /dev/null
+++ b/config/packages/test_cached_payumless/doctrine.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/doctrine.yaml" }
diff --git a/config/packages/test_cached_payumless/fidry_alice_data_fixtures.yaml b/config/packages/test_cached_payumless/fidry_alice_data_fixtures.yaml
new file mode 100644
index 0000000000..dc171f69eb
--- /dev/null
+++ b/config/packages/test_cached_payumless/fidry_alice_data_fixtures.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/fidry_alice_data_fixtures.yaml" }
diff --git a/config/packages/test_cached_payumless/fos_rest.yaml b/config/packages/test_cached_payumless/fos_rest.yaml
new file mode 100644
index 0000000000..63c269b1a1
--- /dev/null
+++ b/config/packages/test_cached_payumless/fos_rest.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/fos_rest.yaml" }
diff --git a/config/packages/test_cached_payumless/framework.yaml b/config/packages/test_cached_payumless/framework.yaml
new file mode 100644
index 0000000000..8ced67a150
--- /dev/null
+++ b/config/packages/test_cached_payumless/framework.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/framework.yaml" }
diff --git a/config/packages/test_cached_payumless/mailer.yaml b/config/packages/test_cached_payumless/mailer.yaml
new file mode 100644
index 0000000000..3397f9db95
--- /dev/null
+++ b/config/packages/test_cached_payumless/mailer.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/mailer.yaml" }
diff --git a/config/packages/test_cached_payumless/monolog.yaml b/config/packages/test_cached_payumless/monolog.yaml
new file mode 100644
index 0000000000..287961d338
--- /dev/null
+++ b/config/packages/test_cached_payumless/monolog.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/monolog.yaml" }
diff --git a/config/packages/test_cached_payumless/nelmio_alice.yaml b/config/packages/test_cached_payumless/nelmio_alice.yaml
new file mode 100644
index 0000000000..caec543dea
--- /dev/null
+++ b/config/packages/test_cached_payumless/nelmio_alice.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: ../dev/nelmio_alice.yaml }
diff --git a/config/packages/test_cached_payumless/security.yaml b/config/packages/test_cached_payumless/security.yaml
new file mode 100644
index 0000000000..325f82c0dd
--- /dev/null
+++ b/config/packages/test_cached_payumless/security.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/security.yaml" }
diff --git a/config/packages/test_cached_payumless/sylius_channel.yaml b/config/packages/test_cached_payumless/sylius_channel.yaml
new file mode 100644
index 0000000000..8498632aff
--- /dev/null
+++ b/config/packages/test_cached_payumless/sylius_channel.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/sylius_channel.yaml" }
diff --git a/config/packages/test_cached_payumless/sylius_theme.yaml b/config/packages/test_cached_payumless/sylius_theme.yaml
new file mode 100644
index 0000000000..50898d6766
--- /dev/null
+++ b/config/packages/test_cached_payumless/sylius_theme.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/sylius_theme.yaml" }
diff --git a/config/packages/test_cached_payumless/sylius_uploader.yaml b/config/packages/test_cached_payumless/sylius_uploader.yaml
new file mode 100644
index 0000000000..430da6ead1
--- /dev/null
+++ b/config/packages/test_cached_payumless/sylius_uploader.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/sylius_uploader.yaml" }
diff --git a/config/packages/test_cached_payumless/twig.yaml b/config/packages/test_cached_payumless/twig.yaml
new file mode 100644
index 0000000000..79615ca899
--- /dev/null
+++ b/config/packages/test_cached_payumless/twig.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/twig.yaml" }
diff --git a/config/packages/test_cached_payumless/web_profiler.yaml b/config/packages/test_cached_payumless/web_profiler.yaml
new file mode 100644
index 0000000000..cc60840683
--- /dev/null
+++ b/config/packages/test_cached_payumless/web_profiler.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/web_profiler.yaml" }
diff --git a/config/packages/test_cached_payumless/webpack_encore.yaml b/config/packages/test_cached_payumless/webpack_encore.yaml
new file mode 100644
index 0000000000..7dedf7a728
--- /dev/null
+++ b/config/packages/test_cached_payumless/webpack_encore.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test_cached/webpack_encore.yaml" }
diff --git a/config/routes/test_cached_payumless/routing.yaml b/config/routes/test_cached_payumless/routing.yaml
new file mode 100644
index 0000000000..6a6bd07275
--- /dev/null
+++ b/config/routes/test_cached_payumless/routing.yaml
@@ -0,0 +1,5 @@
+sylius_test_plugin_main:
+    path: /test/main
+    controller: Symfony\Bundle\FrameworkBundle\Controller\TemplateController::templateAction
+    defaults:
+        template: "@SyliusTestPlugin/main.html.twig"
diff --git a/config/services_test_cached_payumless.yaml b/config/services_test_cached_payumless.yaml
new file mode 100644
index 0000000000..b1400ab1eb
--- /dev/null
+++ b/config/services_test_cached_payumless.yaml
@@ -0,0 +1,3 @@
+imports:
+    - { resource: "services_test_cached.yaml" }
+    - { resource: "../vendor/sylius/calendar/config/services_test.yaml" }
diff --git a/src/Sylius/Bundle/UserBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/UserBundle/Resources/config/app/config.yml
index bb27ecf627..f02586ce53 100644
--- a/src/Sylius/Bundle/UserBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/UserBundle/Resources/config/app/config.yml
@@ -15,6 +15,11 @@ when@test_cached:
         password_hashers:
             plaintext: plaintext
 
+when@test_cached_payumless:
+    security:
+        password_hashers:
+            plaintext: plaintext
+
 sylius_user:
     encoder: argon2i
 

From 6aafbff5b1611aa1a2c903ade55bdfde968e750c Mon Sep 17 00:00:00 2001
From: Jacob Tobiasz <jakub.tobiasz@icloud.com>
Date: Mon, 11 Mar 2024 15:26:11 +0100
Subject: [PATCH 085/200] Add workflows using the test_cached_payumless env

---
 .github/workflows/ci_e2e-mysql.yaml |  8 ++++----
 .github/workflows/matrix.json       | 22 ++++++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci_e2e-mysql.yaml b/.github/workflows/ci_e2e-mysql.yaml
index f2401d5be2..93f2f858f7 100644
--- a/.github/workflows/ci_e2e-mysql.yaml
+++ b/.github/workflows/ci_e2e-mysql.yaml
@@ -44,14 +44,14 @@ jobs:
     behat-no-js:
         needs: get-matrix
         runs-on: ubuntu-latest
-        name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
+        name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} (${{ matrix.env }}), MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
         timeout-minutes: 45
         strategy:
             fail-fast: false
             matrix: ${{ fromJson(needs.get-matrix.outputs.matrix) }}
 
         env:
-            APP_ENV: test_cached
+            APP_ENV: ${{ matrix.env }}
             DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?charset=utf8mb4&serverVersion=${{ matrix.mysql }}"
 
         steps:
@@ -132,14 +132,14 @@ jobs:
     behat-ui-js:
         needs: get-matrix
         runs-on: ubuntu-latest
-        name: "JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
+        name: "JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} (${{ matrix.env }}), MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
         timeout-minutes: 45
         strategy:
             fail-fast: false
             matrix: ${{ fromJson(needs.get-matrix.outputs.matrix) }}
 
         env:
-            APP_ENV: test_cached
+            APP_ENV: ${{ matrix.env }}
             DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?charset=utf8mb4&serverVersion=${{ matrix.mysql }}"
 
         steps:
diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
index e7a5fe82d9..ce64ce429b 100644
--- a/.github/workflows/matrix.json
+++ b/.github/workflows/matrix.json
@@ -27,7 +27,14 @@
           "symfony": "^6.4",
           "api-platform": "^2.7.10",
           "mysql": "8.0",
-          "twig": "^3.3"
+          "env": "test_cached"
+        },
+        {
+          "php": "8.2",
+          "symfony": "^6.4",
+          "api-platform": "^2.7.10",
+          "mysql": "8.0",
+          "env": "test_cached_payumless"
         }
       ]
     },
@@ -81,7 +88,18 @@
       "symfony": [ "^6.4" ],
       "api-platform": [ "^2.7.10" ],
       "mysql": [ "5.7", "8.0" ],
-      "twig": [ "^3.3" ]
+      "twig": [ "^3.3" ],
+      "env": "test_cached",
+      "include": [
+        {
+          "php": "8.2",
+          "symfony": "^6.4",
+          "api-platform": "^2.7.10",
+          "mysql": "8.0",
+          "twig": "^3.3",
+          "env": "test_cached_payumless"
+        }
+      ]
     },
     "e2e-pgsql": {
       "php": [ "8.2" ],

From 81089b1f9ce722d9fde94ad3e2f30b70d2caa98e Mon Sep 17 00:00:00 2001
From: Jacob Tobiasz <jakub.tobiasz@icloud.com>
Date: Tue, 12 Mar 2024 16:59:59 +0100
Subject: [PATCH 086/200] Rename the test_cached_payumless environment to
 test_cached_payum

---
 .env.test_cached_payumless => .env.test_cached_payum |  0
 .github/workflows/matrix.json                        |  5 +++--
 config/bundles.php                                   | 12 ++++++------
 .../_sylius.yaml                                     |  0
 .../doctrine.yaml                                    |  0
 .../fidry_alice_data_fixtures.yaml                   |  0
 .../fos_rest.yaml                                    |  0
 .../framework.yaml                                   |  0
 .../mailer.yaml                                      |  0
 .../monolog.yaml                                     |  0
 .../nelmio_alice.yaml                                |  0
 .../security.yaml                                    |  0
 .../sylius_channel.yaml                              |  0
 .../sylius_theme.yaml                                |  0
 .../sylius_uploader.yaml                             |  0
 .../twig.yaml                                        |  0
 .../web_profiler.yaml                                |  0
 .../webpack_encore.yaml                              |  0
 .../routing.yaml                                     |  0
 ...ayumless.yaml => services_test_cached_payum.yaml} |  0
 .../UserBundle/Resources/config/app/config.yml       |  2 +-
 21 files changed, 10 insertions(+), 9 deletions(-)
 rename .env.test_cached_payumless => .env.test_cached_payum (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/_sylius.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/doctrine.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/fidry_alice_data_fixtures.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/fos_rest.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/framework.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/mailer.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/monolog.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/nelmio_alice.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/security.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/sylius_channel.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/sylius_theme.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/sylius_uploader.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/twig.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/web_profiler.yaml (100%)
 rename config/packages/{test_cached_payumless => test_cached_payum}/webpack_encore.yaml (100%)
 rename config/routes/{test_cached_payumless => test_cached_payum}/routing.yaml (100%)
 rename config/{services_test_cached_payumless.yaml => services_test_cached_payum.yaml} (100%)

diff --git a/.env.test_cached_payumless b/.env.test_cached_payum
similarity index 100%
rename from .env.test_cached_payumless
rename to .env.test_cached_payum
diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
index ce64ce429b..8bb57b8cea 100644
--- a/.github/workflows/matrix.json
+++ b/.github/workflows/matrix.json
@@ -34,7 +34,8 @@
           "symfony": "^6.4",
           "api-platform": "^2.7.10",
           "mysql": "8.0",
-          "env": "test_cached_payumless"
+          "twig": "^3.3",
+          "env": "test_cached_payum"
         }
       ]
     },
@@ -97,7 +98,7 @@
           "api-platform": "^2.7.10",
           "mysql": "8.0",
           "twig": "^3.3",
-          "env": "test_cached_payumless"
+          "env": "test_cached_payum"
         }
       ]
     },
diff --git a/config/bundles.php b/config/bundles.php
index c9dcaf8b16..bd22716619 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -49,12 +49,12 @@ return [
     Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
     ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
-    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
-    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
-    Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
-    Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
-    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
-    Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true, 'test_cached_payumless' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payum' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payum' => true],
+    Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payum' => true],
+    Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_cached_payum' => true],
+    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true, 'test_cached_payum' => true],
+    Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true, 'test_cached_payum' => true],
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
     SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
diff --git a/config/packages/test_cached_payumless/_sylius.yaml b/config/packages/test_cached_payum/_sylius.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/_sylius.yaml
rename to config/packages/test_cached_payum/_sylius.yaml
diff --git a/config/packages/test_cached_payumless/doctrine.yaml b/config/packages/test_cached_payum/doctrine.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/doctrine.yaml
rename to config/packages/test_cached_payum/doctrine.yaml
diff --git a/config/packages/test_cached_payumless/fidry_alice_data_fixtures.yaml b/config/packages/test_cached_payum/fidry_alice_data_fixtures.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/fidry_alice_data_fixtures.yaml
rename to config/packages/test_cached_payum/fidry_alice_data_fixtures.yaml
diff --git a/config/packages/test_cached_payumless/fos_rest.yaml b/config/packages/test_cached_payum/fos_rest.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/fos_rest.yaml
rename to config/packages/test_cached_payum/fos_rest.yaml
diff --git a/config/packages/test_cached_payumless/framework.yaml b/config/packages/test_cached_payum/framework.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/framework.yaml
rename to config/packages/test_cached_payum/framework.yaml
diff --git a/config/packages/test_cached_payumless/mailer.yaml b/config/packages/test_cached_payum/mailer.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/mailer.yaml
rename to config/packages/test_cached_payum/mailer.yaml
diff --git a/config/packages/test_cached_payumless/monolog.yaml b/config/packages/test_cached_payum/monolog.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/monolog.yaml
rename to config/packages/test_cached_payum/monolog.yaml
diff --git a/config/packages/test_cached_payumless/nelmio_alice.yaml b/config/packages/test_cached_payum/nelmio_alice.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/nelmio_alice.yaml
rename to config/packages/test_cached_payum/nelmio_alice.yaml
diff --git a/config/packages/test_cached_payumless/security.yaml b/config/packages/test_cached_payum/security.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/security.yaml
rename to config/packages/test_cached_payum/security.yaml
diff --git a/config/packages/test_cached_payumless/sylius_channel.yaml b/config/packages/test_cached_payum/sylius_channel.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/sylius_channel.yaml
rename to config/packages/test_cached_payum/sylius_channel.yaml
diff --git a/config/packages/test_cached_payumless/sylius_theme.yaml b/config/packages/test_cached_payum/sylius_theme.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/sylius_theme.yaml
rename to config/packages/test_cached_payum/sylius_theme.yaml
diff --git a/config/packages/test_cached_payumless/sylius_uploader.yaml b/config/packages/test_cached_payum/sylius_uploader.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/sylius_uploader.yaml
rename to config/packages/test_cached_payum/sylius_uploader.yaml
diff --git a/config/packages/test_cached_payumless/twig.yaml b/config/packages/test_cached_payum/twig.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/twig.yaml
rename to config/packages/test_cached_payum/twig.yaml
diff --git a/config/packages/test_cached_payumless/web_profiler.yaml b/config/packages/test_cached_payum/web_profiler.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/web_profiler.yaml
rename to config/packages/test_cached_payum/web_profiler.yaml
diff --git a/config/packages/test_cached_payumless/webpack_encore.yaml b/config/packages/test_cached_payum/webpack_encore.yaml
similarity index 100%
rename from config/packages/test_cached_payumless/webpack_encore.yaml
rename to config/packages/test_cached_payum/webpack_encore.yaml
diff --git a/config/routes/test_cached_payumless/routing.yaml b/config/routes/test_cached_payum/routing.yaml
similarity index 100%
rename from config/routes/test_cached_payumless/routing.yaml
rename to config/routes/test_cached_payum/routing.yaml
diff --git a/config/services_test_cached_payumless.yaml b/config/services_test_cached_payum.yaml
similarity index 100%
rename from config/services_test_cached_payumless.yaml
rename to config/services_test_cached_payum.yaml
diff --git a/src/Sylius/Bundle/UserBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/UserBundle/Resources/config/app/config.yml
index f02586ce53..4826d523a1 100644
--- a/src/Sylius/Bundle/UserBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/UserBundle/Resources/config/app/config.yml
@@ -15,7 +15,7 @@ when@test_cached:
         password_hashers:
             plaintext: plaintext
 
-when@test_cached_payumless:
+when@test_cached_payum:
     security:
         password_hashers:
             plaintext: plaintext

From 842a791ccf44cc9d6b813388f0805205bed1ee76 Mon Sep 17 00:00:00 2001
From: Jacob Tobiasz <jakub.tobiasz@icloud.com>
Date: Tue, 12 Mar 2024 17:06:10 +0100
Subject: [PATCH 087/200] Change the
 'sylius.payment_request.command_provider.payum.offline' priority when the
 test_cached_payum env is used

---
 config/services_test_cached_payum.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/services_test_cached_payum.yaml b/config/services_test_cached_payum.yaml
index b1400ab1eb..aeb560b999 100644
--- a/config/services_test_cached_payum.yaml
+++ b/config/services_test_cached_payum.yaml
@@ -1,3 +1,11 @@
 imports:
     - { resource: "services_test_cached.yaml" }
     - { resource: "../vendor/sylius/calendar/config/services_test.yaml" }
+
+services:
+    'sylius.payment_request.command_provider.payum.offline':
+        class: Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider
+        arguments:
+            - !tagged_locator { tag: 'sylius.payment_request.command_provider.payum.offline', index_by: 'type' }
+        tags:
+            - { name: 'sylius.payment_request.command_provider', gateway-factory: 'offline', priority: -200 }

From 06c1853507b44d8f4551aa9b718f938877e73cfa Mon Sep 17 00:00:00 2001
From: Jacob Tobiasz <jakub.tobiasz@icloud.com>
Date: Wed, 13 Mar 2024 12:03:07 +0100
Subject: [PATCH 088/200] Fix Payum-related tests

---
 .../payment_request_payum.yaml                |  16 +++
 .../post_payment_request_payum.json           |  19 ++++
 .../put_payment_request_payum.json            |  19 ++++
 tests/Api/Shop/PaymentRequestsTest.php        | 106 ++++++++++++++----
 4 files changed, 138 insertions(+), 22 deletions(-)
 create mode 100644 tests/Api/DataFixtures/ORM/payment_request/payment_request_payum.yaml
 create mode 100644 tests/Api/Responses/shop/payment_request/post_payment_request_payum.json
 create mode 100644 tests/Api/Responses/shop/payment_request/put_payment_request_payum.json

diff --git a/tests/Api/DataFixtures/ORM/payment_request/payment_request_payum.yaml b/tests/Api/DataFixtures/ORM/payment_request/payment_request_payum.yaml
new file mode 100644
index 0000000000..0d24ef5909
--- /dev/null
+++ b/tests/Api/DataFixtures/ORM/payment_request/payment_request_payum.yaml
@@ -0,0 +1,16 @@
+Sylius\Component\Payment\Model\PaymentRequest:
+    payment_request_capture:
+        __construct: [ '@payment', '@payment_method_cash_on_delivery' ]
+        state: "processing"
+        action: "capture"
+        payload: {
+            "http_request": {
+                "query": {
+                    "token": "EC-2d9EV13959UR209410U",
+                    "PayerID": "UX8WBNYWGBVMG"
+                }
+            }
+        }
+        responseData: {
+            "after_url": "https://myshop.tld/after-path",
+        }
diff --git a/tests/Api/Responses/shop/payment_request/post_payment_request_payum.json b/tests/Api/Responses/shop/payment_request/post_payment_request_payum.json
new file mode 100644
index 0000000000..2ed23f5e4a
--- /dev/null
+++ b/tests/Api/Responses/shop/payment_request/post_payment_request_payum.json
@@ -0,0 +1,19 @@
+{
+    "@context": "\/api\/v2\/contexts\/PaymentRequest",
+    "@id": "\/api\/v2\/shop\/payment-requests\/@string@",
+    "@type": "PaymentRequest",
+    "hash": "@string@",
+    "state": "completed",
+    "action": "capture",
+    "payload": {
+        "target_path": "https:\/\/myshop.tld\/target-path",
+        "after_path": "https:\/\/myshop.tld\/after-path"
+    },
+    "responseData": {
+        "after_url": "@string@"
+    },
+    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
+    "createdAt": @datetime@,
+    "updatedAt": @datetime@
+}
diff --git a/tests/Api/Responses/shop/payment_request/put_payment_request_payum.json b/tests/Api/Responses/shop/payment_request/put_payment_request_payum.json
new file mode 100644
index 0000000000..e310749a04
--- /dev/null
+++ b/tests/Api/Responses/shop/payment_request/put_payment_request_payum.json
@@ -0,0 +1,19 @@
+{
+    "@context": "\/api\/v2\/contexts\/PaymentRequest",
+    "@id": "\/api\/v2\/shop\/payment-requests\/@string@",
+    "@type": "PaymentRequest",
+    "hash": "@string@",
+    "state": "completed",
+    "action": "capture",
+    "payload": {
+        "target_path": "https:\/\/myshop.tld\/new-target-path",
+        "after_path": "https:\/\/myshop.tld\/new-after-path"
+    },
+    "responseData": {
+        "after_url": "https:\/\/myshop.tld\/new-after-path"
+    },
+    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
+    "createdAt": @datetime@,
+    "updatedAt": @datetime@
+}
diff --git a/tests/Api/Shop/PaymentRequestsTest.php b/tests/Api/Shop/PaymentRequestsTest.php
index bfdac8291f..45eda051f0 100644
--- a/tests/Api/Shop/PaymentRequestsTest.php
+++ b/tests/Api/Shop/PaymentRequestsTest.php
@@ -56,17 +56,16 @@ final class PaymentRequestsTest extends JsonApiTestCase
         $this->assertResponseSuccessful('shop/payment_request/get_payment_request');
     }
 
-    /** @test */
-    public function it_creates_a_payment_request(): void
+    /**
+     * @test
+     * @dataProvider createPaymentRequestProvider
+     *
+     * @param array<string> $fixturesPaths
+     * @throws \JsonException
+     */
+    public function it_creates_a_payment_request(array $fixturesPaths, string $responsePath): void
     {
-        $this->loadFixturesFromFiles([
-            'authentication/customer.yaml',
-            'channel.yaml',
-            'cart.yaml',
-            'country.yaml',
-            'shipping_method.yaml',
-            'payment_method.yaml',
-        ]);
+        $this->loadFixturesFromFiles($fixturesPaths);
 
         $order = $this->placeOrder('nAWw2jewpA', 'oliver@doe.com');
         $payment = $order->getLastPayment();
@@ -86,14 +85,46 @@ final class PaymentRequestsTest extends JsonApiTestCase
             ], \JSON_THROW_ON_ERROR)
         );
 
-
         $this->assertResponse(
             $this->client->getResponse(),
-            'shop/payment_request/post_payment_request',
+            $responsePath,
             Response::HTTP_CREATED,
         );
     }
 
+    public function createPaymentRequestProvider(): iterable
+    {
+        $environment = getenv('APP_ENV');
+
+        if ($environment === 'test_cached_payum') {
+            yield [
+                [
+                    'authentication/customer.yaml',
+                    'channel.yaml',
+                    'cart.yaml',
+                    'country.yaml',
+                    'shipping_method.yaml',
+                    'payment_method.yaml',
+                ],
+                'shop/payment_request/post_payment_request_payum',
+            ];
+
+            return;
+        }
+
+        yield [
+            [
+                'authentication/customer.yaml',
+                'channel.yaml',
+                'cart.yaml',
+                'country.yaml',
+                'shipping_method.yaml',
+                'payment_method.yaml',
+            ],
+            'shop/payment_request/post_payment_request',
+        ];
+    }
+
     /** @test */
     public function it_does_not_create_a_payment_request_without_required_data(): void
     {
@@ -122,18 +153,18 @@ final class PaymentRequestsTest extends JsonApiTestCase
         );
     }
 
-    /** @test */
-    public function it_updates_a_payment_request(): void
+    /**
+     * @test
+     * @dataProvider updatePaymentRequestProvider
+     *
+     * @param array<string> $fixturesPaths
+     * @throws \JsonException
+     */
+    public function it_updates_a_payment_request(array $fixturesPaths, string $responsePath): void
     {
         $this->setUpDefaultGetHeaders();
 
-        $fixtures = $this->loadFixturesFromFiles([
-            'authentication/customer.yaml',
-            'channel.yaml',
-            'payment_method.yaml',
-            'payment_request/payment_request.yaml',
-            'payment_request/order_with_customer.yaml',
-        ]);
+        $fixtures = $this->loadFixturesFromFiles($fixturesPaths);
 
         /** @var PaymentRequestInterface $paymentRequest */
         $paymentRequest = $fixtures['payment_request_capture'];
@@ -150,7 +181,38 @@ final class PaymentRequestsTest extends JsonApiTestCase
             ], \JSON_THROW_ON_ERROR)
         );
 
-        $this->assertResponseSuccessful('shop/payment_request/put_payment_request');
+        $this->assertResponseSuccessful($responsePath);
+    }
+
+    public function updatePaymentRequestProvider(): iterable
+    {
+        $environment = getenv('APP_ENV');
+
+        if ($environment === 'test_cached_payum') {
+            yield [
+                [
+                    'authentication/customer.yaml',
+                    'channel.yaml',
+                    'payment_method.yaml',
+                    'payment_request/payment_request_payum.yaml',
+                    'payment_request/order_with_customer.yaml',
+                ],
+                'shop/payment_request/put_payment_request_payum',
+            ];
+
+            return;
+        }
+
+        yield [
+            [
+                'authentication/customer.yaml',
+                'channel.yaml',
+                'payment_method.yaml',
+                'payment_request/payment_request.yaml',
+                'payment_request/order_with_customer.yaml',
+            ],
+            'shop/payment_request/put_payment_request',
+        ];
     }
 
     /** @test */

From 3038902191a8d4ad2614b33c16288be6aa840eff Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Sun, 10 Mar 2024 21:54:07 +0100
Subject: [PATCH 089/200] Make some methods non nullable

---
 .../ApiBundle/Command/Payment/UpdatePaymentRequest.php       | 4 ++--
 .../ApiBundle/Command/PaymentRequestHashAwareInterface.php   | 4 ++--
 .../Command/PaymentRequestHashAwareInterface.php             | 4 ++--
 .../PaymentRequest/Command/PaymentRequestHashAwareTrait.php  | 4 ++--
 .../CommandProvider/GatewayFactoryCommandProvider.php        | 2 --
 .../PaymentRequest/Payum/PaymentRequestContext.php           | 2 +-
 .../PaymentRequest/Payum/PaymentRequestContextInterface.php  | 2 +-
 .../PaymentRequest/Provider/GatewayFactoryNameProvider.php   | 5 +----
 .../Provider/GatewayFactoryNameProviderInterface.php         | 2 +-
 9 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
index 69c2d7d3dc..a9793ec773 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
@@ -31,12 +31,12 @@ class UpdatePaymentRequest implements PaymentRequestHashAwareInterface, IriToIde
         return $this->payload;
     }
 
-    public function getHash(): ?string
+    public function getHash(): string
     {
         return $this->hash;
     }
 
-    public function setHash(?string $hash): void
+    public function setHash(string $hash): void
     {
         $this->hash = $hash;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php b/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
index ca52ce4df7..1d401cbe15 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
@@ -16,7 +16,7 @@ namespace Sylius\Bundle\ApiBundle\Command;
 /** @experimental */
 interface PaymentRequestHashAwareInterface extends CommandAwareDataTransformerInterface
 {
-    public function getHash(): ?string;
+    public function getHash(): string;
 
-    public function setHash(?string $hash): void;
+    public function setHash(string $hash): void;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
index 1d91518491..e821b42819 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareInterface.php
@@ -16,7 +16,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\Command;
 /** @experimental */
 interface PaymentRequestHashAwareInterface
 {
-    public function getHash(): ?string;
+    public function getHash(): string;
 
-    public function setHash(?string $hash): void;
+    public function setHash(string $hash): void;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareTrait.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareTrait.php
index b80bc98654..f0fc37e917 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareTrait.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Command/PaymentRequestHashAwareTrait.php
@@ -17,12 +17,12 @@ trait PaymentRequestHashAwareTrait
 {
     protected ?string $hash;
 
-    public function getHash(): ?string
+    public function getHash(): string
     {
         return $this->hash;
     }
 
-    public function setHash(?string $hash): void
+    public function setHash(string $hash): void
     {
         $this->hash = $hash;
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
index 3dec6e3be7..575a8c2693 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
@@ -19,7 +19,6 @@ use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
-use Webmozart\Assert\Assert;
 
 final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommandProviderInterface
 {
@@ -74,7 +73,6 @@ final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommand
         $paymentMethod = $paymentRequest->getMethod();
 
         $factoryName = $this->gatewayFactoryNameProvider->provide($paymentMethod);
-        Assert::notNull($factoryName, 'Gateway config cannot be null.');
 
         return $factoryName;
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContext.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContext.php
index 5aa7a14329..827edc4933 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContext.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContext.php
@@ -29,7 +29,7 @@ final class PaymentRequestContext implements PaymentRequestContextInterface
         $this->paymentRequest = $paymentRequest;
     }
 
-    public function getPaymentRequest(): ?PaymentRequestInterface
+    public function getPaymentRequest(): PaymentRequestInterface
     {
         return $this->paymentRequest;
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContextInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContextInterface.php
index 43359c9a7b..c0708bc879 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContextInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/PaymentRequestContextInterface.php
@@ -23,5 +23,5 @@ interface PaymentRequestContextInterface
 
     public function disable(): void;
 
-    public function getPaymentRequest(): ?PaymentRequestInterface;
+    public function getPaymentRequest(): PaymentRequestInterface;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
index 8564fdadd4..b713e3cde1 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
@@ -17,12 +17,9 @@ use Sylius\Component\Core\Model\PaymentMethodInterface;
 
 final class GatewayFactoryNameProvider implements GatewayFactoryNameProviderInterface
 {
-    public function provide(PaymentMethodInterface $paymentMethod): ?string
+    public function provide(PaymentMethodInterface $paymentMethod): string
     {
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        if (null === $gatewayConfig) {
-            return null;
-        }
 
         return $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
index e17a6f11a1..14b0565fbe 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
@@ -17,5 +17,5 @@ use Sylius\Component\Core\Model\PaymentMethodInterface;
 
 interface GatewayFactoryNameProviderInterface
 {
-    public function provide(PaymentMethodInterface $paymentMethod): ?string;
+    public function provide(PaymentMethodInterface $paymentMethod): string;
 }

From 05584302e24cb2c0b9d372472327fb6fb092b838 Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Sun, 10 Mar 2024 21:54:31 +0100
Subject: [PATCH 090/200] Add new exceptions

---
 .../PaymentMethodNotFoundException.php        | 26 +++++++++++++++++++
 .../Resources/config/app/config.yaml          |  5 ++++
 .../InvalidPaymentRequestPayloadException.php | 26 +++++++++++++++++++
 .../NonExistingPayumTokenException.php        | 26 +++++++++++++++++++
 .../PaymentRequestNotFoundException.php       | 26 +++++++++++++++++++
 5 files changed, 109 insertions(+)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Exception/PaymentMethodNotFoundException.php
 create mode 100644 src/Sylius/Component/Payment/Exception/InvalidPaymentRequestPayloadException.php
 create mode 100644 src/Sylius/Component/Payment/Exception/NonExistingPayumTokenException.php
 create mode 100644 src/Sylius/Component/Payment/Exception/PaymentRequestNotFoundException.php

diff --git a/src/Sylius/Bundle/ApiBundle/Exception/PaymentMethodNotFoundException.php b/src/Sylius/Bundle/ApiBundle/Exception/PaymentMethodNotFoundException.php
new file mode 100644
index 0000000000..fd52fe7b30
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Exception/PaymentMethodNotFoundException.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Exception;
+
+/** @experimental */
+final class PaymentMethodNotFoundException extends \RuntimeException
+{
+    public function __construct(
+        string $message = 'Payment method not found.',
+        int $code = 0,
+        \Throwable $previous = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yaml b/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yaml
index 140eb0d748..3fa4e9a8b8 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yaml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yaml
@@ -64,7 +64,10 @@ api_platform:
         Sylius\Bundle\ApiBundle\Exception\LocaleIsUsedException: 422
         Sylius\Bundle\ApiBundle\Exception\OrderItemNotFoundException: 422
         Sylius\Bundle\ApiBundle\Exception\OrderNoLongerEligibleForPromotion: 422
+        Sylius\Component\Payment\Exception\PaymentRequestNotFoundException: 404
+        Sylius\Bundle\ApiBundle\Exception\PaymentNotFoundException: 404
         Sylius\Bundle\ApiBundle\Exception\PaymentMethodCannotBeRemoved: 422
+        Sylius\Bundle\ApiBundle\Exception\PaymentMethodNotFoundException: 404
         Sylius\Bundle\ApiBundle\Exception\ProductAttributeCannotBeRemoved: 422
         Sylius\Bundle\ApiBundle\Exception\ProductCannotBeRemoved: 422
         Sylius\Bundle\ApiBundle\Exception\ProductVariantCannotBeRemoved: 422
@@ -81,6 +84,8 @@ api_platform:
         Sylius\Bundle\UserBundle\Exception\UserNotFoundException: 404
         Sylius\Component\Core\Inventory\Exception\NotEnoughUnitsOnHandException: 422
         Sylius\Component\Core\Inventory\Exception\NotEnoughUnitsOnHoldException: 422
+        Sylius\Component\Payment\Exception\InvalidPaymentRequestPayloadException: 422
+        Sylius\Component\Payment\Exception\PayumTokenDoesNotExist: 422
         Sylius\Component\Promotion\Exception\FailedGenerationException: 422
         Symfony\Component\Serializer\Exception\UnexpectedValueException: 400
         Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException: 400
diff --git a/src/Sylius/Component/Payment/Exception/InvalidPaymentRequestPayloadException.php b/src/Sylius/Component/Payment/Exception/InvalidPaymentRequestPayloadException.php
new file mode 100644
index 0000000000..d691d38c09
--- /dev/null
+++ b/src/Sylius/Component/Payment/Exception/InvalidPaymentRequestPayloadException.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Exception;
+
+/** @experimental */
+final class InvalidPaymentRequestPayloadException extends \RuntimeException
+{
+    public function __construct(
+        string $message = 'Payload of the payment request is invalid.',
+        int $code = 0,
+        \Throwable $previous = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/src/Sylius/Component/Payment/Exception/NonExistingPayumTokenException.php b/src/Sylius/Component/Payment/Exception/NonExistingPayumTokenException.php
new file mode 100644
index 0000000000..7c6a713d1a
--- /dev/null
+++ b/src/Sylius/Component/Payment/Exception/NonExistingPayumTokenException.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Exception;
+
+/** @experimental */
+final class NonExistingPayumTokenException extends \RuntimeException
+{
+    public function __construct(
+        string $message = 'Payum token cannot be null.',
+        int $code = 0,
+        \Throwable $previous = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/src/Sylius/Component/Payment/Exception/PaymentRequestNotFoundException.php b/src/Sylius/Component/Payment/Exception/PaymentRequestNotFoundException.php
new file mode 100644
index 0000000000..61a2a80893
--- /dev/null
+++ b/src/Sylius/Component/Payment/Exception/PaymentRequestNotFoundException.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Exception;
+
+/** @experimental */
+final class PaymentRequestNotFoundException extends \RuntimeException
+{
+    public function __construct(
+        string $message = 'Payment request not found.',
+        int $code = 0,
+        \Throwable $previous = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+}

From b7eceb920b9281654a5aee52c64110f115dab40e Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Sun, 10 Mar 2024 21:56:12 +0100
Subject: [PATCH 091/200] Remove unecessary asserts or convert them to
 exceptions

---
 .../Payment/AddPaymentRequestHandler.php      | 20 ++++++++++---------
 .../Payment/UpdatePaymentRequestHandler.php   |  7 ++++---
 .../PaymentRequestIntegrityChecker.php        | 12 +++++++----
 .../Payum/TokenPaymentRequestHandler.php      |  6 ++++--
 .../Action/SyliusGetHttpRequestAction.php     |  2 --
 .../Action/SyliusRenderTemplateAction.php     |  2 --
 .../Payum/Factory/PayumTokenFactory.php       | 19 +++++++++++++-----
 7 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 56c10c3de1..278a55f643 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -14,6 +14,8 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
+use Sylius\Bundle\ApiBundle\Exception\PaymentMethodNotFoundException;
+use Sylius\Bundle\ApiBundle\Exception\PaymentNotFoundException;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
@@ -22,7 +24,6 @@ use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Webmozart\Assert\Assert;
 
 /** @experimental */
 final class AddPaymentRequestHandler implements MessageHandlerInterface
@@ -50,16 +51,17 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         $paymentMethod = $this->paymentMethodRepository->findOneBy([
             'code' => $addPaymentRequest->getPaymentMethodCode(),
         ]);
-        Assert::notNull($paymentMethod, sprintf(
-            'Payment method (code "%s") not found.',
-            $addPaymentRequest->getPaymentMethodCode(),
-        ));
+
+        if (null === $paymentMethod) {
+            throw new PaymentMethodNotFoundException();
+        }
+
         /** @var PaymentInterface|null $payment */
         $payment = $this->paymentRepository->find($addPaymentRequest->getPaymentId());
-        Assert::notNull(
-            $payment,
-            sprintf('Payment (id "%s") not found.', $addPaymentRequest->getPaymentId()),
-        );
+
+        if (null === $payment) {
+            throw new PaymentNotFoundException();
+        }
 
         $paymentRequest = $this->paymentRequestFactory->create($payment, $paymentMethod);
         $paymentRequest->setAction($addPaymentRequest->getAction());
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 1424640c06..3e8554f6c3 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -14,10 +14,10 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest;
+use Sylius\Component\Payment\Exception\PaymentRequestNotFoundException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Webmozart\Assert\Assert;
 
 /** @experimental */
 final class UpdatePaymentRequestHandler implements MessageHandlerInterface
@@ -30,10 +30,11 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
     public function __invoke(UpdatePaymentRequest $updatePaymentRequest): PaymentRequestInterface
     {
         $hash = $updatePaymentRequest->getHash();
-        Assert::notNull($hash, 'Payment request hash cannot be null.');
 
         $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
-        Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
+        if (null === $paymentRequest) {
+            throw new PaymentRequestNotFoundException();
+        }
 
         $paymentRequest->setPayload($updatePaymentRequest->getPayload());
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
index 601aecea2f..8014b79188 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
@@ -15,9 +15,10 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Exception\NullGatewayConfigException;
+use Sylius\Component\Payment\Exception\PaymentRequestNotFoundException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
-use Webmozart\Assert\Assert;
 
 final class PaymentRequestIntegrityChecker implements PaymentRequestIntegrityCheckerInterface
 {
@@ -29,16 +30,19 @@ final class PaymentRequestIntegrityChecker implements PaymentRequestIntegrityChe
     public function check(PaymentRequestHashAwareInterface $command): PaymentRequestInterface
     {
         $hash = $command->getHash();
-        Assert::notNull($hash, 'Payment request hash cannot be null.');
 
         $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
-        Assert::notNull($paymentRequest, sprintf('Payment request (hash "%s") not found.', $hash));
+        if (null === $paymentRequest) {
+            throw new PaymentRequestNotFoundException();
+        }
 
         /** @var PaymentMethodInterface $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig, 'Gateway config cannot be null.');
+        if (null === $gatewayConfig) {
+            throw new NullGatewayConfigException();
+        }
 
         return $paymentRequest;
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index bdd4fe820f..9348f2fb59 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -20,8 +20,8 @@ use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Resolver\DoctrineProxyObjectRe
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\AfterTokenRequestProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface;
 use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
+use Sylius\Component\Payment\Exception\NullPaymentTokenException;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Webmozart\Assert\Assert;
 
 final class TokenPaymentRequestHandler implements MessageHandlerInterface
 {
@@ -44,7 +44,9 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
         $request = $this->payumRequestFactory->createNewWithToken($token);
 
         $token = $request->getToken();
-        Assert::notNull($token, 'A Payum token cannot be null.');
+        if (null === $token) {
+            throw new NullPaymentTokenException();
+        }
 
         $this->requestProcessor->process($paymentRequest, $request, $token->getGatewayName());
         $this->afterTokenRequestProcessor->process($paymentRequest, $token);
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
index 0548841a13..cc485fc2dc 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusGetHttpRequestAction.php
@@ -17,7 +17,6 @@ use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\GetHttpRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface;
-use Webmozart\Assert\Assert;
 
 final class SyliusGetHttpRequestAction implements ActionInterface
 {
@@ -37,7 +36,6 @@ final class SyliusGetHttpRequestAction implements ActionInterface
     private function updateRequest(GetHttpRequest $request): void
     {
         $paymentRequest = $this->payumApiContext->getPaymentRequest();
-        Assert::notNull($paymentRequest);
 
         /** @var array{
          *     'http_request'?: array{
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusRenderTemplateAction.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusRenderTemplateAction.php
index d656ae99ed..b011639991 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusRenderTemplateAction.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Action/SyliusRenderTemplateAction.php
@@ -17,7 +17,6 @@ use Payum\Core\Action\ActionInterface;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Request\RenderTemplate;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Payum\PaymentRequestContextInterface;
-use Webmozart\Assert\Assert;
 
 final class SyliusRenderTemplateAction implements ActionInterface
 {
@@ -32,7 +31,6 @@ final class SyliusRenderTemplateAction implements ActionInterface
         RequestNotSupportedException::assertSupports($this, $request);
 
         $paymentRequest = $this->payumApiContext->getPaymentRequest();
-        Assert::notNull($paymentRequest);
 
         $details = $paymentRequest->getResponseData();
         $paymentRequest->setResponseData(array_merge($details, $request->getParameters()));
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index 0ceec53d64..dd76b2cfb3 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -16,8 +16,9 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\Payum\Factory;
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Exception\InvalidPaymentRequestPayloadException;
+use Sylius\Component\Payment\Exception\NullGatewayConfigException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Webmozart\Assert\Assert;
 
 final class PayumTokenFactory implements PayumTokenFactoryInterface
 {
@@ -33,7 +34,9 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
         $paymentMethod = $paymentRequest->getMethod();
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        Assert::notNull($gatewayConfig, 'Gateway config cannot be null.');
+        if (null === $gatewayConfig) {
+            throw new NullGatewayConfigException();
+        }
 
         $gatewayName = $gatewayConfig->getGatewayName();
 
@@ -45,15 +48,21 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
          * }|null $payload
          */
         $payload = $paymentRequest->getPayload();
-        Assert::notNull($payload, 'The request payload need to be not null');
+        if (null === $payload) {
+            throw new InvalidPaymentRequestPayloadException('Payload of the payment request cannot be null');
+        }
 
         $targetPath = $payload['target_path'] ?? null;
-        Assert::notNull($targetPath, 'The request payload must have a "target_path" field not null');
+        if (null === $targetPath) {
+            throw new InvalidPaymentRequestPayloadException('The target path of the payment request cannot be null.');
+        }
 
         $targetPathParameters = $payload['target_path_parameters'] ?? [];
 
         $afterPath = $payload['after_path'] ?? null;
-        Assert::notNull($afterPath, 'The request payload must have an "after_path" field not null');
+        if (null === $afterPath) {
+            throw new InvalidPaymentRequestPayloadException('The after path of the payment request cannot be null.');
+        }
 
         $afterPathParameters = $payload['after_path_parameters'] ?? [];
 

From 2154a9a5e1ed987d1983a7ef820d6872aa2f64ba Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Tue, 12 Mar 2024 15:07:34 +0100
Subject: [PATCH 092/200] Rename PaymentRequestChecker to provider

---
 .../Payment/UpdatePaymentRequestHandler.php   |  3 +++
 .../Offline/CapturePaymentRequestHandler.php  |  8 +++----
 .../Payum/ModelPaymentRequestHandler.php      |  6 ++---
 .../Payum/TokenPaymentRequestHandler.php      | 10 ++++----
 .../PaymentRequestProvider.php}               | 23 ++++++-------------
 .../PaymentRequestProviderInterface.php}      |  6 ++---
 .../services/payment_request/checker.xml      |  5 ----
 .../offline/command_handlers.xml              |  2 +-
 .../payum/command_handlers.xml                |  4 ++--
 .../services/payment_request/providers.xml    |  3 +++
 .../CapturePaymentRequestHandlerSpec.php      | 10 ++++----
 11 files changed, 36 insertions(+), 44 deletions(-)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Checker/PaymentRequestIntegrityChecker.php => Provider/PaymentRequestProvider.php} (51%)
 rename src/Sylius/Bundle/CoreBundle/PaymentRequest/{Checker/PaymentRequestIntegrityCheckerInterface.php => Provider/PaymentRequestProviderInterface.php} (65%)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 3e8554f6c3..bf563d35da 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -22,6 +22,9 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 /** @experimental */
 final class UpdatePaymentRequestHandler implements MessageHandlerInterface
 {
+    /**
+     * @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository
+     */
     public function __construct(
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
     ) {
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index a8c65c8fab..ca928a6715 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -13,23 +13,23 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
 
-use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
 /** @experimental */
 final class CapturePaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private readonly PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
-        private readonly CaptureProcessorInterface $offlineCaptureProcessor
+        private readonly PaymentRequestProviderInterface $paymentRequestProvider,
+        private readonly CaptureProcessorInterface $offlineCaptureProcessor,
     ) {
     }
 
     public function __invoke(CapturePaymentRequest $capturePaymentRequest): void
     {
-        $paymentRequest = $this->paymentRequestIntegrityChecker->check($capturePaymentRequest);
+        $paymentRequest = $this->paymentRequestProvider->provide($capturePaymentRequest);
 
         $this->offlineCaptureProcessor->process($paymentRequest);
     }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
index dacb23b649..132e27bed0 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
@@ -13,10 +13,10 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
-use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 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\Component\Core\Model\PaymentMethodInterface;
@@ -25,7 +25,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 final class ModelPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        private PaymentRequestProviderInterface $paymentRequestProvider,
         private DoctrineProxyObjectResolverInterface $doctrineProxyObjectResolver,
         private RequestProcessorInterface $requestProcessor,
         private GetStatusFactoryInterface $factory,
@@ -34,7 +34,7 @@ final class ModelPaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
-        $paymentRequest = $this->paymentRequestIntegrityChecker->check($command);
+        $paymentRequest = $this->paymentRequestProvider->provide($command);
         $this->doctrineProxyObjectResolver->resolve($paymentRequest);
 
         $payment = $paymentRequest->getPayment();
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index 9348f2fb59..402227d8cd 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -13,20 +13,20 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum;
 
-use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 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\Component\Payment\Exception\NullPaymentTokenException;
+use Sylius\Component\Payment\Exception\NonExistingPayumTokenException;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
 final class TokenPaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
-        private PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        private PaymentRequestProviderInterface $paymentRequestProvider,
         private DoctrineProxyObjectResolverInterface $doctrineProxyObjectResolver,
         private PayumTokenFactoryInterface $payumTokenFactory,
         private RequestProcessorInterface $requestProcessor,
@@ -37,7 +37,7 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(PaymentRequestHashAwareInterface $command): void
     {
-        $paymentRequest = $this->paymentRequestIntegrityChecker->check($command);
+        $paymentRequest = $this->paymentRequestProvider->provide($command);
         $this->doctrineProxyObjectResolver->resolve($paymentRequest);
 
         $token = $this->payumTokenFactory->createNew($paymentRequest);
@@ -45,7 +45,7 @@ final class TokenPaymentRequestHandler implements MessageHandlerInterface
 
         $token = $request->getToken();
         if (null === $token) {
-            throw new NullPaymentTokenException();
+            throw new NonExistingPayumTokenException();
         }
 
         $this->requestProcessor->process($paymentRequest, $request, $token->getGatewayName());
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestProvider.php
similarity index 51%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestProvider.php
index 8014b79188..d2491eef2f 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityChecker.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestProvider.php
@@ -11,39 +11,30 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Component\Payment\Exception\NullGatewayConfigException;
 use Sylius\Component\Payment\Exception\PaymentRequestNotFoundException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 
-final class PaymentRequestIntegrityChecker implements PaymentRequestIntegrityCheckerInterface
+final class PaymentRequestProvider implements PaymentRequestProviderInterface
 {
+    /**
+     * @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository
+     */
     public function __construct(
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
     ) {
     }
 
-    public function check(PaymentRequestHashAwareInterface $command): PaymentRequestInterface
+    public function provide(PaymentRequestHashAwareInterface $command): PaymentRequestInterface
     {
-        $hash = $command->getHash();
-
-        $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
+        $paymentRequest = $this->paymentRequestRepository->find($command->getHash());
         if (null === $paymentRequest) {
             throw new PaymentRequestNotFoundException();
         }
 
-        /** @var PaymentMethodInterface $paymentMethod */
-        $paymentMethod = $paymentRequest->getMethod();
-
-        $gatewayConfig = $paymentMethod->getGatewayConfig();
-        if (null === $gatewayConfig) {
-            throw new NullGatewayConfigException();
-        }
-
         return $paymentRequest;
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
similarity index 65%
rename from src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php
rename to src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
index 549dbf1fd6..9cd4207d93 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestIntegrityCheckerInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/PaymentRequestProviderInterface.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Checker;
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\PaymentRequestHashAwareInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
-interface PaymentRequestIntegrityCheckerInterface
+interface PaymentRequestProviderInterface
 {
-    public function check(PaymentRequestHashAwareInterface $command): PaymentRequestInterface;
+    public function provide(PaymentRequestHashAwareInterface $command): PaymentRequestInterface;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
index e1ef27c5c3..cf66d4ee3d 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/checker.xml
@@ -21,10 +21,5 @@
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationCheckerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestDuplicationChecker">
             <argument type="service" id="sylius.repository.payment_request" />
         </service>
-
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityChecker">
-            <argument type="service" id="sylius.repository.payment_request" />
-        </service>
-
     </services>
 </container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
index bfe7166e70..6c5c6bf9d4 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
@@ -17,7 +17,7 @@
 >
     <services>
         <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
             <tag name="messenger.message_handler" bus="sylius_default.bus" />
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
index 34e17d3d9e..3d93d8bb41 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
@@ -19,7 +19,7 @@
         <defaults public="true" />
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler" abstract="true">
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
+            <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\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInterface" />
@@ -39,7 +39,7 @@
         </service>
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler" abstract="true">
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface" />
+            <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\Processor\Payum\RequestProcessorInterface" />
         </service>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
index 37d1ef4f24..8ba2227b76 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
@@ -20,5 +20,8 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProvider" />
 
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProvider">
+            <argument type="service" id="sylius.repository.payment_request" />
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
index 7a992e4d0a..7b9d4fc3c6 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
@@ -14,27 +14,27 @@ declare(strict_types=1);
 namespace spec\Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Checker\PaymentRequestIntegrityCheckerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class CapturePaymentRequestHandlerSpec extends ObjectBehavior
 {
     function let(
-        PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        PaymentRequestProviderInterface $paymentRequestProvider,
         CaptureProcessorInterface $offlineCaptureProcessor
     ): void {
-        $this->beConstructedWith($paymentRequestIntegrityChecker, $offlineCaptureProcessor);
+        $this->beConstructedWith($paymentRequestProvider, $offlineCaptureProcessor);
     }
 
     function it_processes_offline_capture(
-        PaymentRequestIntegrityCheckerInterface $paymentRequestIntegrityChecker,
+        PaymentRequestProviderInterface $paymentRequestProvider,
         CaptureProcessorInterface $offlineCaptureProcessor,
         PaymentRequestInterface $paymentRequest
     ): void {
         $capturePaymentRequest = new CapturePaymentRequest('hash');
-        $paymentRequestIntegrityChecker->check($capturePaymentRequest)->willReturn($paymentRequest);
+        $paymentRequestProvider->provide($capturePaymentRequest)->willReturn($paymentRequest);
 
         $this->__invoke($capturePaymentRequest);
 

From 9ab49676036e59dd0bc6fd4afc308d65880ce255 Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Tue, 12 Mar 2024 15:09:25 +0100
Subject: [PATCH 093/200] Use just find() repository method instead of creating
 a new one

---
 .../Payment/UpdatePaymentRequestHandler.php       |  4 +---
 .../Payum/Factory/PayumTokenFactory.php           |  5 -----
 .../Doctrine/ORM/PaymentRequestRepository.php     | 15 ---------------
 .../PaymentRequestRepositoryInterface.php         |  2 --
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index bf563d35da..899a9c2871 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -32,9 +32,7 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(UpdatePaymentRequest $updatePaymentRequest): PaymentRequestInterface
     {
-        $hash = $updatePaymentRequest->getHash();
-
-        $paymentRequest = $this->paymentRequestRepository->findOneByHash($hash);
+        $paymentRequest = $this->paymentRequestRepository->find($updatePaymentRequest->getHash());
         if (null === $paymentRequest) {
             throw new PaymentRequestNotFoundException();
         }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index dd76b2cfb3..52f7441d97 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -17,7 +17,6 @@ use Payum\Core\Payum;
 use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Exception\InvalidPaymentRequestPayloadException;
-use Sylius\Component\Payment\Exception\NullGatewayConfigException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class PayumTokenFactory implements PayumTokenFactoryInterface
@@ -34,10 +33,6 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
         $paymentMethod = $paymentRequest->getMethod();
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        if (null === $gatewayConfig) {
-            throw new NullGatewayConfigException();
-        }
-
         $gatewayName = $gatewayConfig->getGatewayName();
 
         /** @var array{
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index e4d17dda10..8fffe03f0f 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Doctrine\ORM;
 
-use Doctrine\DBAL\ParameterType;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
@@ -47,18 +46,4 @@ class PaymentRequestRepository extends EntityRepository implements PaymentReques
 
         return count($paymentRequests) > 0;
     }
-
-    public function findOneByHash(string $hash): ?PaymentRequestInterface
-    {
-        return $this->createQueryBuilder('o')
-            ->addSelect('payment')
-            ->addSelect('method')
-            ->innerJoin('o.payment', 'payment')
-            ->innerJoin('o.method', 'method')
-            ->where('o.hash = :hash')
-            ->setParameter('hash', $hash, ParameterType::BINARY)
-            ->getQuery()
-            ->getOneOrNullResult()
-        ;
-    }
 }
diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
index bb4712e5a6..f16fb865b7 100644
--- a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -24,6 +24,4 @@ use Sylius\Component\Resource\Repository\RepositoryInterface;
 interface PaymentRequestRepositoryInterface extends RepositoryInterface
 {
     public function duplicateExists(PaymentRequestInterface $paymentRequest): bool;
-
-    public function findOneByHash(string $hash): ?PaymentRequestInterface;
 }

From 521b442a07ffacf780195a411865f9827a449db2 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Tue, 6 Aug 2024 14:10:29 +0200
Subject: [PATCH 094/200] [Composer] Fix incompatible dependency versions

---
 src/Sylius/Component/Payment/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Component/Payment/composer.json b/src/Sylius/Component/Payment/composer.json
index 0ee205ff8e..8be35e21e1 100644
--- a/src/Sylius/Component/Payment/composer.json
+++ b/src/Sylius/Component/Payment/composer.json
@@ -29,7 +29,7 @@
         "php": "^8.2",
         "sylius/registry": "^1.6",
         "sylius/resource": "^1.10",
-        "symfony/uid": "^5.4.21 || ^6.4"
+        "symfony/uid": "^6.4.0"
     },
     "require-dev": {
         "phpspec/phpspec": "^7.2"

From fba7b018cb68da523fb8da1bcd75929518dc92f3 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Wed, 7 Aug 2024 08:36:49 +0200
Subject: [PATCH 095/200] [PaymentRequest] Fix static analysis

---
 phpstan-baseline.neon                                  | 10 ++++++++++
 .../Payment/AddPaymentRequestHandler.php               |  6 ++++++
 ...mentRequestHashAwareInputCommandDataTransformer.php |  7 +++++++
 .../ShipmentIdAwareInputCommandDataTransformer.php     |  3 +++
 .../Checker/PaymentRequestDuplicationChecker.php       |  1 +
 .../Processor/Payum/AfterTokenRequestProcessor.php     |  4 ++++
 src/Sylius/Component/Payment/Model/PaymentRequest.php  |  1 +
 .../Payment/Model/PaymentRequestInterface.php          |  2 ++
 8 files changed, 34 insertions(+)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 2c71e1e1b7..b5a1437411 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3525,6 +3525,16 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/CoreBundle/Order/NumberGenerator/SequentialOrderNumberGenerator.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\CoreBundle\\\\PaymentRequest\\\\CommandProvider\\\\ActionsCommandProvider\\:\\:__construct\\(\\) has parameter \\$locator with generic interface Symfony\\\\Contracts\\\\Service\\\\ServiceProviderInterface but does not specify its types\\: T$#"
+			count: 1
+			path: src/Sylius/Bundle//CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
+
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\CoreBundle\\\\PaymentRequest\\\\CommandProvider\\\\GatewayFactoryCommandProvider\\:\\:__construct\\(\\) has parameter \\$locator with generic interface Symfony\\\\Contracts\\\\Service\\\\ServiceProviderInterface but does not specify its types\\: T$#"
+			count: 1
+			path: src/Sylius/Bundle//CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
+
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\CoreBundle\\\\PriceHistory\\\\Command\\\\ApplyLowestPriceOnChannelPricings\\:\\:__construct\\(\\) has parameter \\$channelPricingIds with no value type specified in iterable type array\\.$#"
 			count: 1
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 278a55f643..70d0513820 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -28,6 +28,12 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 /** @experimental */
 final class AddPaymentRequestHandler implements MessageHandlerInterface
 {
+    /**
+     * @param PaymentMethodRepositoryInterface<PaymentMethodInterface> $paymentMethodRepository
+     * @param PaymentRepositoryInterface<PaymentInterface> $paymentRepository
+     * @param PaymentRequestFactoryInterface<PaymentRequestInterface> $paymentRequestFactory
+     * @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository
+     */
     public function __construct(
         private PaymentMethodRepositoryInterface $paymentMethodRepository,
         private PaymentRepositoryInterface $paymentRepository,
diff --git a/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
index 4ebeecf733..fc85aec92a 100644
--- a/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
+++ b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
@@ -19,6 +19,12 @@ use Sylius\Component\Payment\Model\PaymentRequestInterface;
 /** @experimental */
 final class PaymentRequestHashAwareInputCommandDataTransformer implements CommandDataTransformerInterface
 {
+    /**
+     * @param PaymentRequestHashAwareInterface $object
+     * @param array<string, mixed> $context
+     *
+     * @return PaymentRequestHashAwareInterface
+     */
     public function transform($object, string $to, array $context = [])
     {
         /** @var PaymentRequestInterface $paymentRequest */
@@ -34,6 +40,7 @@ final class PaymentRequestHashAwareInputCommandDataTransformer implements Comman
         return $object;
     }
 
+    /** @param mixed $object */
     public function supportsTransformation($object): bool
     {
         return $object instanceof PaymentRequestHashAwareInterface;
diff --git a/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
index e0a9fbd696..a10b78a621 100644
--- a/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
+++ b/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
@@ -18,6 +18,9 @@ use Sylius\Component\Core\Model\ShipmentInterface;
 
 final class ShipmentIdAwareInputCommandDataTransformer implements CommandDataTransformerInterface
 {
+    /**
+     * @param array<string, mixed> $context
+     */
     public function transform($object, string $to, array $context = [])
     {
         /** @var ShipmentInterface $shipment */
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
index 58f3e0f57c..6de1bf3b8f 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Checker/PaymentRequestDuplicationChecker.php
@@ -18,6 +18,7 @@ use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 
 final class PaymentRequestDuplicationChecker implements PaymentRequestDuplicationCheckerInterface
 {
+    /** @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository */
     public function __construct(
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
     ) {
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
index e3074a5e4a..0efeed145d 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Payum/AfterTokenRequestProcessor.php
@@ -21,6 +21,10 @@ use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 
 final class AfterTokenRequestProcessor implements AfterTokenRequestProcessorInterface
 {
+    /**
+     * @param PaymentRequestFactoryInterface<PaymentRequestInterface> $paymentRequestFactory
+     * @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository
+     */
     public function __construct(
         private PaymentRequestFactoryInterface $paymentRequestFactory,
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index efb67fc8b7..17271e3771 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -28,6 +28,7 @@ class PaymentRequest implements PaymentRequestInterface
 
     protected mixed $payload = null;
 
+    /** @var array<string, mixed> $responseData */
     protected array $responseData = [];
 
     public function __construct(
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
index 627be94c1d..c3875a2ae6 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequestInterface.php
@@ -59,8 +59,10 @@ interface PaymentRequestInterface extends TimestampableInterface, ResourceInterf
 
     public function setPayload(mixed $payload): void;
 
+    /** @return array<string, mixed> */
     public function getResponseData(): array;
 
+    /** @param array<string, mixed> $responseData */
     public function setResponseData(array $responseData): void;
 
     public function getPayment(): PaymentInterface;

From e71a03215b63b41dbd3a909bfe555d78f1c4e158 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Wed, 7 Aug 2024 08:55:31 +0200
Subject: [PATCH 096/200] Remove importing calendar config in
 services_test_cached_payum

---
 config/services_test_cached_payum.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/services_test_cached_payum.yaml b/config/services_test_cached_payum.yaml
index aeb560b999..26988e7f44 100644
--- a/config/services_test_cached_payum.yaml
+++ b/config/services_test_cached_payum.yaml
@@ -1,6 +1,5 @@
 imports:
     - { resource: "services_test_cached.yaml" }
-    - { resource: "../vendor/sylius/calendar/config/services_test.yaml" }
 
 services:
     'sylius.payment_request.command_provider.payum.offline':

From 144e5c844073f1b2c8f60a200fadef09d62de7dc Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 07:20:39 +0200
Subject: [PATCH 097/200] Move GatewayConfig to Payment component

---
 .../doctrine/model/PaymentMethod.orm.xml      |  4 --
 .../DependencyInjection/Configuration.php     | 19 ++++++
 .../doctrine/model/GatewayConfig.orm.xml      | 28 ++++++++
 .../doctrine/model/PaymentMethod.orm.xml      |  7 ++
 .../PayumBundle/Model/GatewayConfig.php       | 63 ++++++++++++++++--
 .../Model/GatewayConfigInterface.php          |  7 +-
 .../Resources/config/app/config.yaml          |  7 ++
 .../doctrine/model/GatewayConfig.orm.xml      |  8 +--
 .../spec/Model/GatewayConfigSpec.php          | 25 +++++++
 .../Core/Factory/PaymentMethodFactory.php     |  2 +-
 .../Component/Core/Model/PaymentMethod.php    | 14 ----
 .../Core/Model/PaymentMethodInterface.php     |  4 --
 .../spec/Factory/PaymentMethodFactorySpec.php |  2 +-
 .../Core/spec/Model/PaymentMethodSpec.php     |  7 --
 .../Component/Payment/Model/GatewayConfig.php | 66 +++++++++++++++++++
 .../Payment/Model/GatewayConfigInterface.php  | 35 ++++++++++
 .../Component/Payment/Model/PaymentMethod.php | 12 ++++
 .../Payment/Model/PaymentMethodInterface.php  |  4 ++
 .../Payment/spec/Model/GatewayConfigSpec.php  | 43 ++++++++++++
 .../Payment/spec/Model/PaymentMethodSpec.php  |  7 ++
 20 files changed, 319 insertions(+), 45 deletions(-)
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/GatewayConfig.orm.xml
 create mode 100644 src/Sylius/Bundle/PayumBundle/spec/Model/GatewayConfigSpec.php
 create mode 100644 src/Sylius/Component/Payment/Model/GatewayConfig.php
 create mode 100644 src/Sylius/Component/Payment/Model/GatewayConfigInterface.php
 create mode 100644 src/Sylius/Component/Payment/spec/Model/GatewayConfigSpec.php

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml
index 4fea77a2ab..09ad0ddc2c 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml
@@ -31,10 +31,6 @@
                 </inverse-join-columns>
             </join-table>
         </many-to-many>
-        <many-to-one field="gatewayConfig" target-entity="Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface">
-            <cascade><cascade-all/></cascade>
-            <join-column name="gateway_config_id" referenced-column-name="id" nullable="true" on-delete="SET NULL" />
-        </many-to-one>
     </mapped-superclass>
 
 </doctrine-mapping>
diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
index 0111312d81..52a7c5cae3 100644
--- a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
@@ -19,6 +19,8 @@ use Sylius\Bundle\PaymentBundle\Form\Type\PaymentType;
 use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
 use Sylius\Component\Payment\Factory\PaymentRequestFactory;
+use Sylius\Component\Payment\Model\GatewayConfig;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
 use Sylius\Component\Payment\Model\Payment;
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentMethod;
@@ -64,6 +66,23 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('resources')
                     ->addDefaultsIfNotSet()
                     ->children()
+                        ->arrayNode('gateway_config')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->variableNode('options')->end()
+                                ->arrayNode('classes')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->scalarNode('model')->defaultValue(GatewayConfig::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('interface')->defaultValue(GatewayConfigInterface::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('repository')->cannotBeEmpty()->end()
+                                        ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('form')->defaultValue(null)->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
                         ->arrayNode('payment_method')
                             ->addDefaultsIfNotSet()
                             ->children()
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/GatewayConfig.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/GatewayConfig.orm.xml
new file mode 100644
index 0000000000..a0f31b309b
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/GatewayConfig.orm.xml
@@ -0,0 +1,28 @@
+<?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.
+
+-->
+
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
+>
+    <mapped-superclass name="Sylius\Component\Payment\Model\GatewayConfig" table="sylius_gateway_config">
+        <id name="id" column="id" type="integer">
+            <generator />
+        </id>
+
+        <field name="gatewayName" column="gateway_name" />
+        <field name="factoryName" column="factory_name" />
+        <field name="config" column="config" type="json" />
+    </mapped-superclass>
+</doctrine-mapping>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml
index 3d7a61baad..d12a055c30 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentMethod.orm.xml
@@ -30,6 +30,13 @@
         <field name="updatedAt" column="updated_at" type="datetime" nullable="true">
             <gedmo:timestampable on="update"/>
         </field>
+
+        <many-to-one field="gatewayConfig" target-entity="Sylius\Component\Payment\Model\GatewayConfigInterface">
+            <cascade>
+                <cascade-all />
+            </cascade>
+            <join-column name="gateway_config_id" on-delete="SET NULL" />
+        </many-to-one>
     </mapped-superclass>
 
 </doctrine-mapping>
diff --git a/src/Sylius/Bundle/PayumBundle/Model/GatewayConfig.php b/src/Sylius/Bundle/PayumBundle/Model/GatewayConfig.php
index 14fac93398..6d50d5503a 100644
--- a/src/Sylius/Bundle/PayumBundle/Model/GatewayConfig.php
+++ b/src/Sylius/Bundle/PayumBundle/Model/GatewayConfig.php
@@ -13,15 +13,68 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\Model;
 
-use Payum\Core\Model\GatewayConfig as BaseGatewayConfig;
+use Payum\Core\Security\CypherInterface;
+use Sylius\Component\Payment\Model\GatewayConfig as BaseGatewayConfig;
 
 class GatewayConfig extends BaseGatewayConfig implements GatewayConfigInterface
 {
-    /** @var int */
-    protected $id;
+    /** @var array<string, mixed> $decryptedConfig */
+    protected array $decryptedConfig;
 
-    public function getId(): int
+    public function __construct()
     {
-        return $this->id;
+        parent::__construct();
+
+        $this->decryptedConfig = [];
+    }
+
+    public function getConfig(): array
+    {
+        if (isset($this->config['encrypted'])) {
+            return $this->decryptedConfig;
+        }
+
+        return $this->config;
+    }
+
+    public function setConfig(array $config): void
+    {
+        $this->config = $config;
+        $this->decryptedConfig = $config;
+    }
+
+
+    /** This method is based on Payum\Core\Model\GatewayConfig::decrypt */
+    public function decrypt(CypherInterface $cypher): void
+    {
+        if (empty($this->config['encrypted'])) {
+            return;
+        }
+
+        foreach ($this->config as $name => $value) {
+            if ('encrypted' == $name || is_bool($value)) {
+                $this->decryptedConfig[$name] = $value;
+
+                continue;
+            }
+
+            $this->decryptedConfig[$name] = $cypher->decrypt($value);
+        }
+    }
+
+    /** This method is based on Payum\Core\Model\GatewayConfig::encrypt */
+    public function encrypt(CypherInterface $cypher): void
+    {
+        $this->decryptedConfig['encrypted'] = true;
+
+        foreach ($this->decryptedConfig as $name => $value) {
+            if ('encrypted' == $name || is_bool($value)) {
+                $this->config[$name] = $value;
+
+                continue;
+            }
+
+            $this->config[$name] = $cypher->encrypt($value);
+        }
     }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php b/src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php
index 2ae8db632f..9e779d9c04 100644
--- a/src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php
@@ -13,9 +13,10 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\Model;
 
-use Payum\Core\Model\GatewayConfigInterface as BaseGatewayConfigInterface;
-use Sylius\Component\Resource\Model\ResourceInterface;
+use Payum\Core\Model\GatewayConfigInterface as PayumGatewayConfigInterface;
+use Payum\Core\Security\CryptedInterface;
+use Sylius\Component\Payment\Model\GatewayConfigInterface as BaseGatewayConfigInterface;
 
-interface GatewayConfigInterface extends BaseGatewayConfigInterface, ResourceInterface
+interface GatewayConfigInterface extends BaseGatewayConfigInterface, PayumGatewayConfigInterface, CryptedInterface
 {
 }
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
index 3ee734c562..e1be327f4e 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
@@ -1,6 +1,13 @@
 # This file is part of the Sylius package.
 # (c) Sylius Sp. z o.o.
 
+sylius_payment:
+    resources:
+        gateway_config:
+            classes:
+                model: Sylius\Bundle\PayumBundle\Model\GatewayConfig
+                interface: Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface
+
 sylius_payum:
     gateway_config:
         validation_groups:
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/doctrine/model/GatewayConfig.orm.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/doctrine/model/GatewayConfig.orm.xml
index fa937d981e..3bc6a44072 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/doctrine/model/GatewayConfig.orm.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/doctrine/model/GatewayConfig.orm.xml
@@ -15,10 +15,6 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                   http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
-        >
-    <mapped-superclass name="Sylius\Bundle\PayumBundle\Model\GatewayConfig" table="sylius_gateway_config">
-        <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
-        </id>
-    </mapped-superclass>
+>
+    <mapped-superclass name="Sylius\Bundle\PayumBundle\Model\GatewayConfig" table="sylius_gateway_config" />
 </doctrine-mapping>
diff --git a/src/Sylius/Bundle/PayumBundle/spec/Model/GatewayConfigSpec.php b/src/Sylius/Bundle/PayumBundle/spec/Model/GatewayConfigSpec.php
new file mode 100644
index 0000000000..d667f010eb
--- /dev/null
+++ b/src/Sylius/Bundle/PayumBundle/spec/Model/GatewayConfigSpec.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\PayumBundle\Model;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
+
+final class GatewayConfigSpec extends ObjectBehavior
+{
+    function it_implements_payum_gateway_config_interface(): void
+    {
+        $this->shouldImplement(GatewayConfigInterface::class);
+    }
+}
diff --git a/src/Sylius/Component/Core/Factory/PaymentMethodFactory.php b/src/Sylius/Component/Core/Factory/PaymentMethodFactory.php
index 5ce00d7e32..e302300b69 100644
--- a/src/Sylius/Component/Core/Factory/PaymentMethodFactory.php
+++ b/src/Sylius/Component/Core/Factory/PaymentMethodFactory.php
@@ -13,8 +13,8 @@ declare(strict_types=1);
 
 namespace Sylius\Component\Core\Factory;
 
-use Payum\Core\Model\GatewayConfigInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 
 /**
diff --git a/src/Sylius/Component/Core/Model/PaymentMethod.php b/src/Sylius/Component/Core/Model/PaymentMethod.php
index 206a5638f8..3a2f08f12d 100644
--- a/src/Sylius/Component/Core/Model/PaymentMethod.php
+++ b/src/Sylius/Component/Core/Model/PaymentMethod.php
@@ -15,7 +15,6 @@ namespace Sylius\Component\Core\Model;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Payum\Core\Model\GatewayConfigInterface;
 use Sylius\Component\Channel\Model\ChannelInterface as BaseChannelInterface;
 use Sylius\Component\Payment\Model\PaymentMethod as BasePaymentMethod;
 use Sylius\Component\Payment\Model\PaymentMethodTranslation;
@@ -25,9 +24,6 @@ class PaymentMethod extends BasePaymentMethod implements PaymentMethodInterface
     /** @var Collection<array-key, BaseChannelInterface> */
     protected $channels;
 
-    /** @var GatewayConfigInterface|null */
-    protected $gatewayConfig;
-
     public function __construct()
     {
         parent::__construct();
@@ -60,16 +56,6 @@ class PaymentMethod extends BasePaymentMethod implements PaymentMethodInterface
         }
     }
 
-    public function setGatewayConfig(?GatewayConfigInterface $gateway): void
-    {
-        $this->gatewayConfig = $gateway;
-    }
-
-    public function getGatewayConfig(): ?GatewayConfigInterface
-    {
-        return $this->gatewayConfig;
-    }
-
     public static function getTranslationClass(): string
     {
         return PaymentMethodTranslation::class;
diff --git a/src/Sylius/Component/Core/Model/PaymentMethodInterface.php b/src/Sylius/Component/Core/Model/PaymentMethodInterface.php
index b5be073f72..035d4a29d4 100644
--- a/src/Sylius/Component/Core/Model/PaymentMethodInterface.php
+++ b/src/Sylius/Component/Core/Model/PaymentMethodInterface.php
@@ -13,13 +13,9 @@ declare(strict_types=1);
 
 namespace Sylius\Component\Core\Model;
 
-use Payum\Core\Model\GatewayConfigInterface;
 use Sylius\Component\Channel\Model\ChannelsAwareInterface;
 use Sylius\Component\Payment\Model\PaymentMethodInterface as BasePaymentMethodInterface;
 
 interface PaymentMethodInterface extends BasePaymentMethodInterface, ChannelsAwareInterface
 {
-    public function setGatewayConfig(?GatewayConfigInterface $gateway): void;
-
-    public function getGatewayConfig(): ?GatewayConfigInterface;
 }
diff --git a/src/Sylius/Component/Core/spec/Factory/PaymentMethodFactorySpec.php b/src/Sylius/Component/Core/spec/Factory/PaymentMethodFactorySpec.php
index 355f1c4007..8657244a17 100644
--- a/src/Sylius/Component/Core/spec/Factory/PaymentMethodFactorySpec.php
+++ b/src/Sylius/Component/Core/spec/Factory/PaymentMethodFactorySpec.php
@@ -13,10 +13,10 @@ declare(strict_types=1);
 
 namespace spec\Sylius\Component\Core\Factory;
 
-use Payum\Core\Model\GatewayConfigInterface;
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Factory\PaymentMethodFactoryInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 
 final class PaymentMethodFactorySpec extends ObjectBehavior
diff --git a/src/Sylius/Component/Core/spec/Model/PaymentMethodSpec.php b/src/Sylius/Component/Core/spec/Model/PaymentMethodSpec.php
index 3f3b170f03..c43b4621bc 100644
--- a/src/Sylius/Component/Core/spec/Model/PaymentMethodSpec.php
+++ b/src/Sylius/Component/Core/spec/Model/PaymentMethodSpec.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace spec\Sylius\Component\Core\Model;
 
-use Payum\Core\Model\GatewayConfigInterface;
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
@@ -47,10 +46,4 @@ final class PaymentMethodSpec extends ObjectBehavior
         $this->removeChannel($channel);
         $this->hasChannel($channel)->shouldReturn(false);
     }
-
-    function its_gateway_config_is_mutable(GatewayConfigInterface $gatewayConfig): void
-    {
-        $this->setGatewayConfig($gatewayConfig);
-        $this->getGatewayConfig()->shouldReturn($gatewayConfig);
-    }
 }
diff --git a/src/Sylius/Component/Payment/Model/GatewayConfig.php b/src/Sylius/Component/Payment/Model/GatewayConfig.php
new file mode 100644
index 0000000000..6eb07c2887
--- /dev/null
+++ b/src/Sylius/Component/Payment/Model/GatewayConfig.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Model;
+
+class GatewayConfig implements GatewayConfigInterface
+{
+    protected mixed $id;
+
+    protected ?string $factoryName = null;
+
+    protected ?string $gatewayName = null;
+
+    /** @var array<string, mixed> $config */
+    protected array $config;
+
+    public function __construct()
+    {
+        $this->config = [];
+    }
+
+    public function getId(): mixed
+    {
+        return $this->id;
+    }
+
+    public function getGatewayName(): ?string
+    {
+        return $this->gatewayName;
+    }
+
+    public function setGatewayName($gatewayName): void
+    {
+        $this->gatewayName = $gatewayName;
+    }
+
+    public function getFactoryName(): ?string
+    {
+        return $this->factoryName;
+    }
+
+    public function setFactoryName($factoryName): void
+    {
+        $this->factoryName = $factoryName;
+    }
+
+    public function getConfig(): array
+    {
+        return $this->config;
+    }
+
+    public function setConfig(array $config): void
+    {
+        $this->config = $config;
+    }
+}
diff --git a/src/Sylius/Component/Payment/Model/GatewayConfigInterface.php b/src/Sylius/Component/Payment/Model/GatewayConfigInterface.php
new file mode 100644
index 0000000000..24cad88df8
--- /dev/null
+++ b/src/Sylius/Component/Payment/Model/GatewayConfigInterface.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Payment\Model;
+
+use Sylius\Component\Resource\Model\ResourceInterface;
+
+interface GatewayConfigInterface extends ResourceInterface
+{
+    public function getGatewayName(): ?string;
+
+    /** @param string $gatewayName */
+    public function setGatewayName($gatewayName): void;
+
+    public function getFactoryName(): ?string;
+
+    /** @param string $factoryName */
+    public function setFactoryName($factoryName): void;
+
+    /** @return array<string, mixed> */
+    public function getConfig(): array;
+
+    /** @param array<string, mixed> $config */
+    public function setConfig(array $config): void;
+}
diff --git a/src/Sylius/Component/Payment/Model/PaymentMethod.php b/src/Sylius/Component/Payment/Model/PaymentMethod.php
index f09ce36f75..10705425ca 100644
--- a/src/Sylius/Component/Payment/Model/PaymentMethod.php
+++ b/src/Sylius/Component/Payment/Model/PaymentMethod.php
@@ -38,6 +38,8 @@ class PaymentMethod implements PaymentMethodInterface, \Stringable
     /** @var int|null */
     protected $position;
 
+    protected ?GatewayConfigInterface $gatewayConfig = null;
+
     public function __construct()
     {
         $this->initializeTranslationsCollection();
@@ -115,6 +117,16 @@ class PaymentMethod implements PaymentMethodInterface, \Stringable
         $this->position = $position;
     }
 
+    public function setGatewayConfig(?GatewayConfigInterface $gatewayConfig): void
+    {
+        $this->gatewayConfig = $gatewayConfig;
+    }
+
+    public function getGatewayConfig(): ?GatewayConfigInterface
+    {
+        return $this->gatewayConfig;
+    }
+
     /**
      * @return PaymentMethodTranslationInterface
      */
diff --git a/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php b/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php
index f21117db75..58324cfbbc 100644
--- a/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php
@@ -47,6 +47,10 @@ interface PaymentMethodInterface extends
 
     public function setPosition(?int $position): void;
 
+    public function setGatewayConfig(?GatewayConfigInterface $gatewayConfig): void;
+
+    public function getGatewayConfig(): ?GatewayConfigInterface;
+
     /**
      * @return PaymentMethodTranslationInterface
      */
diff --git a/src/Sylius/Component/Payment/spec/Model/GatewayConfigSpec.php b/src/Sylius/Component/Payment/spec/Model/GatewayConfigSpec.php
new file mode 100644
index 0000000000..1c5f59b960
--- /dev/null
+++ b/src/Sylius/Component/Payment/spec/Model/GatewayConfigSpec.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Component\Payment\Model;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
+
+final class GatewayConfigSpec extends ObjectBehavior
+{
+    function it_implements_gateway_config_interface(): void
+    {
+        $this->shouldImplement(GatewayConfigInterface::class);
+    }
+
+    function its_factory_name_is_mutable(): void
+    {
+        $this->setFactoryName('Offline');
+        $this->getFactoryName()->shouldReturn('Offline');
+    }
+
+    function its_gateway_name_is_mutable(): void
+    {
+        $this->setGatewayName('Offline');
+        $this->getGatewayName()->shouldReturn('Offline');
+    }
+
+    function its_config_s_mutable(): void
+    {
+        $this->setConfig(['key' => '123']);
+        $this->getConfig()->shouldReturn(['key' => '123']);
+    }
+}
diff --git a/src/Sylius/Component/Payment/spec/Model/PaymentMethodSpec.php b/src/Sylius/Component/Payment/spec/Model/PaymentMethodSpec.php
index 7bced680c4..e853bc23ef 100644
--- a/src/Sylius/Component/Payment/spec/Model/PaymentMethodSpec.php
+++ b/src/Sylius/Component/Payment/spec/Model/PaymentMethodSpec.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 namespace spec\Sylius\Component\Payment\Model;
 
 use PhpSpec\ObjectBehavior;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
 use Sylius\Component\Payment\Model\PaymentMethodInterface;
 
 final class PaymentMethodSpec extends ObjectBehavior
@@ -116,4 +117,10 @@ final class PaymentMethodSpec extends ObjectBehavior
     {
         $this->getUpdatedAt()->shouldReturn(null);
     }
+
+    function its_gateway_config_is_mutable(GatewayConfigInterface $gatewayConfig): void
+    {
+        $this->setGatewayConfig($gatewayConfig);
+        $this->getGatewayConfig()->shouldReturn($gatewayConfig);
+    }
 }

From 9602a23deddadb59c91a2e777dad3dbf4db098dd Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 07:20:58 +0200
Subject: [PATCH 098/200] Move Payum config to PayumBundle

---
 .../CoreBundle/Resources/config/app/config.yml  | 17 -----------------
 .../Resources/config/app/config.yaml            | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
index 19ea332c13..690d61d078 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
@@ -104,23 +104,6 @@ liip_imagine:
             filters:
                 thumbnail: { size: [640, 480], mode: outbound }
 
-payum:
-    storages:
-        "%sylius.model.order.class%": { doctrine: orm }
-        "%sylius.model.payment.class%": { doctrine: orm }
-
-    security:
-        token_storage:
-            Sylius\Bundle\PayumBundle\Model\PaymentSecurityToken: { doctrine: orm }
-
-    dynamic_gateways:
-        config_storage:
-            Sylius\Bundle\PayumBundle\Model\GatewayConfig: { doctrine: orm }
-
-    gateways:
-        offline:
-            factory: offline
-
 stof_doctrine_extensions:
     default_locale: "%locale%"
     orm:
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
index e1be327f4e..10fa60d3b1 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
@@ -1,6 +1,23 @@
 # This file is part of the Sylius package.
 # (c) Sylius Sp. z o.o.
 
+payum:
+    storages:
+        "%sylius.model.order.class%": { doctrine: orm }
+        "%sylius.model.payment.class%": { doctrine: orm }
+
+    security:
+        token_storage:
+            Sylius\Bundle\PayumBundle\Model\PaymentSecurityToken: { doctrine: orm }
+
+    dynamic_gateways:
+        config_storage:
+            Sylius\Bundle\PayumBundle\Model\GatewayConfig: { doctrine: orm }
+
+    gateways:
+        offline:
+            factory: offline
+
 sylius_payment:
     resources:
         gateway_config:

From 0454c100e4506b6e5b2314abb27a544f21e0cb4d Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 11:46:13 +0200
Subject: [PATCH 099/200] Move AsGatewayConfigurationType attribute to
 PaymentBundle

---
 .../Attribute/AsGatewayConfigurationType.php  |  2 +-
 .../SyliusPaymentExtensionTest.php            | 22 ++++++++++++++++++
 .../Stub/GatewayConfigurationTypeStub.php     |  4 ++--
 .../SyliusPayumExtension.php                  |  2 +-
 .../SyliusPayumExtensionTest.php              | 23 -------------------
 5 files changed, 26 insertions(+), 27 deletions(-)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/Attribute/AsGatewayConfigurationType.php (94%)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/Tests/Stub/GatewayConfigurationTypeStub.php (75%)

diff --git a/src/Sylius/Bundle/PayumBundle/Attribute/AsGatewayConfigurationType.php b/src/Sylius/Bundle/PaymentBundle/Attribute/AsGatewayConfigurationType.php
similarity index 94%
rename from src/Sylius/Bundle/PayumBundle/Attribute/AsGatewayConfigurationType.php
rename to src/Sylius/Bundle/PaymentBundle/Attribute/AsGatewayConfigurationType.php
index f9afff1263..9dc2aaa62e 100644
--- a/src/Sylius/Bundle/PayumBundle/Attribute/AsGatewayConfigurationType.php
+++ b/src/Sylius/Bundle/PaymentBundle/Attribute/AsGatewayConfigurationType.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Attribute;
+namespace Sylius\Bundle\PaymentBundle\Attribute;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 final class AsGatewayConfigurationType
diff --git a/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php b/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php
index 1fc34cd505..f88a4bb12a 100644
--- a/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php
+++ b/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php
@@ -14,8 +14,10 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PaymentBundle\Tests\DependencyInjection;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
+use Sylius\Bundle\PaymentBundle\Attribute\AsGatewayConfigurationType;
 use Sylius\Bundle\PaymentBundle\Attribute\AsPaymentMethodsResolver;
 use Sylius\Bundle\PaymentBundle\DependencyInjection\SyliusPaymentExtension;
+use Sylius\Bundle\PaymentBundle\Tests\Stub\GatewayConfigurationTypeStub;
 use Sylius\Bundle\PaymentBundle\Tests\Stub\PaymentMethodsResolverStub;
 use Symfony\Component\DependencyInjection\Definition;
 
@@ -41,6 +43,26 @@ final class SyliusPaymentExtensionTest extends AbstractExtensionTestCase
         );
     }
 
+    /** @test */
+    public function it_autoconfigures_gateway_configuration_type_with_attribute(): void
+    {
+        $this->container->setDefinition(
+            'acme.gateway_configuration_type_with_attribute',
+            (new Definition())
+                ->setClass(GatewayConfigurationTypeStub::class)
+                ->setAutoconfigured(true),
+        );
+
+        $this->load();
+        $this->compile();
+
+        $this->assertContainerBuilderHasServiceDefinitionWithTag(
+            'acme.gateway_configuration_type_with_attribute',
+            AsGatewayConfigurationType::SERVICE_TAG,
+            ['type' => 'test', 'label' => 'Test', 'priority' => 15],
+        );
+    }
+
     protected function getContainerExtensions(): array
     {
         return [new SyliusPaymentExtension()];
diff --git a/src/Sylius/Bundle/PayumBundle/Tests/Stub/GatewayConfigurationTypeStub.php b/src/Sylius/Bundle/PaymentBundle/Tests/Stub/GatewayConfigurationTypeStub.php
similarity index 75%
rename from src/Sylius/Bundle/PayumBundle/Tests/Stub/GatewayConfigurationTypeStub.php
rename to src/Sylius/Bundle/PaymentBundle/Tests/Stub/GatewayConfigurationTypeStub.php
index 7141aebc4d..37bcde9c5a 100644
--- a/src/Sylius/Bundle/PayumBundle/Tests/Stub/GatewayConfigurationTypeStub.php
+++ b/src/Sylius/Bundle/PaymentBundle/Tests/Stub/GatewayConfigurationTypeStub.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Tests\Stub;
+namespace Sylius\Bundle\PaymentBundle\Tests\Stub;
 
-use Sylius\Bundle\PayumBundle\Attribute\AsGatewayConfigurationType;
+use Sylius\Bundle\PaymentBundle\Attribute\AsGatewayConfigurationType;
 
 #[AsGatewayConfigurationType(type: 'test', label: 'Test', priority: 15)]
 final class GatewayConfigurationTypeStub
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
index 7cb47ead5e..f300539e50 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\PayumBundle\DependencyInjection;
 
 use Payum\Paypal\ExpressCheckout\Nvp\PaypalExpressCheckoutGatewayFactory;
 use Payum\Stripe\StripeCheckoutGatewayFactory;
-use Sylius\Bundle\PayumBundle\Attribute\AsGatewayConfigurationType;
+use Sylius\Bundle\PaymentBundle\Attribute\AsGatewayConfigurationType;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
diff --git a/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/SyliusPayumExtensionTest.php b/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/SyliusPayumExtensionTest.php
index c83a69d468..9860483342 100644
--- a/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/SyliusPayumExtensionTest.php
+++ b/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/SyliusPayumExtensionTest.php
@@ -14,33 +14,10 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PayumBundle\Tests\DependencyInjection;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
-use Sylius\Bundle\PayumBundle\Attribute\AsGatewayConfigurationType;
 use Sylius\Bundle\PayumBundle\DependencyInjection\SyliusPayumExtension;
-use Sylius\Bundle\PayumBundle\Tests\Stub\GatewayConfigurationTypeStub;
-use Symfony\Component\DependencyInjection\Definition;
 
 final class SyliusPayumExtensionTest extends AbstractExtensionTestCase
 {
-    /** @test */
-    public function it_autoconfigures_gateway_configuration_type_with_attribute(): void
-    {
-        $this->container->setDefinition(
-            'acme.gateway_configuration_type_with_attribute',
-            (new Definition())
-                ->setClass(GatewayConfigurationTypeStub::class)
-                ->setAutoconfigured(true),
-        );
-
-        $this->load();
-        $this->compile();
-
-        $this->assertContainerBuilderHasServiceDefinitionWithTag(
-            'acme.gateway_configuration_type_with_attribute',
-            AsGatewayConfigurationType::SERVICE_TAG,
-            ['type' => 'test', 'label' => 'Test', 'priority' => 15],
-        );
-    }
-
     /** @test */
     public function it_loads_gateway_config_validation_groups_parameter_value_properly(): void
     {

From 4f42aa4b8637025047841010ed63dca3389ceb1a Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 11:48:27 +0200
Subject: [PATCH 100/200] Remove gateway_config resource configuration from
 PayumBundle

---
 .../DependencyInjection/Configuration.php     | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php
index 4522b2f1f4..6bd305b0cd 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php
@@ -13,9 +13,6 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\DependencyInjection;
 
-use Sylius\Bundle\PayumBundle\Form\Type\GatewayConfigType;
-use Sylius\Bundle\PayumBundle\Model\GatewayConfig;
-use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Bundle\PayumBundle\Model\PaymentSecurityToken;
 use Sylius\Bundle\PayumBundle\Model\PaymentSecurityTokenInterface;
 use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
@@ -85,24 +82,6 @@ final class Configuration implements ConfigurationInterface
                                 ->end()
                             ->end()
                         ->end()
-                        ->arrayNode('gateway_config')
-                            ->addDefaultsIfNotSet()
-                            ->children()
-                                ->variableNode('options')
-                                    ->setDeprecated('sylius/payum-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
-                                ->end()
-                                ->arrayNode('classes')
-                                    ->addDefaultsIfNotSet()
-                                    ->children()
-                                        ->scalarNode('model')->defaultValue(GatewayConfig::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('interface')->defaultValue(GatewayConfigInterface::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('factory')->defaultValue(Factory::class)->end()
-                                        ->scalarNode('form')->defaultValue(GatewayConfigType::class)->cannotBeEmpty()->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
                     ->end()
                 ->end()
             ->end()

From 3b75ce5136ce7cb201c35ce3be330658aa512892 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 12:02:33 +0200
Subject: [PATCH 101/200] Move RegisterGatewayConfigTypePass compiler pass to
 PaymentBundle

---
 .../RegisterGatewayConfigTypePass.php         |  8 +++----
 .../DependencyInjection/Configuration.php     |  3 ++-
 .../Resources/config/services.xml             |  2 ++
 .../Resources/translations/messages.en.yml    |  2 ++
 .../PaymentBundle/SyliusPaymentBundle.php     |  2 ++
 .../RegisterGatewayConfigTypePassTest.php     | 24 +++++++++----------
 .../PayumBundle/Resources/config/services.xml |  1 -
 .../Bundle/PayumBundle/SyliusPayumBundle.php  |  2 --
 8 files changed, 24 insertions(+), 20 deletions(-)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/DependencyInjection/Compiler/RegisterGatewayConfigTypePass.php (89%)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/Tests/DependencyInjection/Compiler/RegisterGatewayConfigTypePassTest.php (84%)

diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/RegisterGatewayConfigTypePass.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Compiler/RegisterGatewayConfigTypePass.php
similarity index 89%
rename from src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/RegisterGatewayConfigTypePass.php
rename to src/Sylius/Bundle/PaymentBundle/DependencyInjection/Compiler/RegisterGatewayConfigTypePass.php
index b30623f7d5..b4425121a9 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Compiler/RegisterGatewayConfigTypePass.php
+++ b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Compiler/RegisterGatewayConfigTypePass.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\DependencyInjection\Compiler;
+namespace Sylius\Bundle\PaymentBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -20,12 +20,12 @@ final class RegisterGatewayConfigTypePass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        if (!$container->has('sylius.form_registry.payum_gateway_config')) {
+        if (!$container->has('sylius.form_registry.payment_gateway_config')) {
             return;
         }
 
-        $formRegistry = $container->findDefinition('sylius.form_registry.payum_gateway_config');
-        $gatewayFactories = [['priority' => 0, 'label' => 'sylius.payum_gateway_factory.offline', 'type' => 'offline']];
+        $formRegistry = $container->findDefinition('sylius.form_registry.payment_gateway_config');
+        $gatewayFactories = [['priority' => 0, 'label' => 'sylius.gateway_factory.offline', 'type' => 'offline']];
 
         $gatewayConfigurationTypes = $container->findTaggedServiceIds('sylius.gateway_configuration_type');
 
diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
index 52a7c5cae3..7b315e9d42 100644
--- a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\DependencyInjection;
 
+use Sylius\Bundle\PaymentBundle\Form\Type\GatewayConfigType;
 use Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodTranslationType;
 use Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodType;
 use Sylius\Bundle\PaymentBundle\Form\Type\PaymentType;
@@ -78,7 +79,7 @@ final class Configuration implements ConfigurationInterface
                                         ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
                                         ->scalarNode('repository')->cannotBeEmpty()->end()
                                         ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('form')->defaultValue(null)->end()
+                                        ->scalarNode('form')->defaultValue(GatewayConfigType::class)->cannotBeEmpty()->end()
                                     ->end()
                                 ->end()
                             ->end()
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index fb9fadbbe9..cad1a5c20d 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -42,5 +42,7 @@
             <argument type="service" id="sylius.repository.payment_method" />
             <tag name="sylius.payment_method_resolver" type="default" label="Default" />
         </service>
+
+        <service id="sylius.form_registry.payment_gateway_config" class="Sylius\Bundle\ResourceBundle\Form\Registry\FormTypeRegistry" />
     </services>
 </container>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/PaymentBundle/Resources/translations/messages.en.yml
index f7a10edfbe..a3aeacdb69 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/translations/messages.en.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/translations/messages.en.yml
@@ -32,3 +32,5 @@ sylius:
             instructions: Instructions
             name: Name
             position: Position
+    gateway_factory:
+        offline: Offline
diff --git a/src/Sylius/Bundle/PaymentBundle/SyliusPaymentBundle.php b/src/Sylius/Bundle/PaymentBundle/SyliusPaymentBundle.php
index 9003451fc2..fdd12c3190 100644
--- a/src/Sylius/Bundle/PaymentBundle/SyliusPaymentBundle.php
+++ b/src/Sylius/Bundle/PaymentBundle/SyliusPaymentBundle.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle;
 
+use Sylius\Bundle\PaymentBundle\DependencyInjection\Compiler\RegisterGatewayConfigTypePass;
 use Sylius\Bundle\PaymentBundle\DependencyInjection\Compiler\RegisterPaymentMethodsResolversPass;
 use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
@@ -35,6 +36,7 @@ final class SyliusPaymentBundle extends AbstractResourceBundle
         parent::build($container);
 
         $container->addCompilerPass(new RegisterPaymentMethodsResolversPass());
+        $container->addCompilerPass(new RegisterGatewayConfigTypePass());
     }
 
     protected function getModelNamespace(): string
diff --git a/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/Compiler/RegisterGatewayConfigTypePassTest.php b/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/Compiler/RegisterGatewayConfigTypePassTest.php
similarity index 84%
rename from src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/Compiler/RegisterGatewayConfigTypePassTest.php
rename to src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/Compiler/RegisterGatewayConfigTypePassTest.php
index cb18fa7c83..9bca34779a 100644
--- a/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/Compiler/RegisterGatewayConfigTypePassTest.php
+++ b/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/Compiler/RegisterGatewayConfigTypePassTest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Tests\DependencyInjection\Compiler;
+namespace Sylius\Bundle\PaymentBundle\Tests\DependencyInjection\Compiler;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
-use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\RegisterGatewayConfigTypePass;
+use Sylius\Bundle\PaymentBundle\DependencyInjection\Compiler\RegisterGatewayConfigTypePass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
@@ -23,7 +23,7 @@ final class RegisterGatewayConfigTypePassTest extends AbstractCompilerPassTestCa
     /** @test */
     public function it_registers_payment_gateways_configs_by_their_priority_in_the_registry(): void
     {
-        $this->setDefinition('sylius.form_registry.payum_gateway_config', new Definition());
+        $this->setDefinition('sylius.form_registry.payment_gateway_config', new Definition());
         $this->setDefinition(
             'custom_low_priority_gateway',
             (new Definition('LowGatewayClass'))->addTag(
@@ -49,17 +49,17 @@ final class RegisterGatewayConfigTypePassTest extends AbstractCompilerPassTestCa
         $this->compile();
 
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'sylius.form_registry.payum_gateway_config',
+            'sylius.form_registry.payment_gateway_config',
             'add',
             ['gateway_config', 'low_gateway', 'LowGatewayClass'],
         );
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'sylius.form_registry.payum_gateway_config',
+            'sylius.form_registry.payment_gateway_config',
             'add',
             ['gateway_config', 'high_gateway', 'HighGatewayClass'],
         );
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'sylius.form_registry.payum_gateway_config',
+            'sylius.form_registry.payment_gateway_config',
             'add',
             ['gateway_config', 'medium_gateway', 'MediumGatewayClass'],
         );
@@ -69,7 +69,7 @@ final class RegisterGatewayConfigTypePassTest extends AbstractCompilerPassTestCa
                 'high_gateway' => 'High Gateway',
                 'medium_gateway' => 'Medium Gateway',
                 'low_gateway' => 'Low Gateway',
-                'offline' => 'sylius.payum_gateway_factory.offline',
+                'offline' => 'sylius.gateway_factory.offline',
             ],
             $this->container->getParameter('sylius.gateway_factories'),
         );
@@ -78,7 +78,7 @@ final class RegisterGatewayConfigTypePassTest extends AbstractCompilerPassTestCa
     /** @test */
     public function it_registers_payment_gateways_configs_with_default_priorities_in_the_registry(): void
     {
-        $this->setDefinition('sylius.form_registry.payum_gateway_config', new Definition());
+        $this->setDefinition('sylius.form_registry.payment_gateway_config', new Definition());
         $this->setDefinition(
             'custom_low_priority_gateway',
             (new Definition('LowGatewayClass'))->addTag(
@@ -104,17 +104,17 @@ final class RegisterGatewayConfigTypePassTest extends AbstractCompilerPassTestCa
         $this->compile();
 
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'sylius.form_registry.payum_gateway_config',
+            'sylius.form_registry.payment_gateway_config',
             'add',
             ['gateway_config', 'low_gateway', 'LowGatewayClass'],
         );
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'sylius.form_registry.payum_gateway_config',
+            'sylius.form_registry.payment_gateway_config',
             'add',
             ['gateway_config', 'regular_gateway', 'RegularGatewayClass'],
         );
         $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
-            'sylius.form_registry.payum_gateway_config',
+            'sylius.form_registry.payment_gateway_config',
             'add',
             ['gateway_config', 'medium_gateway', 'MediumGatewayClass'],
         );
@@ -123,7 +123,7 @@ final class RegisterGatewayConfigTypePassTest extends AbstractCompilerPassTestCa
             [
                 'medium_gateway' => 'Medium Gateway',
                 'low_gateway' => 'Low Gateway',
-                'offline' => 'sylius.payum_gateway_factory.offline',
+                'offline' => 'sylius.gateway_factory.offline',
                 'regular_gateway' => 'Regular Gateway',
             ],
             $this->container->getParameter('sylius.gateway_factories'),
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services.xml
index 9061ed560f..f1e61ca62c 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services.xml
@@ -26,6 +26,5 @@
         <service id="sylius.payum.http_client" class="Sylius\Bundle\PayumBundle\HttpClient\HttpClient">
             <argument type="service" id="Psr\Http\Client\ClientInterface" />
         </service>
-        <service id="sylius.form_registry.payum_gateway_config" class="Sylius\Bundle\ResourceBundle\Form\Registry\FormTypeRegistry" />
     </services>
 </container>
diff --git a/src/Sylius/Bundle/PayumBundle/SyliusPayumBundle.php b/src/Sylius/Bundle/PayumBundle/SyliusPayumBundle.php
index 212daa295b..3056f33bf6 100644
--- a/src/Sylius/Bundle/PayumBundle/SyliusPayumBundle.php
+++ b/src/Sylius/Bundle/PayumBundle/SyliusPayumBundle.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PayumBundle;
 
 use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\InjectContainerIntoControllersPass;
-use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\RegisterGatewayConfigTypePass;
 use Sylius\Bundle\PayumBundle\DependencyInjection\Compiler\UseTweakedDoctrineStoragePass;
 use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
@@ -34,7 +33,6 @@ final class SyliusPayumBundle extends AbstractResourceBundle
         parent::build($container);
 
         $container->addCompilerPass(new InjectContainerIntoControllersPass());
-        $container->addCompilerPass(new RegisterGatewayConfigTypePass());
         $container->addCompilerPass(new UseTweakedDoctrineStoragePass());
     }
 }

From 9c5b2d323d9511f0455e952bb77cc1f5c25c25e8 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 13:52:48 +0200
Subject: [PATCH 102/200] Move GatewayConfigGroupsGenerator to PaymentBundle

---
 .../config/api_resources/PaymentMethod.xml    |  2 +-
 .../DependencyInjection/Configuration.php     |  9 +++++
 .../SyliusPaymentExtension.php                |  1 +
 .../Resources/config/app/config.yml           |  2 +-
 .../Resources/config/services.xml             |  4 ++
 .../Resources/config/services/form.xml        |  4 ++
 .../SyliusPaymentExtensionTest.php            | 17 ++++++++
 .../GatewayConfigGroupsGenerator.php          |  2 +-
 .../GatewayConfigGroupsGeneratorSpec.php      |  6 +--
 .../DependencyInjection/Configuration.php     |  9 -----
 .../SyliusPayumExtension.php                  |  1 -
 .../Resources/config/app/config.yaml          | 10 -----
 .../Resources/config/services/form.xml        |  5 ---
 .../Resources/config/services/validator.xml   |  4 --
 .../SyliusPayumExtensionTest.php              | 40 -------------------
 15 files changed, 41 insertions(+), 75 deletions(-)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php (94%)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php (91%)
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/SyliusPayumExtensionTest.php

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentMethod.xml
index 9147764f8f..1349ac8a97 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentMethod.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentMethod.xml
@@ -16,7 +16,7 @@
            xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
 >
     <resource class="%sylius.model.payment_method.class%" shortName="PaymentMethod">
-        <attribute name="validation_groups">Sylius\Bundle\PayumBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator</attribute>
+        <attribute name="validation_groups">sylius.validator.gateway_config_groups_generator</attribute>
 
         <attribute name="order">
             <attribute name="position">ASC</attribute>
diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
index 7b315e9d42..9f0a61d7d9 100644
--- a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
@@ -47,6 +47,15 @@ final class Configuration implements ConfigurationInterface
         $rootNode
             ->addDefaultsIfNotSet()
             ->children()
+                ->arrayNode('gateway_config')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->arrayNode('validation_groups')
+                            ->useAttributeAsKey('name')
+                            ->variablePrototype()->end()
+                        ->end()
+                    ->end()
+                ->end()
                 ->scalarNode('driver')->defaultValue(SyliusResourceBundle::DRIVER_DOCTRINE_ORM)->end()
                 ->arrayNode('gateways')
                     ->useAttributeAsKey('name')
diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php
index c61062393d..972ff84615 100644
--- a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php
+++ b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php
@@ -32,6 +32,7 @@ final class SyliusPaymentExtension extends AbstractResourceExtension
         $loader->load('services.xml');
 
         $container->setParameter('sylius.payment_gateways', $config['gateways']);
+        $container->setParameter('sylius.gateway_config.validation_groups', $config['gateway_config']['validation_groups']);
 
         $this->registerAutoconfiguration($container);
     }
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
index 3615048869..e9e98dbc58 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
@@ -8,7 +8,7 @@ jms_serializer:
                 namespace_prefix: "Sylius\\Component\\Payment"
                 path: "@SyliusPaymentBundle/Resources/config/serializer"
 
-sylius_payum:
+sylius_payment:
     gateway_config:
         validation_groups:
             paypal_express_checkout:
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index cad1a5c20d..640b5c65cb 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -44,5 +44,9 @@
         </service>
 
         <service id="sylius.form_registry.payment_gateway_config" class="Sylius\Bundle\ResourceBundle\Form\Registry\FormTypeRegistry" />
+
+        <service id="sylius.validator.gateway_config_groups_generator" class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator">
+            <argument>%sylius.gateway_config.validation_groups%</argument>
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
index 4f9b25c573..3aed485e63 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
@@ -22,6 +22,9 @@
         <parameter key="sylius.form.type.payment_method_translation.validation_groups" type="collection">
             <parameter>sylius</parameter>
         </parameter>
+        <parameter key="sylius.form.type.gateway_config.validation_groups" type="collection">
+            <parameter>sylius</parameter>
+        </parameter>
     </parameters>
 
     <services>
@@ -36,6 +39,7 @@
         <service id="sylius.form.type.payment_method" class="Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodType">
             <argument>%sylius.model.payment_method.class%</argument>
             <argument>%sylius.form.type.payment_method.validation_groups%</argument>
+            <argument type="service" id="sylius.validator.gateway_config_groups_generator" />
             <tag name="form.type" />
         </service>
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php b/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php
index f88a4bb12a..fe93bfe2b6 100644
--- a/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php
+++ b/src/Sylius/Bundle/PaymentBundle/Tests/DependencyInjection/SyliusPaymentExtensionTest.php
@@ -62,6 +62,23 @@ final class SyliusPaymentExtensionTest extends AbstractExtensionTestCase
             ['type' => 'test', 'label' => 'Test', 'priority' => 15],
         );
     }
+    /** @test */
+    public function it_loads_gateway_config_validation_groups_parameter_value_properly(): void
+    {
+        $this->load([
+            'gateway_config' => [
+                'validation_groups' => [
+                    'paypal_express_checkout' => ['sylius', 'paypal'],
+                    'offline' => ['sylius'],
+                ],
+            ],
+        ]);
+
+        $this->assertContainerBuilderHasParameter(
+            'sylius.gateway_config.validation_groups',
+            ['paypal_express_checkout' => ['sylius', 'paypal'], 'offline' => ['sylius']],
+        );
+    }
 
     protected function getContainerExtensions(): array
     {
diff --git a/src/Sylius/Bundle/PayumBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
similarity index 94%
rename from src/Sylius/Bundle/PayumBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
rename to src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
index da2445f711..08c7d6302b 100644
--- a/src/Sylius/Bundle/PayumBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Validator\GroupsGenerator;
+namespace Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
 
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Symfony\Component\Form\FormInterface;
diff --git a/src/Sylius/Bundle/PayumBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php b/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php
similarity index 91%
rename from src/Sylius/Bundle/PayumBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php
rename to src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php
index c7915fdb23..a1b6b57f16 100644
--- a/src/Sylius/Bundle/PayumBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php
+++ b/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Bundle\PayumBundle\Validator\GroupsGenerator;
+namespace spec\Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
 use Symfony\Component\Form\FormInterface;
 
 final class GatewayConfigGroupsGeneratorSpec extends ObjectBehavior
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php
index 6bd305b0cd..95639faf64 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php
@@ -33,15 +33,6 @@ final class Configuration implements ConfigurationInterface
         $rootNode
             ->addDefaultsIfNotSet()
             ->children()
-                ->arrayNode('gateway_config')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->arrayNode('validation_groups')
-                            ->useAttributeAsKey('name')
-                            ->variablePrototype()->end()
-                        ->end()
-                    ->end()
-                ->end()
                 ->scalarNode('driver')->defaultValue(SyliusResourceBundle::DRIVER_DOCTRINE_ORM)->end()
                 ->arrayNode('template')
                     ->addDefaultsIfNotSet()
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
index f300539e50..7e7ecb893a 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -43,7 +43,6 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
 
         $container->setParameter('payum.template.layout', $config['template']['layout']);
         $container->setParameter('payum.template.obtain_credit_card', $config['template']['obtain_credit_card']);
-        $container->setParameter('sylius.payum.gateway_config.validation_groups', $config['gateway_config']['validation_groups']);
 
         $this->registerAutoconfiguration($container);
     }
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
index 10fa60d3b1..4805c1af32 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
@@ -24,13 +24,3 @@ sylius_payment:
             classes:
                 model: Sylius\Bundle\PayumBundle\Model\GatewayConfig
                 interface: Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface
-
-sylius_payum:
-    gateway_config:
-        validation_groups:
-            paypal_express_checkout:
-                - 'sylius'
-                - 'sylius_paypal_express_checkout'
-            stripe_checkout:
-                - 'sylius'
-                - 'sylius_stripe_checkout'
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
index c9be25e5ba..6bbb70b0ff 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
@@ -12,11 +12,6 @@
 -->
 
 <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">
-    <parameters>
-        <parameter key="sylius.form.type.gateway_config.validation_groups" type="collection">
-            <parameter>sylius</parameter>
-        </parameter>
-    </parameters>
     <services>
         <defaults public="true" />
 
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/validator.xml
index 150b0d3a0e..a557457816 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/validator.xml
@@ -22,9 +22,5 @@
             <argument>%sylius.gateway_factories%</argument>
             <tag name="validator.constraint_validator" alias="sylius_gateway_factory_exists_validator" />
         </service>
-
-        <service id="Sylius\Bundle\PayumBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator">
-            <argument>%sylius.payum.gateway_config.validation_groups%</argument>
-        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/SyliusPayumExtensionTest.php b/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/SyliusPayumExtensionTest.php
deleted file mode 100644
index 9860483342..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Tests/DependencyInjection/SyliusPayumExtensionTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\PayumBundle\Tests\DependencyInjection;
-
-use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
-use Sylius\Bundle\PayumBundle\DependencyInjection\SyliusPayumExtension;
-
-final class SyliusPayumExtensionTest extends AbstractExtensionTestCase
-{
-    /** @test */
-    public function it_loads_gateway_config_validation_groups_parameter_value_properly(): void
-    {
-        $this->load([
-            'gateway_config' => [
-                'validation_groups' => [
-                        'paypal_express_checkout' => ['sylius', 'paypal'],
-                        'offline' => ['sylius'],
-                ],
-            ],
-        ]);
-
-        $this->assertContainerBuilderHasParameter('sylius.payum.gateway_config.validation_groups', ['paypal_express_checkout' => ['sylius', 'paypal'], 'offline' => ['sylius']]);
-    }
-
-    protected function getContainerExtensions(): array
-    {
-        return [new SyliusPayumExtension()];
-    }
-}

From a11c00f6ee213b53ef39dc0614b92970665a0ef1 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 13:53:13 +0200
Subject: [PATCH 103/200] Move GatewayConfigType to PaymentBundle

---
 .../Extension/PaymentMethodTypeExtension.php  | 39 -----------------
 .../Resources/config/services/form.xml        |  1 -
 .../Form/Type/GatewayConfigType.php           |  6 +--
 .../Form/Type/PaymentMethodType.php           | 42 +++++++++++++++++++
 .../Resources/config/services/form.xml        |  7 ++++
 .../CryptedGatewayConfigTypeExtension.php     |  2 +-
 .../Resources/config/services/form.xml        |  7 ----
 7 files changed, 53 insertions(+), 51 deletions(-)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/Form/Type/GatewayConfigType.php (92%)

diff --git a/src/Sylius/Bundle/CoreBundle/Form/Extension/PaymentMethodTypeExtension.php b/src/Sylius/Bundle/CoreBundle/Form/Extension/PaymentMethodTypeExtension.php
index 296d598777..ce517b5651 100644
--- a/src/Sylius/Bundle/CoreBundle/Form/Extension/PaymentMethodTypeExtension.php
+++ b/src/Sylius/Bundle/CoreBundle/Form/Extension/PaymentMethodTypeExtension.php
@@ -15,61 +15,22 @@ namespace Sylius\Bundle\CoreBundle\Form\Extension;
 
 use Sylius\Bundle\ChannelBundle\Form\Type\ChannelChoiceType;
 use Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodType;
-use Sylius\Bundle\PayumBundle\Form\Type\GatewayConfigType;
-use Sylius\Bundle\PayumBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator;
-use Sylius\Component\Core\Formatter\StringInflector;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class PaymentMethodTypeExtension extends AbstractTypeExtension
 {
-    public function __construct(private readonly GatewayConfigGroupsGenerator $gatewayConfigGroupsGenerator)
-    {
-    }
-
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $gatewayFactory = $options['data']->getGatewayConfig();
-
         $builder
             ->add('channels', ChannelChoiceType::class, [
                 'multiple' => true,
                 'expanded' => true,
                 'label' => 'sylius.form.payment_method.channels',
             ])
-            ->add('gatewayConfig', GatewayConfigType::class, [
-                'label' => false,
-                'data' => $gatewayFactory,
-            ])
-            ->addEventListener(FormEvents::SUBMIT, function (FormEvent $event): void {
-                $paymentMethod = $event->getData();
-
-                if (!$paymentMethod instanceof PaymentMethodInterface) {
-                    return;
-                }
-
-                $gatewayConfig = $paymentMethod->getGatewayConfig();
-                /** @var string|null $gatewayName */
-                $gatewayName = $gatewayConfig->getGatewayName();
-
-                if (null === $gatewayName && null !== $paymentMethod->getCode()) {
-                    $gatewayConfig->setGatewayName(StringInflector::nameToLowercaseCode($paymentMethod->getCode()));
-                }
-            })
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'validation_groups' => $this->gatewayConfigGroupsGenerator,
-        ]);
-    }
-
     public static function getExtendedTypes(): iterable
     {
         return [PaymentMethodType::class];
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml
index 2c705ce9cc..f5fb72bc10 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml
@@ -83,7 +83,6 @@
             <tag name="form.type_extension" extended-type="Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionType" priority="100" />
         </service>
         <service id="sylius.form.extension.type.payment_method" class="Sylius\Bundle\CoreBundle\Form\Extension\PaymentMethodTypeExtension">
-            <argument type="service" id="Sylius\Bundle\PayumBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator" />
             <tag name="form.type_extension" extended-type="Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodType" priority="100" />
         </service>
         <service id="sylius.form.extension.type.tax_rate" class="Sylius\Bundle\CoreBundle\Form\Extension\TaxRateTypeExtension">
diff --git a/src/Sylius/Bundle/PayumBundle/Form/Type/GatewayConfigType.php b/src/Sylius/Bundle/PaymentBundle/Form/Type/GatewayConfigType.php
similarity index 92%
rename from src/Sylius/Bundle/PayumBundle/Form/Type/GatewayConfigType.php
rename to src/Sylius/Bundle/PaymentBundle/Form/Type/GatewayConfigType.php
index 004fbcc218..349417c090 100644
--- a/src/Sylius/Bundle/PayumBundle/Form/Type/GatewayConfigType.php
+++ b/src/Sylius/Bundle/PaymentBundle/Form/Type/GatewayConfigType.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Form\Type;
+namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
-use Payum\Core\Model\GatewayConfigInterface;
 use Sylius\Bundle\ResourceBundle\Form\Registry\FormTypeRegistryInterface;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -63,6 +63,6 @@ final class GatewayConfigType extends AbstractResourceType
 
     public function getBlockPrefix(): string
     {
-        return 'sylius_payum_gateway_config';
+        return 'sylius_payment_gateway_config';
     }
 }
diff --git a/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php b/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
index 901a7c0015..86edb6c6d0 100644
--- a/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
+++ b/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
@@ -13,17 +13,33 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
+use Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator;
 use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Sylius\Bundle\ResourceBundle\Form\Type\ResourceTranslationsType;
+use Sylius\Component\Core\Formatter\StringInflector;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class PaymentMethodType extends AbstractResourceType
 {
+    public function __construct(
+        string $dataClass,
+        array $validationGroups,
+        private readonly GatewayConfigGroupsGenerator $gatewayConfigGroupsGenerator,
+    ) {
+        parent::__construct($dataClass, $validationGroups);
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
+        $gatewayFactory = $options['data']->getGatewayConfig();
+
         $builder
             ->add('translations', ResourceTranslationsType::class, [
                 'entry_type' => PaymentMethodTranslationType::class,
@@ -37,10 +53,36 @@ final class PaymentMethodType extends AbstractResourceType
                 'required' => false,
                 'label' => 'sylius.form.payment_method.enabled',
             ])
+            ->add('gatewayConfig', GatewayConfigType::class, [
+                'label' => false,
+                'data' => $gatewayFactory,
+            ])
             ->addEventSubscriber(new AddCodeFormSubscriber())
+            ->addEventListener(FormEvents::SUBMIT, function (FormEvent $event): void {
+                $paymentMethod = $event->getData();
+
+                if (!$paymentMethod instanceof PaymentMethodInterface) {
+                    return;
+                }
+
+                $gatewayConfig = $paymentMethod->getGatewayConfig();
+                /** @var string|null $gatewayName */
+                $gatewayName = $gatewayConfig->getGatewayName();
+
+                if (null === $gatewayName && null !== $paymentMethod->getCode()) {
+                    $gatewayConfig->setGatewayName(StringInflector::nameToLowercaseCode($paymentMethod->getCode()));
+                }
+            })
         ;
     }
 
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'validation_groups' => $this->gatewayConfigGroupsGenerator,
+        ]);
+    }
+
     public function getBlockPrefix(): string
     {
         return 'sylius_payment_method';
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
index 3aed485e63..b60da4f6c8 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
@@ -30,6 +30,13 @@
     <services>
         <defaults public="true" />
 
+        <service id="sylius.form.type.gateway_config" class="Sylius\Bundle\PaymentBundle\Form\Type\GatewayConfigType">
+            <argument>%sylius.model.gateway_config.class%</argument>
+            <argument>%sylius.form.type.gateway_config.validation_groups%</argument>
+            <argument type="service" id="sylius.form_registry.payment_gateway_config" />
+            <tag name="form.type" />
+        </service>
+
         <service id="sylius.form.type.payment" class="Sylius\Bundle\PaymentBundle\Form\Type\PaymentType">
             <argument>%sylius.model.payment.class%</argument>
             <argument>%sylius.form.type.payment.validation_groups%</argument>
diff --git a/src/Sylius/Bundle/PayumBundle/Form/Extension/CryptedGatewayConfigTypeExtension.php b/src/Sylius/Bundle/PayumBundle/Form/Extension/CryptedGatewayConfigTypeExtension.php
index c9919f9d8c..7826530e61 100644
--- a/src/Sylius/Bundle/PayumBundle/Form/Extension/CryptedGatewayConfigTypeExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/Form/Extension/CryptedGatewayConfigTypeExtension.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PayumBundle\Form\Extension;
 
 use Payum\Core\Security\CryptedInterface;
-use Sylius\Bundle\PayumBundle\Form\Type\GatewayConfigType;
+use Sylius\Bundle\PaymentBundle\Form\Type\GatewayConfigType;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
index 6bbb70b0ff..5e9a07d204 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml
@@ -15,13 +15,6 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.form.type.gateway_config" class="Sylius\Bundle\PayumBundle\Form\Type\GatewayConfigType">
-            <argument>%sylius.model.gateway_config.class%</argument>
-            <argument>%sylius.form.type.gateway_config.validation_groups%</argument>
-            <argument type="service" id="sylius.form_registry.payum_gateway_config" />
-            <tag name="form.type" />
-        </service>
-
         <service id="sylius.form.extension.type.gateway_config.crypted" class="Sylius\Bundle\PayumBundle\Form\Extension\CryptedGatewayConfigTypeExtension">
             <argument type="service" id="payum.dynamic_gateways.cypher" on-invalid="null" />
             <tag name="form.type_extension" extended-type="Sylius\Bundle\PayumBundle\Form\Type\GatewayConfigType" priority="100" />

From 5aca02e375e5191ce3542ca3957a3d1a130915a9 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 14:13:59 +0200
Subject: [PATCH 104/200] Fix wrong coupling

---
 .../Bundle/PaymentBundle/Form/Type/PaymentMethodType.php     | 5 ++---
 .../GroupsGenerator/GatewayConfigGroupsGenerator.php         | 2 +-
 .../Form/Extension/CryptedGatewayConfigTypeExtension.php     | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php b/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
index 86edb6c6d0..f219468c61 100644
--- a/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
+++ b/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
@@ -17,8 +17,7 @@ use Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGen
 use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Sylius\Bundle\ResourceBundle\Form\Type\ResourceTranslationsType;
-use Sylius\Component\Core\Formatter\StringInflector;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -70,7 +69,7 @@ final class PaymentMethodType extends AbstractResourceType
                 $gatewayName = $gatewayConfig->getGatewayName();
 
                 if (null === $gatewayName && null !== $paymentMethod->getCode()) {
-                    $gatewayConfig->setGatewayName(StringInflector::nameToLowercaseCode($paymentMethod->getCode()));
+                    $gatewayConfig->setGatewayName(strtolower(str_replace([' ', '-', '\''], '_', $paymentMethod->getCode())));
                 }
             })
         ;
diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
index 08c7d6302b..964b450fc8 100644
--- a/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
 
-use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
 use Symfony\Component\Form\FormInterface;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Sylius/Bundle/PayumBundle/Form/Extension/CryptedGatewayConfigTypeExtension.php b/src/Sylius/Bundle/PayumBundle/Form/Extension/CryptedGatewayConfigTypeExtension.php
index 7826530e61..369469efa5 100644
--- a/src/Sylius/Bundle/PayumBundle/Form/Extension/CryptedGatewayConfigTypeExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/Form/Extension/CryptedGatewayConfigTypeExtension.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PayumBundle\Form\Extension;
 
 use Payum\Core\Security\CryptedInterface;
+use Payum\Core\Security\CypherInterface;
 use Sylius\Bundle\PaymentBundle\Form\Type\GatewayConfigType;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -22,7 +23,7 @@ use Symfony\Component\Form\FormEvents;
 
 final class CryptedGatewayConfigTypeExtension extends AbstractTypeExtension
 {
-    public function __construct(private ?\Payum\Core\Security\CypherInterface $cypher = null)
+    public function __construct(private ?CypherInterface $cypher = null)
     {
     }
 

From c8966deecfaa3782d5e21ec72175fb82aca3099e Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Fri, 9 Aug 2024 14:52:47 +0200
Subject: [PATCH 105/200] Add CypherInterface to composer require checker
 whitelist

---
 composer-require-checker.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer-require-checker.json b/composer-require-checker.json
index 6e16f40361..e3c7684e35 100644
--- a/composer-require-checker.json
+++ b/composer-require-checker.json
@@ -50,6 +50,7 @@
     "Payum\\Core\\Request\\Notify",
     "Payum\\Core\\Request\\RenderTemplate",
     "Payum\\Core\\Security\\CryptedInterface",
+    "Payum\\Core\\Security\\CypherInterface",
     "Payum\\Core\\Security\\GenericTokenFactoryInterface",
     "Payum\\Core\\Security\\HttpRequestVerifierInterface",
     "Payum\\Core\\Security\\TokenAggregateInterface",

From 127e1d42f4485c59e973a54b3b3aac82963ef14a Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Mon, 12 Aug 2024 07:55:10 +0200
Subject: [PATCH 106/200] Move GatewayConfig validation configs to
 PaymentBundle

---
 .../Resources/config/app/config.yml           | 10 -----
 .../Resources/config/services.xml             |  2 +-
 .../Resources/config/services/validator.xml   |  2 +-
 .../config/validation/GatewayConfig.xml       | 39 +++++++++++++++++++
 .../Resources/translations/validators.en.yml  |  6 +++
 .../Constraints/GatewayFactoryExists.php      |  2 +-
 .../GatewayFactoryExistsValidator.php         |  4 +-
 .../GatewayFactoryExistsValidatorSpec.php     | 13 ++++---
 .../Resources/config/app/config.yaml          |  9 +++++
 .../config/validation/GatewayConfig.xml       | 22 ++---------
 .../Resources/translations/validators.en.yml  |  5 ---
 11 files changed, 70 insertions(+), 44 deletions(-)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/Resources/config/services/validator.xml (89%)
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Resources/config/validation/GatewayConfig.xml
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/Validator/Constraints/GatewayFactoryExists.php (91%)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/Validator/GatewayFactoryExistsValidator.php (91%)
 rename src/Sylius/Bundle/{PayumBundle => PaymentBundle}/spec/Validator/GatewayFactoryExistsValidatorSpec.php (83%)

diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
index e9e98dbc58..e5bfe497fe 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/app/config.yml
@@ -7,13 +7,3 @@ jms_serializer:
             sylius-payment:
                 namespace_prefix: "Sylius\\Component\\Payment"
                 path: "@SyliusPaymentBundle/Resources/config/serializer"
-
-sylius_payment:
-    gateway_config:
-        validation_groups:
-            paypal_express_checkout:
-                - 'sylius'
-                - 'sylius_paypal_express_checkout'
-            stripe_checkout:
-                - 'sylius'
-                - 'sylius_stripe_checkout'
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index 640b5c65cb..15b6bbcb81 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -13,7 +13,7 @@
 
 <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">
     <imports>
-        <import resource="services/form.xml" />
+        <import resource="services/**/*.xml" />
     </imports>
 
     <parameters>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml
similarity index 89%
rename from src/Sylius/Bundle/PayumBundle/Resources/config/services/validator.xml
rename to src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml
index a557457816..c712d37af5 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\PayumBundle\Validator\GatewayFactoryExistsValidator">
+        <service id="Sylius\Bundle\PaymentBundle\Validator\GatewayFactoryExistsValidator">
             <argument>%sylius.gateway_factories%</argument>
             <tag name="validator.constraint_validator" alias="sylius_gateway_factory_exists_validator" />
         </service>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/validation/GatewayConfig.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/validation/GatewayConfig.xml
new file mode 100644
index 0000000000..3af72be4fe
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/validation/GatewayConfig.xml
@@ -0,0 +1,39 @@
+<?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.
+
+-->
+
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd"
+>
+    <class name="Sylius\Component\Payment\Model\GatewayConfig">
+        <property name="gatewayName">
+            <constraint name="NotBlank">
+                <option name="message">sylius.gateway_config.gateway_name.not_blank</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+
+        <property name="factoryName">
+            <constraint name="NotBlank">
+                <option name="message">sylius.gateway_config.factory_name.not_blank</option>
+                <option name="groups">sylius</option>
+            </constraint>
+
+            <constraint name="Sylius\Bundle\PaymentBundle\Validator\Constraints\GatewayFactoryExists">
+                <option name="groups">
+                    <value>sylius</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/translations/validators.en.yml b/src/Sylius/Bundle/PaymentBundle/Resources/translations/validators.en.yml
index 6718232f62..06ee7fa292 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/translations/validators.en.yml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/translations/validators.en.yml
@@ -16,6 +16,12 @@ sylius:
             min_length: The credit card's CVV code must be at most than {{ limit }} digits long.
         expiry_year:
             not_blank: Please select the expiration year.
+    gateway_config:
+        invalid_gateway_factory: Invalid gateway factory. Available factories are {{ available_factories }}.
+        gateway_name:
+            not_blank: Please enter gateway name.
+        factory_name:
+            not_blank: Please enter gateway factory name.
     payment:
         currency_code:
             not_valid: The currency code you entered is invalid.
diff --git a/src/Sylius/Bundle/PayumBundle/Validator/Constraints/GatewayFactoryExists.php b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php
similarity index 91%
rename from src/Sylius/Bundle/PayumBundle/Validator/Constraints/GatewayFactoryExists.php
rename to src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php
index c02c3eee20..b3cc868fa7 100644
--- a/src/Sylius/Bundle/PayumBundle/Validator/Constraints/GatewayFactoryExists.php
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Validator\Constraints;
+namespace Sylius\Bundle\PaymentBundle\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
diff --git a/src/Sylius/Bundle/PayumBundle/Validator/GatewayFactoryExistsValidator.php b/src/Sylius/Bundle/PaymentBundle/Validator/GatewayFactoryExistsValidator.php
similarity index 91%
rename from src/Sylius/Bundle/PayumBundle/Validator/GatewayFactoryExistsValidator.php
rename to src/Sylius/Bundle/PaymentBundle/Validator/GatewayFactoryExistsValidator.php
index c478cfa05a..92cf7acbab 100644
--- a/src/Sylius/Bundle/PayumBundle/Validator/GatewayFactoryExistsValidator.php
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/GatewayFactoryExistsValidator.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Validator;
+namespace Sylius\Bundle\PaymentBundle\Validator;
 
-use Sylius\Bundle\PayumBundle\Validator\Constraints\GatewayFactoryExists;
+use Sylius\Bundle\PaymentBundle\Validator\Constraints\GatewayFactoryExists;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
diff --git a/src/Sylius/Bundle/PayumBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php b/src/Sylius/Bundle/PaymentBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php
similarity index 83%
rename from src/Sylius/Bundle/PayumBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php
rename to src/Sylius/Bundle/PaymentBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php
index bce09b164a..46506b2805 100644
--- a/src/Sylius/Bundle/PayumBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php
+++ b/src/Sylius/Bundle/PaymentBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Bundle\PayumBundle\Validator;
+namespace spec\Sylius\Bundle\PaymentBundle\Validator;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
-use Sylius\Bundle\PayumBundle\Validator\Constraints\GatewayFactoryExists;
+use Sylius\Bundle\PaymentBundle\Validator\Constraints\GatewayFactoryExists;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -27,9 +27,10 @@ final class GatewayFactoryExistsValidatorSpec extends ObjectBehavior
     function let(
         ExecutionContextInterface $executionContext,
     ): void {
-        $this->beConstructedWith(
-            ['paypal_express_checkout' => 'sylius.payum_gateway_factory.paypal_express_checkout', 'stripe_checkout' => 'sylius.payum_gateway_factory.stripe_checkout'],
-        );
+        $this->beConstructedWith([
+            'paypal_express_checkout' => 'sylius.payum_gateway_factory.paypal_express_checkout',
+            'stripe_checkout' => 'sylius.payum_gateway_factory.stripe_checkout',
+        ]);
 
         $this->initialize($executionContext);
     }
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
index 4805c1af32..3a92582d9b 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
@@ -24,3 +24,12 @@ sylius_payment:
             classes:
                 model: Sylius\Bundle\PayumBundle\Model\GatewayConfig
                 interface: Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface
+
+    gateway_config:
+        validation_groups:
+            paypal_express_checkout:
+                - 'sylius'
+                - 'sylius_paypal_express_checkout'
+            stripe_checkout:
+                - 'sylius'
+                - 'sylius_stripe_checkout'
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/validation/GatewayConfig.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/validation/GatewayConfig.xml
index 108719f779..4b4a978208 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/validation/GatewayConfig.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/validation/GatewayConfig.xml
@@ -11,25 +11,11 @@
 
 -->
 
-<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd"
+>
     <class name="Sylius\Bundle\PayumBundle\Model\GatewayConfig">
-        <property name="gatewayName">
-            <constraint name="NotBlank">
-                <option name="message">sylius.gateway_config.gateway_name.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-        <property name="factoryName">
-            <constraint name="NotBlank">
-                <option name="message">sylius.gateway_config.factory_name.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-            <constraint name="Sylius\Bundle\PayumBundle\Validator\Constraints\GatewayFactoryExists">
-                <option name="groups">
-                    <value>sylius</value>
-                </option>
-            </constraint>
-        </property>
         <property name="config">
             <constraint name="Collection">
                 <option name="groups">sylius_stripe_checkout</option>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/translations/validators.en.yml b/src/Sylius/Bundle/PayumBundle/Resources/translations/validators.en.yml
index c3ad59f7a2..9a0b5c1b29 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/translations/validators.en.yml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/translations/validators.en.yml
@@ -1,10 +1,5 @@
 sylius:
     gateway_config:
-        invalid_gateway_factory: Invalid gateway factory. Available factories are {{ available_factories }}.
-        gateway_name:
-            not_blank: Please enter gateway name.
-        factory_name:
-            not_blank: Please enter gateway factory name.
         paypal:
             password:
                 not_blank: Please enter paypal password.

From bf7ea4d1d8bdf479a79423e529390269a7acd6f9 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Mon, 12 Aug 2024 08:58:46 +0200
Subject: [PATCH 107/200] Fix moving AsGatewayConfigurationType attribute to
 PaymentBundle

---
 .../SyliusPaymentExtension.php                 | 12 ++++++++++++
 .../SyliusPayumExtension.php                   | 18 ------------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php
index 972ff84615..38514011db 100644
--- a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php
+++ b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\DependencyInjection;
 
+use Sylius\Bundle\PaymentBundle\Attribute\AsGatewayConfigurationType;
 use Sylius\Bundle\PaymentBundle\Attribute\AsPaymentMethodsResolver;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
 use Symfony\Component\Config\FileLocator;
@@ -39,6 +40,17 @@ final class SyliusPaymentExtension extends AbstractResourceExtension
 
     private function registerAutoconfiguration(ContainerBuilder $container): void
     {
+        $container->registerAttributeForAutoconfiguration(
+            AsGatewayConfigurationType::class,
+            static function (ChildDefinition $definition, AsGatewayConfigurationType $attribute): void {
+                $definition->addTag(AsGatewayConfigurationType::SERVICE_TAG, [
+                    'type' => $attribute->getType(),
+                    'label' => $attribute->getLabel(),
+                    'priority' => $attribute->getPriority(),
+                ]);
+            },
+        );
+
         $container->registerAttributeForAutoconfiguration(
             AsPaymentMethodsResolver::class,
             static function (ChildDefinition $definition, AsPaymentMethodsResolver $attribute): void {
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
index 7e7ecb893a..a89871ede9 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -15,10 +15,8 @@ namespace Sylius\Bundle\PayumBundle\DependencyInjection;
 
 use Payum\Paypal\ExpressCheckout\Nvp\PaypalExpressCheckoutGatewayFactory;
 use Payum\Stripe\StripeCheckoutGatewayFactory;
-use Sylius\Bundle\PaymentBundle\Attribute\AsGatewayConfigurationType;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -43,8 +41,6 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
 
         $container->setParameter('payum.template.layout', $config['template']['layout']);
         $container->setParameter('payum.template.obtain_credit_card', $config['template']['obtain_credit_card']);
-
-        $this->registerAutoconfiguration($container);
     }
 
     public function prepend(ContainerBuilder $container): void
@@ -52,20 +48,6 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
         $this->prependSyliusPayment($container);
     }
 
-    private function registerAutoconfiguration(ContainerBuilder $container): void
-    {
-        $container->registerAttributeForAutoconfiguration(
-            AsGatewayConfigurationType::class,
-            static function (ChildDefinition $definition, AsGatewayConfigurationType $attribute): void {
-                $definition->addTag(AsGatewayConfigurationType::SERVICE_TAG, [
-                    'type' => $attribute->getType(),
-                    'label' => $attribute->getLabel(),
-                    'priority' => $attribute->getPriority(),
-                ]);
-            },
-        );
-    }
-
     private function prependSyliusPayment(ContainerBuilder $container): void
     {
         if (!$container->hasExtension('sylius_payment')) {

From 8b8824b846355e35330ff6a3f63cd970b99f6a27 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Tue, 13 Aug 2024 07:14:20 +0200
Subject: [PATCH 108/200] [Payment] Minor fixes after CR

---
 .../Resources/config/services/validator.xml    |  2 +-
 .../GatewayFactoryExistsValidator.php          |  3 +--
 .../GatewayFactoryExistsValidatorSpec.php      |  2 +-
 .../Bundle/PayumBundle/Model/GatewayConfig.php |  1 -
 .../Component/Payment/Model/GatewayConfig.php  |  2 +-
 .../Component/Payment/Model/PaymentMethod.php  | 10 +++++-----
 .../Payment/Model/PaymentMethodInterface.php   |  4 ++--
 .../Payment/spec/Model/GatewayConfigSpec.php   | 18 ++++++++++++------
 8 files changed, 23 insertions(+), 19 deletions(-)
 rename src/Sylius/Bundle/PaymentBundle/Validator/{ => Constraints}/GatewayFactoryExistsValidator.php (91%)
 rename src/Sylius/Bundle/PaymentBundle/spec/Validator/{ => Constraints}/GatewayFactoryExistsValidatorSpec.php (97%)

diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml
index c712d37af5..3c36b0a299 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml
@@ -18,7 +18,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\PaymentBundle\Validator\GatewayFactoryExistsValidator">
+        <service id="Sylius\Bundle\PaymentBundle\Validator\Constraints\GatewayFactoryExistsValidator">
             <argument>%sylius.gateway_factories%</argument>
             <tag name="validator.constraint_validator" alias="sylius_gateway_factory_exists_validator" />
         </service>
diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/GatewayFactoryExistsValidator.php b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExistsValidator.php
similarity index 91%
rename from src/Sylius/Bundle/PaymentBundle/Validator/GatewayFactoryExistsValidator.php
rename to src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExistsValidator.php
index 92cf7acbab..b4f710035e 100644
--- a/src/Sylius/Bundle/PaymentBundle/Validator/GatewayFactoryExistsValidator.php
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExistsValidator.php
@@ -11,9 +11,8 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PaymentBundle\Validator;
+namespace Sylius\Bundle\PaymentBundle\Validator\Constraints;
 
-use Sylius\Bundle\PaymentBundle\Validator\Constraints\GatewayFactoryExists;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
diff --git a/src/Sylius/Bundle/PaymentBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php b/src/Sylius/Bundle/PaymentBundle/spec/Validator/Constraints/GatewayFactoryExistsValidatorSpec.php
similarity index 97%
rename from src/Sylius/Bundle/PaymentBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php
rename to src/Sylius/Bundle/PaymentBundle/spec/Validator/Constraints/GatewayFactoryExistsValidatorSpec.php
index 46506b2805..fedeb89a45 100644
--- a/src/Sylius/Bundle/PaymentBundle/spec/Validator/GatewayFactoryExistsValidatorSpec.php
+++ b/src/Sylius/Bundle/PaymentBundle/spec/Validator/Constraints/GatewayFactoryExistsValidatorSpec.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Bundle\PaymentBundle\Validator;
+namespace spec\Sylius\Bundle\PaymentBundle\Validator\Constraints;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
diff --git a/src/Sylius/Bundle/PayumBundle/Model/GatewayConfig.php b/src/Sylius/Bundle/PayumBundle/Model/GatewayConfig.php
index 6d50d5503a..ff7b4bc4dc 100644
--- a/src/Sylius/Bundle/PayumBundle/Model/GatewayConfig.php
+++ b/src/Sylius/Bundle/PayumBundle/Model/GatewayConfig.php
@@ -43,7 +43,6 @@ class GatewayConfig extends BaseGatewayConfig implements GatewayConfigInterface
         $this->decryptedConfig = $config;
     }
 
-
     /** This method is based on Payum\Core\Model\GatewayConfig::decrypt */
     public function decrypt(CypherInterface $cypher): void
     {
diff --git a/src/Sylius/Component/Payment/Model/GatewayConfig.php b/src/Sylius/Component/Payment/Model/GatewayConfig.php
index 6eb07c2887..040ddf3503 100644
--- a/src/Sylius/Component/Payment/Model/GatewayConfig.php
+++ b/src/Sylius/Component/Payment/Model/GatewayConfig.php
@@ -46,7 +46,7 @@ class GatewayConfig implements GatewayConfigInterface
 
     public function getFactoryName(): ?string
     {
-        return $this->factoryName;
+        return $this->factoryName ?? $this->config['factory'] ?? null;
     }
 
     public function setFactoryName($factoryName): void
diff --git a/src/Sylius/Component/Payment/Model/PaymentMethod.php b/src/Sylius/Component/Payment/Model/PaymentMethod.php
index 10705425ca..95f35922d2 100644
--- a/src/Sylius/Component/Payment/Model/PaymentMethod.php
+++ b/src/Sylius/Component/Payment/Model/PaymentMethod.php
@@ -117,16 +117,16 @@ class PaymentMethod implements PaymentMethodInterface, \Stringable
         $this->position = $position;
     }
 
-    public function setGatewayConfig(?GatewayConfigInterface $gatewayConfig): void
-    {
-        $this->gatewayConfig = $gatewayConfig;
-    }
-
     public function getGatewayConfig(): ?GatewayConfigInterface
     {
         return $this->gatewayConfig;
     }
 
+    public function setGatewayConfig(?GatewayConfigInterface $gatewayConfig): void
+    {
+        $this->gatewayConfig = $gatewayConfig;
+    }
+
     /**
      * @return PaymentMethodTranslationInterface
      */
diff --git a/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php b/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php
index 58324cfbbc..d671cadef7 100644
--- a/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php
+++ b/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php
@@ -47,10 +47,10 @@ interface PaymentMethodInterface extends
 
     public function setPosition(?int $position): void;
 
-    public function setGatewayConfig(?GatewayConfigInterface $gatewayConfig): void;
-
     public function getGatewayConfig(): ?GatewayConfigInterface;
 
+    public function setGatewayConfig(?GatewayConfigInterface $gatewayConfig): void;
+
     /**
      * @return PaymentMethodTranslationInterface
      */
diff --git a/src/Sylius/Component/Payment/spec/Model/GatewayConfigSpec.php b/src/Sylius/Component/Payment/spec/Model/GatewayConfigSpec.php
index 1c5f59b960..29308fa07b 100644
--- a/src/Sylius/Component/Payment/spec/Model/GatewayConfigSpec.php
+++ b/src/Sylius/Component/Payment/spec/Model/GatewayConfigSpec.php
@@ -23,18 +23,24 @@ final class GatewayConfigSpec extends ObjectBehavior
         $this->shouldImplement(GatewayConfigInterface::class);
     }
 
-    function its_factory_name_is_mutable(): void
-    {
-        $this->setFactoryName('Offline');
-        $this->getFactoryName()->shouldReturn('Offline');
-    }
-
     function its_gateway_name_is_mutable(): void
     {
         $this->setGatewayName('Offline');
         $this->getGatewayName()->shouldReturn('Offline');
     }
 
+    function it_gets_factory_name_from_config_if_the_variable_is_not_set(): void
+    {
+        $this->setConfig(['factory' => 'Offline']);
+        $this->getFactoryName()->shouldReturn('Offline');
+    }
+
+    function its_factory_name_is_mutable(): void
+    {
+        $this->setFactoryName('Offline');
+        $this->getFactoryName()->shouldReturn('Offline');
+    }
+
     function its_config_s_mutable(): void
     {
         $this->setConfig(['key' => '123']);

From 584febb12733e3c2f793c895257f4a57dbf4be15 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Tue, 13 Aug 2024 07:47:48 +0200
Subject: [PATCH 109/200] [Payment] Extract generator for gateway name

---
 .../Form/Type/PaymentMethodType.php           |  4 ++-
 .../Generator/GatewayConfigNameGenerator.php  | 29 +++++++++++++++
 .../GatewayConfigNameGeneratorInterface.php   | 21 +++++++++++
 .../Resources/config/services.xml             |  3 ++
 .../Resources/config/services/form.xml        |  1 +
 .../GatewayConfigNameGeneratorSpec.php        | 36 +++++++++++++++++++
 6 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Generator/GatewayConfigNameGenerator.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Generator/GatewayConfigNameGeneratorInterface.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/spec/Generator/GatewayConfigNameGeneratorSpec.php

diff --git a/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php b/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
index f219468c61..7481948016 100644
--- a/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
+++ b/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
+use Sylius\Bundle\PaymentBundle\Generator\GatewayConfigNameGeneratorInterface;
 use Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator;
 use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
@@ -31,6 +32,7 @@ final class PaymentMethodType extends AbstractResourceType
         string $dataClass,
         array $validationGroups,
         private readonly GatewayConfigGroupsGenerator $gatewayConfigGroupsGenerator,
+        private readonly GatewayConfigNameGeneratorInterface $gatewayConfigNameGenerator,
     ) {
         parent::__construct($dataClass, $validationGroups);
     }
@@ -69,7 +71,7 @@ final class PaymentMethodType extends AbstractResourceType
                 $gatewayName = $gatewayConfig->getGatewayName();
 
                 if (null === $gatewayName && null !== $paymentMethod->getCode()) {
-                    $gatewayConfig->setGatewayName(strtolower(str_replace([' ', '-', '\''], '_', $paymentMethod->getCode())));
+                    $gatewayConfig->setGatewayName($this->gatewayConfigNameGenerator->generate($paymentMethod));
                 }
             })
         ;
diff --git a/src/Sylius/Bundle/PaymentBundle/Generator/GatewayConfigNameGenerator.php b/src/Sylius/Bundle/PaymentBundle/Generator/GatewayConfigNameGenerator.php
new file mode 100644
index 0000000000..2cb17e7ed2
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Generator/GatewayConfigNameGenerator.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Generator;
+
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+
+final readonly class GatewayConfigNameGenerator implements GatewayConfigNameGeneratorInterface
+{
+    public function generate(PaymentMethodInterface $paymentMethod): ?string
+    {
+        $paymentMethodCode = $paymentMethod->getCode();
+        if (null === $paymentMethodCode) {
+            return null;
+        }
+
+        return strtolower(str_replace([' ', '-', '\''], '_', $paymentMethodCode));
+    }
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/Generator/GatewayConfigNameGeneratorInterface.php b/src/Sylius/Bundle/PaymentBundle/Generator/GatewayConfigNameGeneratorInterface.php
new file mode 100644
index 0000000000..fcfaaabb07
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Generator/GatewayConfigNameGeneratorInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Generator;
+
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+
+interface GatewayConfigNameGeneratorInterface
+{
+    public function generate(PaymentMethodInterface $paymentMethod): ?string;
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index 15b6bbcb81..6b67c63108 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -48,5 +48,8 @@
         <service id="sylius.validator.gateway_config_groups_generator" class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator">
             <argument>%sylius.gateway_config.validation_groups%</argument>
         </service>
+
+        <service id="sylius.gateway_config_name_generator" class="Sylius\Bundle\PaymentBundle\Generator\GatewayConfigNameGenerator" />
+        <service id="Sylius\Bundle\PaymentBundle\Generator\GatewayConfigNameGeneratorInterface" alias="sylius.gateway_config_name_generator" />
     </services>
 </container>
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
index b60da4f6c8..4491c0cef2 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
@@ -47,6 +47,7 @@
             <argument>%sylius.model.payment_method.class%</argument>
             <argument>%sylius.form.type.payment_method.validation_groups%</argument>
             <argument type="service" id="sylius.validator.gateway_config_groups_generator" />
+            <argument type="service" id="sylius.gateway_config_name_generator" />
             <tag name="form.type" />
         </service>
 
diff --git a/src/Sylius/Bundle/PaymentBundle/spec/Generator/GatewayConfigNameGeneratorSpec.php b/src/Sylius/Bundle/PaymentBundle/spec/Generator/GatewayConfigNameGeneratorSpec.php
new file mode 100644
index 0000000000..0c66d8f3c3
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/spec/Generator/GatewayConfigNameGeneratorSpec.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\PaymentBundle\Generator;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+
+final class GatewayConfigNameGeneratorSpec extends ObjectBehavior
+{
+    function it_generates_gateway_config_name_based_on_payment_method_code(
+        PaymentMethodInterface $paymentMethod,
+    ): void {
+        $paymentMethod->getCode()->willReturn('PayPal Express Checkout');
+
+        $this->generate($paymentMethod)->shouldReturn('paypal_express_checkout');
+    }
+
+    function it_returns_null_if_payment_method_code_is_null(
+        PaymentMethodInterface $paymentMethod,
+    ): void {
+        $paymentMethod->getCode()->willReturn(null);
+
+        $this->generate($paymentMethod)->shouldReturn(null);
+    }
+}

From 1d3f13afd3cbd0920950d285560dd7bcc279ca0d Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Tue, 13 Aug 2024 11:10:49 +0200
Subject: [PATCH 110/200] [Payment] Refactor generating gateway config
 validation groups

---
 .../config/api_resources/PaymentMethod.xml    |  2 +-
 .../Form/Type/PaymentMethodType.php           | 11 +++--
 .../Resources/config/services.xml             |  8 ++++
 .../Resources/config/services/form.xml        |  2 +-
 .../GatewayConfigGroupsGenerator.php          | 33 +++++--------
 .../GatewayConfigGroupsGeneratorInterface.php | 22 +++++++++
 .../PaymentMethodGroupsGenerator.php          | 40 ++++++++++++++++
 .../PaymentMethodGroupsGeneratorInterface.php | 22 +++++++++
 .../GatewayConfigGroupsGeneratorSpec.php      | 34 ++------------
 .../PaymentMethodGroupsGeneratorSpec.php      | 46 +++++++++++++++++++
 10 files changed, 164 insertions(+), 56 deletions(-)
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorInterface.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/PaymentMethodGroupsGenerator.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/PaymentMethodGroupsGeneratorInterface.php
 create mode 100644 src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/PaymentMethodGroupsGeneratorSpec.php

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentMethod.xml
index 1349ac8a97..7fa7722e3d 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentMethod.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/PaymentMethod.xml
@@ -16,7 +16,7 @@
            xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
 >
     <resource class="%sylius.model.payment_method.class%" shortName="PaymentMethod">
-        <attribute name="validation_groups">sylius.validator.gateway_config_groups_generator</attribute>
+        <attribute name="validation_groups">sylius.validator.payment_method_groups_generator</attribute>
 
         <attribute name="order">
             <attribute name="position">ASC</attribute>
diff --git a/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php b/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
index 7481948016..5e652f7ff9 100644
--- a/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
+++ b/src/Sylius/Bundle/PaymentBundle/Form/Type/PaymentMethodType.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Bundle\PaymentBundle\Form\Type;
 
 use Sylius\Bundle\PaymentBundle\Generator\GatewayConfigNameGeneratorInterface;
-use Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator;
+use Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGeneratorInterface;
 use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Sylius\Bundle\ResourceBundle\Form\Type\ResourceTranslationsType;
@@ -24,6 +24,7 @@ use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class PaymentMethodType extends AbstractResourceType
@@ -31,7 +32,7 @@ final class PaymentMethodType extends AbstractResourceType
     public function __construct(
         string $dataClass,
         array $validationGroups,
-        private readonly GatewayConfigGroupsGenerator $gatewayConfigGroupsGenerator,
+        private readonly PaymentMethodGroupsGeneratorInterface $paymentMethodGroupsGenerator,
         private readonly GatewayConfigNameGeneratorInterface $gatewayConfigNameGenerator,
     ) {
         parent::__construct($dataClass, $validationGroups);
@@ -80,7 +81,11 @@ final class PaymentMethodType extends AbstractResourceType
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'validation_groups' => $this->gatewayConfigGroupsGenerator,
+            'validation_groups' => function (FormInterface $form): array {
+                $data = $form->getData();
+
+                return $this->paymentMethodGroupsGenerator->__invoke($data);
+            },
         ]);
     }
 
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
index 6b67c63108..7e6bfe9b6c 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml
@@ -46,8 +46,16 @@
         <service id="sylius.form_registry.payment_gateway_config" class="Sylius\Bundle\ResourceBundle\Form\Registry\FormTypeRegistry" />
 
         <service id="sylius.validator.gateway_config_groups_generator" class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator">
+            <argument>%sylius.form.type.gateway_config.validation_groups%</argument>
             <argument>%sylius.gateway_config.validation_groups%</argument>
         </service>
+        <service id="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGeneratorInterface" alias="sylius.validator.gateway_config_groups_generator" />
+
+        <service id="sylius.validator.payment_method_groups_generator" class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGenerator">
+            <argument>%sylius.form.type.payment_method.validation_groups%</argument>
+            <argument type="service" id="sylius.validator.gateway_config_groups_generator" />
+        </service>
+        <service id="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGeneratorInterface" alias="sylius.validator.payment_method_groups_generator" />
 
         <service id="sylius.gateway_config_name_generator" class="Sylius\Bundle\PaymentBundle\Generator\GatewayConfigNameGenerator" />
         <service id="Sylius\Bundle\PaymentBundle\Generator\GatewayConfigNameGeneratorInterface" alias="sylius.gateway_config_name_generator" />
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
index 4491c0cef2..80802adcbf 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml
@@ -46,7 +46,7 @@
         <service id="sylius.form.type.payment_method" class="Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodType">
             <argument>%sylius.model.payment_method.class%</argument>
             <argument>%sylius.form.type.payment_method.validation_groups%</argument>
-            <argument type="service" id="sylius.validator.gateway_config_groups_generator" />
+            <argument type="service" id="sylius.validator.payment_method_groups_generator" />
             <argument type="service" id="sylius.gateway_config_name_generator" />
             <tag name="form.type" />
         </service>
diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
index 964b450fc8..3f5e2e158e 100644
--- a/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGenerator.php
@@ -13,35 +13,24 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
 
-use Sylius\Component\Payment\Model\PaymentMethodInterface;
-use Symfony\Component\Form\FormInterface;
-use Webmozart\Assert\Assert;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
 
-/** @internal */
-class GatewayConfigGroupsGenerator
+final class GatewayConfigGroupsGenerator implements GatewayConfigGroupsGeneratorInterface
 {
-    /** @param array<string, array<string, string>> $validationGroups */
-    public function __construct(private array $validationGroups)
+    /**
+     * @param array<string> $defaultValidationGroups
+     * @param array<string, array<string, string>> $validationGroups
+     */
+    public function __construct(private array $defaultValidationGroups, private array $validationGroups)
     {
     }
 
-    /**
-     * @param FormInterface|PaymentMethodInterface $object
-     *
-     * @return array<string>
-     */
-    public function __invoke($object): array
+    public function __invoke(GatewayConfigInterface $gatewayConfig): array
     {
-        if ($object instanceof FormInterface) {
-            $object = $object->getData();
+        if ($gatewayConfig->getFactoryName() === null) {
+            return $this->defaultValidationGroups;
         }
 
-        Assert::isInstanceOf($object, PaymentMethodInterface::class);
-
-        if ($object->getGatewayConfig()?->getFactoryName() === null) {
-            return ['sylius'];
-        }
-
-        return $this->validationGroups[$object->getGatewayConfig()->getFactoryName()] ?? ['sylius'];
+        return $this->validationGroups[$gatewayConfig->getFactoryName()] ?? $this->defaultValidationGroups;
     }
 }
diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorInterface.php b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorInterface.php
new file mode 100644
index 0000000000..726464926c
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
+
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
+
+interface GatewayConfigGroupsGeneratorInterface
+{
+    /** @return array<string> */
+    public function __invoke(GatewayConfigInterface $gatewayConfig): array;
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/PaymentMethodGroupsGenerator.php b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/PaymentMethodGroupsGenerator.php
new file mode 100644
index 0000000000..57324ba36c
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/PaymentMethodGroupsGenerator.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
+
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+
+/** @internal */
+final class PaymentMethodGroupsGenerator implements PaymentMethodGroupsGeneratorInterface
+{
+    /** @param array<string> $defaultValidationGroups */
+    public function __construct(
+        private array $defaultValidationGroups,
+        private GatewayConfigGroupsGeneratorInterface $gatewayConfigGroupsGenerator,
+    ) {
+    }
+
+    public function __invoke(PaymentMethodInterface $paymentMethod): array
+    {
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        if ($gatewayConfig === null) {
+            return $this->defaultValidationGroups;
+        }
+
+        return array_unique(array_merge(
+            $this->defaultValidationGroups,
+            $this->gatewayConfigGroupsGenerator->__invoke($gatewayConfig),
+        ));
+    }
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/PaymentMethodGroupsGeneratorInterface.php b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/PaymentMethodGroupsGeneratorInterface.php
new file mode 100644
index 0000000000..6aabfc43ee
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/Validator/GroupsGenerator/PaymentMethodGroupsGeneratorInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
+
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+
+interface PaymentMethodGroupsGeneratorInterface
+{
+    /** @return array<string> */
+    public function __invoke(PaymentMethodInterface $paymentMethod): array;
+}
diff --git a/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php b/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php
index a1b6b57f16..03752181ac 100644
--- a/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php
+++ b/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/GatewayConfigGroupsGeneratorSpec.php
@@ -15,54 +15,30 @@ namespace spec\Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
 
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Payment\Model\GatewayConfigInterface;
-use Sylius\Component\Payment\Model\PaymentMethodInterface;
-use Symfony\Component\Form\FormInterface;
 
 final class GatewayConfigGroupsGeneratorSpec extends ObjectBehavior
 {
     function let(): void
     {
-        $this->beConstructedWith([
+        $this->beConstructedWith(['sylius'], [
             'paypal_express_checkout' => ['paypal_express_checkout', 'sylius'],
             'stripe_checkout' => ['stripe_checkout', 'sylius'],
         ]);
     }
 
-    function it_throws_error_if_invalid_object_is_passed(): void
-    {
-        $this
-            ->shouldThrow(\InvalidArgumentException::class)
-            ->during('__invoke', [new \stdClass()])
-        ;
-    }
-
     function it_returns_gateway_config_validation_groups(
         GatewayConfigInterface $gatewayConfig,
-        PaymentMethodInterface $paymentMethod,
     ): void {
-        $paymentMethod->getGatewayConfig()->willReturn($gatewayConfig);
         $gatewayConfig->getFactoryName()->willReturn('paypal_express_checkout');
 
-        $this($paymentMethod)->shouldReturn(['paypal_express_checkout', 'sylius']);
+        $this($gatewayConfig)->shouldReturn(['paypal_express_checkout', 'sylius']);
     }
 
-    function it_returns_default_validation_groups_if_gateway_config_is_null(
-        PaymentMethodInterface $paymentMethod,
-    ): void {
-        $paymentMethod->getGatewayConfig()->willReturn(null);
-
-        $this($paymentMethod)->shouldReturn(['sylius']);
-    }
-
-    function it_returns_gateway_config_validation_groups_if_it_is_payment_method_form(
-        FormInterface $form,
+    function it_returns_default_validation_groups_if_factory_name_is_null(
         GatewayConfigInterface $gatewayConfig,
-        PaymentMethodInterface $paymentMethod,
     ): void {
-        $form->getData()->willReturn($paymentMethod);
-        $paymentMethod->getGatewayConfig()->willReturn($gatewayConfig);
-        $gatewayConfig->getFactoryName()->willReturn('paypal_express_checkout');
+        $gatewayConfig->getFactoryName()->willReturn(null);
 
-        $this($form)->shouldReturn(['paypal_express_checkout', 'sylius']);
+        $this($gatewayConfig)->shouldReturn(['sylius']);
     }
 }
diff --git a/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/PaymentMethodGroupsGeneratorSpec.php b/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/PaymentMethodGroupsGeneratorSpec.php
new file mode 100644
index 0000000000..cd1e62aa77
--- /dev/null
+++ b/src/Sylius/Bundle/PaymentBundle/spec/Validator/GroupsGenerator/PaymentMethodGroupsGeneratorSpec.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGeneratorInterface;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
+use Sylius\Component\Payment\Model\PaymentMethodInterface;
+
+final class PaymentMethodGroupsGeneratorSpec extends ObjectBehavior
+{
+    function let(GatewayConfigGroupsGeneratorInterface $gatewayConfigGroupsGenerator): void
+    {
+        $this->beConstructedWith(['sylius'], $gatewayConfigGroupsGenerator);
+    }
+
+    function it_returns_payment_method_validation_groups(
+        GatewayConfigGroupsGeneratorInterface $gatewayConfigGroupsGenerator,
+        GatewayConfigInterface $gatewayConfig,
+        PaymentMethodInterface $paymentMethod,
+    ): void {
+        $paymentMethod->getGatewayConfig()->willReturn($gatewayConfig);
+        $gatewayConfigGroupsGenerator->__invoke($gatewayConfig)->willReturn(['paypal_express_checkout', 'sylius']);
+
+        $this($paymentMethod)->shouldReturn(['sylius', 'paypal_express_checkout']);
+    }
+
+    function it_returns_default_validation_groups_if_gateway_config_is_null(
+        PaymentMethodInterface $paymentMethod,
+    ): void {
+        $paymentMethod->getGatewayConfig()->willReturn(null);
+
+        $this($paymentMethod)->shouldReturn(['sylius']);
+    }
+}

From 13536fcac7c50e794bbb41acd815aabd44e5de6d Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Fri, 6 Sep 2024 11:26:18 +0200
Subject: [PATCH 111/200] [Api] Move PaymentRequestUpdateDataProviderSpec.php
 to disabledSpec directory

---
 .../DataProvider/PaymentRequestUpdateDataProviderSpec.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/Sylius/Bundle/ApiBundle/{spec => disabledSpec}/DataProvider/PaymentRequestUpdateDataProviderSpec.php (98%)

diff --git a/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestUpdateDataProviderSpec.php b/src/Sylius/Bundle/ApiBundle/disabledSpec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
similarity index 98%
rename from src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
rename to src/Sylius/Bundle/ApiBundle/disabledSpec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
index 253827432f..3e72c54aa1 100644
--- a/src/Sylius/Bundle/ApiBundle/spec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
+++ b/src/Sylius/Bundle/ApiBundle/disabledSpec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Bundle\ApiBundle\DataProvider;
+namespace Sylius\Bundle\ApiBundle\disabledSpec\DataProvider;
 
 use PhpSpec\ObjectBehavior;
 use Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityCheckerInterface;

From 13e36fefb0d87b27ccf0fa1212aa7fe57d171930 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Fri, 6 Sep 2024 11:35:27 +0200
Subject: [PATCH 112/200] [Api] Remove unnecessary lines

---
 .../ShipmentIdAwareInputCommandDataTransformer.php             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
index a10b78a621..e1ae9af967 100644
--- a/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
+++ b/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
@@ -13,10 +13,9 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ApiBundle\DataTransformer;
 
-use Sylius\Bundle\ApiBundle\Command\ShipmentIdAwareInterface;
 use Sylius\Component\Core\Model\ShipmentInterface;
 
-final class ShipmentIdAwareInputCommandDataTransformer implements CommandDataTransformerInterface
+final class ShipmentIdAwareInputCommandDataTransformer
 {
     /**
      * @param array<string, mixed> $context

From 11066b51b6bc6b155b527b6c8321991b8a23fbf1 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Fri, 6 Sep 2024 11:44:49 +0200
Subject: [PATCH 113/200] [Api] Minor improvements

---
 .../PaymentRequestHashAwareInputCommandDataTransformer.php    | 2 +-
 .../ShipmentIdAwareInputCommandDataTransformer.php            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Sylius/Bundle/ApiBundle/{Resolver => DataTransformer}/PaymentRequestHashAwareInputCommandDataTransformer.php (91%)

diff --git a/src/Sylius/Bundle/ApiBundle/Resolver/PaymentRequestHashAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
similarity index 91%
rename from src/Sylius/Bundle/ApiBundle/Resolver/PaymentRequestHashAwareInputCommandDataTransformer.php
rename to src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
index fc85aec92a..6de0a27447 100644
--- a/src/Sylius/Bundle/ApiBundle/Resolver/PaymentRequestHashAwareInputCommandDataTransformer.php
+++ b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
@@ -17,7 +17,7 @@ use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 /** @experimental */
-final class PaymentRequestHashAwareInputCommandDataTransformer implements CommandDataTransformerInterface
+final class PaymentRequestHashAwareInputCommandDataTransformer // implements CommandDataTransformerInterface
 {
     /**
      * @param PaymentRequestHashAwareInterface $object
diff --git a/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
index e1ae9af967..784d93cf64 100644
--- a/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
+++ b/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\ApiBundle\DataTransformer;
 
 use Sylius\Component\Core\Model\ShipmentInterface;
 
-final class ShipmentIdAwareInputCommandDataTransformer
+final class ShipmentIdAwareInputCommandDataTransformer // implements CommandDataTransformerInterface
 {
     /**
      * @param array<string, mixed> $context
@@ -32,6 +32,6 @@ final class ShipmentIdAwareInputCommandDataTransformer
 
     public function supportsTransformation($object): bool
     {
-        return $object instanceof ShipmentIdAwareInterface;
+//        return $object instanceof ShipmentIdAwareInterface;
     }
 }

From c9fc8beab514bf8edb6896a7f4a213525bbe402f Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Mon, 9 Sep 2024 09:53:55 +0200
Subject: [PATCH 114/200] Minor improvement

---
 src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php b/src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php
index 78978917ec..9e779d9c04 100644
--- a/src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php
+++ b/src/Sylius/Bundle/PayumBundle/Model/GatewayConfigInterface.php
@@ -15,7 +15,7 @@ namespace Sylius\Bundle\PayumBundle\Model;
 
 use Payum\Core\Model\GatewayConfigInterface as PayumGatewayConfigInterface;
 use Payum\Core\Security\CryptedInterface;
-use Sylius\Payment\Model\GatewayConfigInterface as BaseGatewayConfigInterface;
+use Sylius\Component\Payment\Model\GatewayConfigInterface as BaseGatewayConfigInterface;
 
 interface GatewayConfigInterface extends BaseGatewayConfigInterface, PayumGatewayConfigInterface, CryptedInterface
 {

From 6bb11fd27813ded9a304048e4094350e95551937 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Mon, 9 Sep 2024 10:14:43 +0200
Subject: [PATCH 115/200] Minor improvement

---
 .../Payment/Repository/PaymentRequestRepositoryInterface.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
index f16fb865b7..2eaca0a92d 100644
--- a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 namespace Sylius\Component\Payment\Repository;
 
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
 /**
  * @template T of PaymentRequestInterface

From 99ec35cc9f1c9d2a8d37398e6646ffa65ee02142 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Tue, 10 Sep 2024 06:51:58 +0200
Subject: [PATCH 116/200] [Behat] Fix typo in scenarios tags

---
 .../paying_with_paypal_during_checkout.feature         | 10 +++++-----
 .../preventing_to_pay_for_cancelled_order.feature      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature b/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
index a72aef0c2a..656507c023 100644
--- a/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
+++ b/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
@@ -12,7 +12,7 @@ Feature: Paying with paypal during checkout
         And the store ships everywhere for Free
         And I am logged in as "john@example.com"
 
-    @toto-api @ui
+    @todo-api @ui
     Scenario: Successfully authorize payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -23,7 +23,7 @@ Feature: Paying with paypal during checkout
         And I should see the thank you page
         And the latest order should have a payment with state "completed"
 
-    @toto-api @ui
+    @todo-api @ui
     Scenario: Successful payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -32,7 +32,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been completed
         And I should see the thank you page
 
-    @toto-api @ui
+    @todo-api @ui
     Scenario: Cancelling the payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -41,7 +41,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been cancelled
         And I should be able to pay again
 
-    @toto-api @ui
+    @todo-api @ui
     Scenario: Retrying the payment with success
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -52,7 +52,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been completed
         And I should see the thank you page
 
-    @toto-api @ui
+    @todo-api @ui
     Scenario: Retrying the payment and failing
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
diff --git a/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature b/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
index 98bc9e3fbf..da4f858046 100644
--- a/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
+++ b/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
@@ -13,7 +13,7 @@ Feature: Preventing to pay for the cancelled order
         And the store allows paying Offline
         And there is a customer "sylius@example.com" that placed an order "#00000022"
 
-    @toto-api @ui
+    @todo-api @ui
     Scenario: Not being able to pay for cancelled order
         Given the customer bought 3 "Iron Maiden T-Shirt" products
         And the customer chose "Free" shipping method to "United States" with "Offline" payment

From 5bbf2e6980229722a7fb4ec3b9ca962e757cb94b Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Tue, 10 Sep 2024 13:58:16 +0200
Subject: [PATCH 117/200] [API] Implement payment method group generator

---
 .../Api/Admin/PaymentMethodsTest.php          | 151 ------------------
 .../adding_payment_method.feature             |  12 +-
 .../editing_payment_method.feature            |  10 +-
 ...th_paypal_express_checkout_gateway.feature |   2 +-
 ...ethod_with_stripe_checkout_gateway.feature |   2 +-
 ...ment_method_unique_code_validation.feature |   2 +-
 .../payment_method_validation.feature         |  24 +--
 ...venting_to_pay_for_cancelled_order.feature |   2 +-
 .../api_platform/resources/PaymentMethod.xml  |   4 +-
 .../Resources/config/services/validator.xml   |  10 +-
 tests/Api/Admin/PaymentMethodsTest.php        | 127 +++++++++++++++
 11 files changed, 161 insertions(+), 185 deletions(-)
 delete mode 100644 disabledTests/Api/Admin/PaymentMethodsTest.php

diff --git a/disabledTests/Api/Admin/PaymentMethodsTest.php b/disabledTests/Api/Admin/PaymentMethodsTest.php
deleted file mode 100644
index f089ce4c3e..0000000000
--- a/disabledTests/Api/Admin/PaymentMethodsTest.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Tests\Api\Admin;
-
-use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Tests\Api\JsonApiTestCase;
-use Sylius\Tests\Api\Utils\AdminUserLoginTrait;
-use Symfony\Component\HttpFoundation\Response;
-
-final class PaymentMethodsTest extends JsonApiTestCase
-{
-    use AdminUserLoginTrait;
-
-    /** @test */
-    public function it_creates_a_payment_method(): void
-    {
-        $this->loadFixturesFromFiles([
-            'authentication/api_administrator.yaml',
-            'channel/channel.yaml',
-        ]);
-
-        $header = array_merge($this->logInAdminUser('api@example.com'), self::CONTENT_TYPE_HEADER);
-
-        $this->client->request('POST', '/api/v2/admin/payment-methods', [], [], $header, json_encode([
-            'code' => 'test',
-            'name' => 'Test',
-            'description' => 'Test',
-            'translations' => [
-                'en_US' => [
-                    'name' => 'Test',
-                    'description' => 'Test',
-                    'instructions' => 'Testing instructions',
-                ],
-            ],
-            'gatewayConfig' => [
-                'factoryName' => 'paypal_express_checkout',
-                'gatewayName' => 'paypal_express_checkout',
-                'config' => [
-                    'username' => 'test',
-                    'password' => 'test',
-                    'signature' => 'test',
-                    'sandbox' => true,
-                ],
-            ],
-            'enabled' => true,
-        ]));
-
-        $this->assertResponse(
-            $this->client->getResponse(),
-            'admin/payment_method/create_payment_method_response',
-            Response::HTTP_CREATED,
-        );
-    }
-
-    /** @test */
-    public function it_updates_a_payment_method(): void
-    {
-        $fixtures = $this->loadFixturesFromFiles([
-            'authentication/api_administrator.yaml',
-            'channel/channel.yaml',
-            'payment_method.yaml',
-        ]);
-
-        $header = array_merge($this->logInAdminUser('api@example.com'), self::CONTENT_TYPE_HEADER);
-
-        /** @var PaymentMethodInterface $paymentMethod */
-        $paymentMethod = $fixtures['paypal_payment_method'];
-
-        $this->client->request(
-            method: 'PUT',
-            uri: sprintf('/api/v2/admin/payment-methods/%s', $paymentMethod->getCode()),
-            server: $header,
-            content: json_encode([
-                'translations' => [
-                    'en_US' => [
-                        '@id' => sprintf('/api/v2/admin/payment-methods/%s/translations/en_US', $paymentMethod->getCode()),
-                        'name' => 'Different name',
-                        'description' => 'Different description',
-                        'instructions' => 'Different instructions',
-                    ],
-                ],
-                'position' => 1,
-                'enabled' => false,
-                'channels' => [
-                    sprintf('/api/v2/admin/channels/%s', $fixtures['channel_mobile']->getCode()),
-                ],
-                'gatewayConfig' => [
-                    '@id' => sprintf('/api/v2/admin/gateway-configs/%s', $paymentMethod->getGatewayConfig()->getId()),
-                    'config' => [
-                        'username' => 'differentTest',
-                        'password' => 'differentTest',
-                        'signature' => 'differentTest',
-                        'sandbox' => false,
-                    ],
-                ],
-            ]),
-        );
-
-        $this->assertResponse(
-            $this->client->getResponse(),
-            'admin/payment_method/update_payment_method_response',
-            Response::HTTP_OK,
-        );
-    }
-
-    /** @test */
-    public function it_does_not_update_a_payment_method_with_duplicate_locale_translation(): void
-    {
-        $fixtures = $this->loadFixturesFromFiles([
-            'authentication/api_administrator.yaml',
-            'channel/channel.yaml',
-            'payment_method.yaml',
-        ]);
-
-        $header = array_merge($this->logInAdminUser('api@example.com'), self::CONTENT_TYPE_HEADER);
-
-        /** @var PaymentMethodInterface $paymentMethod */
-        $paymentMethod = $fixtures['paypal_payment_method'];
-
-        $this->client->request(
-            method: 'PUT',
-            uri: sprintf('/api/v2/admin/payment-methods/%s', $paymentMethod->getCode()),
-            server: $header,
-            content: json_encode([
-                'translations' => [
-                    'en_US' => [
-                        'name' => 'Different name',
-                        'description' => 'Different description',
-                    ],
-                ],
-            ], \JSON_THROW_ON_ERROR),
-        );
-
-        $this->assertResponse(
-            $this->client->getResponse(),
-            'admin/payment_method/put_payment_method_with_duplicate_locale_translation',
-            Response::HTTP_UNPROCESSABLE_ENTITY,
-        );
-    }
-}
diff --git a/features/admin/payment/managing_payment_methods/adding_payment_method.feature b/features/admin/payment/managing_payment_methods/adding_payment_method.feature
index 4fa76f963c..5193771df3 100644
--- a/features/admin/payment/managing_payment_methods/adding_payment_method.feature
+++ b/features/admin/payment/managing_payment_methods/adding_payment_method.feature
@@ -8,7 +8,7 @@ Feature: Adding a new payment method
         Given the store operates on a single channel in "United States"
         And I am logged in as an administrator
 
-    @todo-api @ui
+    @api @ui
     Scenario: Adding a new payment method
         When I want to create a new offline payment method
         And I name it "Offline" in "English (United States)"
@@ -17,7 +17,7 @@ Feature: Adding a new payment method
         Then I should be notified that it has been successfully created
         And the payment method "Offline" should appear in the registry
 
-    @todo-api @ui
+    @api @ui
     Scenario: Adding a new payment method with description
         When I want to create a new offline payment method
         And I name it "Offline" in "English (United States)"
@@ -27,7 +27,7 @@ Feature: Adding a new payment method
         Then I should be notified that it has been successfully created
         And the payment method "Offline" should appear in the registry
 
-    @todo-api @ui
+    @api @ui
     Scenario: Adding a new payment method with instructions
         When I want to create a new offline payment method
         And I name it "Offline" in "English (United States)"
@@ -38,7 +38,7 @@ Feature: Adding a new payment method
         And the payment method "Offline" should appear in the registry
         And the payment method "Offline" should have instructions "Bank account: 0000 1111 2222 3333" in "English (United States)"
 
-    @todo-api @ui
+    @api @ui
     Scenario: Adding a new payment method for channel
         When I want to create a new offline payment method
         And I name it "Offline" in "English (United States)"
@@ -49,7 +49,7 @@ Feature: Adding a new payment method
         And the payment method "Offline" should appear in the registry
         And the payment method "Offline" should be available in channel "United States"
 
-    @todo-api @ui
+    @api @ui
     Scenario: Adding a new paypal payment method
         When I want to create a new payment method with "Paypal Express Checkout" gateway factory
         And I name it "Paypal Express Checkout" in "English (United States)"
@@ -59,7 +59,7 @@ Feature: Adding a new payment method
         Then I should be notified that it has been successfully created
         And the payment method "Paypal Express Checkout" should appear in the registry
 
-    @todo-api @ui
+    @api @ui
     Scenario: Adding a new stripe payment method
         When I want to create a new payment method with "Stripe Checkout" gateway factory
         And I name it "Stripe Checkout" in "English (United States)"
diff --git a/features/admin/payment/managing_payment_methods/editing_payment_method.feature b/features/admin/payment/managing_payment_methods/editing_payment_method.feature
index f766d9307c..ecbb14057e 100644
--- a/features/admin/payment/managing_payment_methods/editing_payment_method.feature
+++ b/features/admin/payment/managing_payment_methods/editing_payment_method.feature
@@ -9,7 +9,7 @@ Feature: Editing payment methods
         And the store has a payment method "Offline" with a code "Offline"
         And I am logged in as an administrator
 
-    @todo-api @ui
+    @api @ui
     Scenario: Renaming the payment method
         When I want to modify the "Offline" payment method
         And I rename it to "Cash on delivery" in "English (United States)"
@@ -17,7 +17,7 @@ Feature: Editing payment methods
         Then I should be notified that it has been successfully edited
         And this payment method "Name" should be "Cash on delivery"
 
-    @todo-api @ui
+    @api @ui
     Scenario: Disabling payment method
         When I want to modify the "Offline" payment method
         And I disable it
@@ -25,7 +25,7 @@ Feature: Editing payment methods
         Then I should be notified that it has been successfully edited
         And this payment method should be disabled
 
-    @todo-api @ui
+    @api @ui
     Scenario: Enabling payment method
         Given the payment method "Offline" is disabled
         When I want to modify the "Offline" payment method
@@ -34,12 +34,12 @@ Feature: Editing payment methods
         Then I should be notified that it has been successfully edited
         And this payment method should be enabled
 
-    @todo-api @ui
+    @api @ui
     Scenario: Being unable to edit code of an existing payment method
         When I want to modify the "Offline" payment method
         Then I should not be able to edit its code
 
-    @todo-api @ui
+    @api @ui
     Scenario: Being unable to edit gateway factory field of existing payment method
         When I want to modify the "Offline" payment method
         Then the factory name field should be disabled
diff --git a/features/admin/payment/managing_payment_methods/editing_payment_method_with_paypal_express_checkout_gateway.feature b/features/admin/payment/managing_payment_methods/editing_payment_method_with_paypal_express_checkout_gateway.feature
index 785aea9e78..2e46454afe 100644
--- a/features/admin/payment/managing_payment_methods/editing_payment_method_with_paypal_express_checkout_gateway.feature
+++ b/features/admin/payment/managing_payment_methods/editing_payment_method_with_paypal_express_checkout_gateway.feature
@@ -41,7 +41,7 @@ Feature: Editing payment method configured with a PayPal Express Checkout gatewa
         Then I should be notified that it has been successfully edited
         And this payment method should be in sandbox mode
 
-    @todo-api @ui
+    @api @ui
     Scenario: Changing whole gateway configuration
         When I want to modify the "PayPal Express Checkout" payment method
         And I set its "Username" as "new_username", "Password" as "new_password" and "Signature" as "new_signature"
diff --git a/features/admin/payment/managing_payment_methods/editing_payment_method_with_stripe_checkout_gateway.feature b/features/admin/payment/managing_payment_methods/editing_payment_method_with_stripe_checkout_gateway.feature
index 8b07296b13..fa763169cc 100644
--- a/features/admin/payment/managing_payment_methods/editing_payment_method_with_stripe_checkout_gateway.feature
+++ b/features/admin/payment/managing_payment_methods/editing_payment_method_with_stripe_checkout_gateway.feature
@@ -25,7 +25,7 @@ Feature: Editing payment method configured with a Stripe Checkout gateway
         Then I should be notified that it has been successfully edited
         And this payment method "Secret key" should be "some_secret_key"
 
-    @todo-api @ui
+    @api @ui
     Scenario: Changing whole gateway configuration
         When I want to modify the "Stripe Checkout" payment method
         And I set its "Publishable key" as "new_publishable_key" and "Secret key" as "new_secret_key"
diff --git a/features/admin/payment/managing_payment_methods/payment_method_unique_code_validation.feature b/features/admin/payment/managing_payment_methods/payment_method_unique_code_validation.feature
index 2513366d84..0cd0722fce 100644
--- a/features/admin/payment/managing_payment_methods/payment_method_unique_code_validation.feature
+++ b/features/admin/payment/managing_payment_methods/payment_method_unique_code_validation.feature
@@ -9,7 +9,7 @@ Feature: Payment method unique code validation
         And the store has a payment method "Offline" with a code "Offline"
         And I am logged in as an administrator
 
-    @todo-api @ui
+    @api @ui
     Scenario: Trying to add payment method with taken code
         When I want to create a new offline payment method
         And I name it "Paypal Express Checkout" in "English (United States)"
diff --git a/features/admin/payment/managing_payment_methods/payment_method_validation.feature b/features/admin/payment/managing_payment_methods/payment_method_validation.feature
index dee9e6c968..020f98b7ce 100644
--- a/features/admin/payment/managing_payment_methods/payment_method_validation.feature
+++ b/features/admin/payment/managing_payment_methods/payment_method_validation.feature
@@ -18,14 +18,14 @@ Feature: Payment method validation
         Then I should be notified that code is required
         And the payment method with name "Paypal Express Checkout" should not be added
 
-    @todo-api @no-ui
+    @api @no-ui
     Scenario: Trying to add a new payment method translation in unexisting language
         When I want to modify the "Offline" payment method
         And I name it "Offline" in "French (France)"
         And I try to save my changes
         Then I should be notified that the locale is not available
 
-    @todo-api @ui
+    @api @ui
     Scenario: Trying to add a new payment method with a too long code
         When I want to create a new payment method with "Paypal Express Checkout" gateway factory
         And I name it "Paypal Express Checkout" in "English (United States)"
@@ -33,7 +33,7 @@ Feature: Payment method validation
         And I add it
         Then I should be notified that code is too long
 
-    @todo-api @ui
+    @api @ui
     Scenario: Trying to add a new payment method without specifying its name
         When I want to create a new payment method with "Paypal Express Checkout" gateway factory
         And I specify its code as "PEC"
@@ -42,7 +42,7 @@ Feature: Payment method validation
         Then I should be notified that I have to specify payment method name
         And the payment method with code "PEC" should not be added
 
-    @todo-api @ui
+    @api @ui
     Scenario: Trying to add a new paypal payment method without specifying password
         When I want to create a new payment method with "Paypal Express Checkout" gateway factory
         And I name it "Paypal Express Checkout" in "English (United States)"
@@ -53,7 +53,7 @@ Feature: Payment method validation
         Then I should be notified that I have to specify paypal password
         And the payment method with code "PEC" should not be added
 
-    @todo-api @no-ui
+    @api @no-ui
     Scenario: Trying to add a new paypal payment method without specifying sandbox
         When I want to create a new payment method with "Paypal Express Checkout" gateway factory
         And I name it "Paypal Express Checkout" in "English (United States)"
@@ -63,7 +63,7 @@ Feature: Payment method validation
         Then I should be notified that I have to specify paypal sandbox status
         And the payment method with code "PEC" should not be added
 
-    @todo-api @no-ui
+    @api @no-ui
     Scenario: Trying to add a new paypal payment method, but with sandbox that has wrong type
         When I want to create a new payment method with "Paypal Express Checkout" gateway factory
         And I name it "Paypal Express Checkout" in "English (United States)"
@@ -73,7 +73,7 @@ Feature: Payment method validation
         Then I should be notified that I have to specify paypal sandbox status that is boolean
         And the payment method with code "PEC" should not be added
 
-    @todo-api @ui
+    @api @ui
     Scenario: Trying to add a new stripe payment method with only publishable key specified
         When I want to create a new payment method with "Stripe Checkout" gateway factory
         And I name it "Stripe Checkout" in "English (United States)"
@@ -83,7 +83,7 @@ Feature: Payment method validation
         Then I should be notified that I have to specify stripe "Secret key"
         And the payment method with code "PEC" should not be added
 
-    @todo-api @ui
+    @api @ui
     Scenario: Trying to add a new stripe payment method with only secret key specified
         When I want to create a new payment method with "Stripe Checkout" gateway factory
         And I name it "Stripe Checkout" in "English (United States)"
@@ -93,7 +93,7 @@ Feature: Payment method validation
         Then I should be notified that I have to specify stripe "Publishable key"
         And the payment method with code "PEC" should not be added
 
-    @todo-api @no-ui
+    @api @no-ui
     Scenario: Trying to add a new payment method without gateway configuration
         When I want to create a new payment method without gateway configuration
         And I name it "Payment method without gateway configuration" in "English (United States)"
@@ -101,7 +101,7 @@ Feature: Payment method validation
         And I try to add it
         Then I should be notified that I have to specify gateway configuration
 
-    @todo-api @no-ui
+    @api @no-ui
     Scenario: Trying to add a new payment method without gateway name
         When I want to create a new payment method without gateway name
         And I name it "Payment method without gateway name" in "English (United States)"
@@ -109,7 +109,7 @@ Feature: Payment method validation
         And I try to add it
         Then I should be notified that I have to specify gateway name
 
-    @todo-api @no-ui
+    @api @no-ui
     Scenario: Trying to add a new payment method without factory name
         When I want to create a new payment method without factory name
         And I name it "Payment method without gateway factory name" in "English (United States)"
@@ -117,7 +117,7 @@ Feature: Payment method validation
         And I try to add it
         Then I should be notified that I have to specify factory name
 
-    @todo-api @no-ui
+    @api @no-ui
     Scenario: Trying to add a new payment method with wrong factory name
         When I want to create a new payment method with wrong factory name
         And I name it "Payment method with wrong gateway factory name" in "English (United States)"
diff --git a/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature b/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
index da4f858046..a111a54377 100644
--- a/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
+++ b/features/shop/checkout/paying_for_order/preventing_to_pay_for_cancelled_order.feature
@@ -13,7 +13,7 @@ Feature: Preventing to pay for the cancelled order
         And the store allows paying Offline
         And there is a customer "sylius@example.com" that placed an order "#00000022"
 
-    @todo-api @ui
+    @api @ui
     Scenario: Not being able to pay for cancelled order
         Given the customer bought 3 "Iron Maiden T-Shirt" products
         And the customer chose "Free" shipping method to "United States" with "Offline" payment
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/PaymentMethod.xml
index 859d8f049b..4ded76e5bc 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/PaymentMethod.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/PaymentMethod.xml
@@ -48,7 +48,7 @@
             <operation class="ApiPlatform\Metadata\Post" uriTemplate="/admin/payment-methods">
                 <validationContext>
                     <values>
-                        <value name="groups">sylius_api.payment_method_configuration_groups_generator</value>
+                        <value name="groups">sylius_api.validator.payment_method_groups_generator</value>
                     </values>
                 </validationContext>
 
@@ -88,7 +88,7 @@
             <operation class="ApiPlatform\Metadata\Put" uriTemplate="/admin/payment-methods/{code}">
                 <validationContext>
                     <values>
-                        <value name="groups">sylius_api.payment_method_configuration_groups_generator</value>
+                        <value name="groups">sylius_api.validator.payment_method_groups_generator</value>
                     </values>
                 </validationContext>
 
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
index 961926d6cc..56800c506a 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
@@ -249,12 +249,12 @@
         </service>
 
         <service
-            id="sylius_api.payment_method_configuration_groups_generator"
-            class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator"
-            decorates="sylius.validator.gateway_config_groups_generator"
+            id="sylius_api.validator.payment_method_groups_generator"
+            class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGenerator"
+            decorates="sylius.validator.payment_method_groups_generator"
         >
-            <argument>%sylius.form.type.gateway_config.validation_groups%</argument>
-            <argument>%sylius.gateway_config.validation_groups%</argument>
+            <argument>%sylius.form.type.payment_method.validation_groups%</argument>
+            <argument type="service" id="sylius.validator.gateway_config_groups_generator" />
             <tag name="api_platform.validation_groups_generator" />
         </service>
 
diff --git a/tests/Api/Admin/PaymentMethodsTest.php b/tests/Api/Admin/PaymentMethodsTest.php
index cd9403bf7d..30b1534f12 100644
--- a/tests/Api/Admin/PaymentMethodsTest.php
+++ b/tests/Api/Admin/PaymentMethodsTest.php
@@ -67,6 +67,47 @@ final class PaymentMethodsTest extends JsonApiTestCase
         );
     }
 
+    /** @test */
+    public function it_creates_a_payment_method(): void
+    {
+        $this->loadFixturesFromFiles([
+            'authentication/api_administrator.yaml',
+            'channel/channel.yaml',
+        ]);
+
+        $header = array_merge($this->logInAdminUser('api@example.com'), self::CONTENT_TYPE_HEADER);
+
+        $this->client->request('POST', '/api/v2/admin/payment-methods', [], [], $header, json_encode([
+            'code' => 'test',
+            'name' => 'Test',
+            'description' => 'Test',
+            'translations' => [
+                'en_US' => [
+                    'name' => 'Test',
+                    'description' => 'Test',
+                    'instructions' => 'Testing instructions',
+                ],
+            ],
+            'gatewayConfig' => [
+                'factoryName' => 'paypal_express_checkout',
+                'gatewayName' => 'paypal_express_checkout',
+                'config' => [
+                    'username' => 'test',
+                    'password' => 'test',
+                    'signature' => 'test',
+                    'sandbox' => true,
+                ],
+            ],
+            'enabled' => true,
+        ]));
+
+        $this->assertResponse(
+            $this->client->getResponse(),
+            'admin/payment_method/create_payment_method_response',
+            Response::HTTP_CREATED,
+        );
+    }
+
     /** @test */
     public function it_removes_a_payment_method(): void
     {
@@ -85,4 +126,90 @@ final class PaymentMethodsTest extends JsonApiTestCase
 
         $this->assertResponseCode($this->client->getResponse(), Response::HTTP_NO_CONTENT);
     }
+
+    /** @test */
+    public function it_updates_a_payment_method(): void
+    {
+        $fixtures = $this->loadFixturesFromFiles([
+            'authentication/api_administrator.yaml',
+            'channel/channel.yaml',
+            'payment_method.yaml',
+        ]);
+
+        $header = array_merge($this->logInAdminUser('api@example.com'), self::CONTENT_TYPE_HEADER);
+
+        /** @var PaymentMethodInterface $paymentMethod */
+        $paymentMethod = $fixtures['paypal_payment_method'];
+
+        $this->client->request(
+            method: 'PUT',
+            uri: sprintf('/api/v2/admin/payment-methods/%s', $paymentMethod->getCode()),
+            server: $header,
+            content: json_encode([
+                'translations' => [
+                    'en_US' => [
+                        '@id' => sprintf('/api/v2/admin/payment-methods/%s/translations/en_US', $paymentMethod->getCode()),
+                        'name' => 'Different name',
+                        'description' => 'Different description',
+                        'instructions' => 'Different instructions',
+                    ],
+                ],
+                'position' => 1,
+                'enabled' => false,
+                'channels' => [
+                    sprintf('/api/v2/admin/channels/%s', $fixtures['channel_mobile']->getCode()),
+                ],
+                'gatewayConfig' => [
+                    '@id' => sprintf('/api/v2/admin/gateway-configs/%s', $paymentMethod->getGatewayConfig()->getId()),
+                    'config' => [
+                        'username' => 'differentTest',
+                        'password' => 'differentTest',
+                        'signature' => 'differentTest',
+                        'sandbox' => false,
+                    ],
+                ],
+            ]),
+        );
+
+        $this->assertResponse(
+            $this->client->getResponse(),
+            'admin/payment_method/update_payment_method_response',
+            Response::HTTP_OK,
+        );
+    }
+
+    /** @test */
+    public function it_does_not_update_a_payment_method_with_duplicate_locale_translation(): void
+    {
+        $fixtures = $this->loadFixturesFromFiles([
+            'authentication/api_administrator.yaml',
+            'channel/channel.yaml',
+            'payment_method.yaml',
+        ]);
+
+        $header = array_merge($this->logInAdminUser('api@example.com'), self::CONTENT_TYPE_HEADER);
+
+        /** @var PaymentMethodInterface $paymentMethod */
+        $paymentMethod = $fixtures['paypal_payment_method'];
+
+        $this->client->request(
+            method: 'PUT',
+            uri: sprintf('/api/v2/admin/payment-methods/%s', $paymentMethod->getCode()),
+            server: $header,
+            content: json_encode([
+                'translations' => [
+                    'en_US' => [
+                        'name' => 'Different name',
+                        'description' => 'Different description',
+                    ],
+                ],
+            ], \JSON_THROW_ON_ERROR),
+        );
+
+        $this->assertResponse(
+            $this->client->getResponse(),
+            'admin/payment_method/put_payment_method_with_duplicate_locale_translation',
+            Response::HTTP_UNPROCESSABLE_ENTITY,
+        );
+    }
 }

From d63818c21e33af7a45b05523f1865061af75695d Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Thu, 12 Sep 2024 14:57:32 +0200
Subject: [PATCH 118/200] Upgrade PaymentRequests to APIP3

---
 .../properties/PaymentRequest.xml             |  19 +++
 .../api_platform/resources/PaymentRequest.xml | 109 +++++++++++++
 .../config/legacy_api_resources/Payment.xml   | 109 -------------
 .../legacy_api_resources/PaymentMethod.xml    | 148 ------------------
 .../config/serialization/PaymentRequest.xml   |  10 ++
 .../config/services/context_builders.xml      |  12 ++
 .../config/services/shop/state_providers.xml  |   7 +
 7 files changed, 157 insertions(+), 257 deletions(-)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/properties/PaymentRequest.xml
 create mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/PaymentRequest.xml
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/Payment.xml
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/PaymentMethod.xml

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/properties/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/properties/PaymentRequest.xml
new file mode 100644
index 0000000000..37dc151843
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/properties/PaymentRequest.xml
@@ -0,0 +1,19 @@
+<?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.
+
+-->
+
+<properties xmlns="https://api-platform.com/schema/metadata/properties-3.0"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="https://api-platform.com/schema/metadata/properties-3.0 https://api-platform.com/schema/metadata/properties-3.0.xsd"
+>
+    <property resource="Sylius\Component\Payment\Model\PaymentRequest" name="hash" identifier="true" />
+</properties>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/PaymentRequest.xml
new file mode 100644
index 0000000000..57f050ff88
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/PaymentRequest.xml
@@ -0,0 +1,109 @@
+<?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.
+
+-->
+
+<resources
+    xmlns="https://api-platform.com/schema/metadata/resources-3.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://api-platform.com/schema/metadata/resources-3.0 https://api-platform.com/schema/metadata/resources-3.0.xsd"
+>
+    <resource class="Sylius\Component\Payment\Model\PaymentRequest">
+        <operations>
+            <!-- Admin operations-->
+
+            <operation class="ApiPlatform\Metadata\Get" uriTemplate="/admin/payment-requests/{hash}">
+                <normalizationContext>
+                    <values>
+                        <value>sylius:admin:payment_request:show</value>
+                    </values>
+                </normalizationContext>
+            </operation>
+
+            <!-- Shop operations-->
+
+            <operation class="ApiPlatform\Metadata\Get" uriTemplate="/shop/payment-requests/{hash}">
+                <normalizationContext>
+                    <values>
+                        <value>sylius:shop:payment_request:show</value>
+                    </values>
+                </normalizationContext>
+            </operation>
+
+            <operation
+                class="ApiPlatform\Metadata\Post"
+                uriTemplate="/shop/payment-requests"
+                itemUriTemplate="/shop/payment-requests/{hash}"
+                messenger="input"
+                input="Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest"
+            >
+                <normalizationContext>
+                    <values>
+                        <value>sylius:shop:payment_request:show</value>
+                    </values>
+                </normalizationContext>
+                <denormalizationContext>
+                    <values>
+                        <value>sylius:shop:payment_request:create</value>
+                    </values>
+                </denormalizationContext>
+                <validationContext>
+                    <values>
+                        <value>sylius</value>
+                    </values>
+                </validationContext>
+            </operation>
+
+            <operation
+                class="ApiPlatform\Metadata\Put"
+                uriTemplate="/shop/payment-requests/{hash}"
+                messenger="input"
+                input="Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest"
+                provider="sylius_api.state_provider.shop.payment.payment_request.item"
+            >
+                <normalizationContext>
+                    <values>
+                        <value>sylius:shop:payment_request:show</value>
+                    </values>
+                </normalizationContext>
+                <denormalizationContext>
+                    <values>
+                        <value>sylius:shop:payment_request:update</value>
+                    </values>
+                </denormalizationContext>
+                <validationContext>
+                    <values>
+                        <value>sylius</value>
+                    </values>
+                </validationContext>
+            </operation>
+        </operations>
+    </resource>
+
+    <resource class="Sylius\Component\Payment\Model\PaymentRequest" uriTemplate="/admin/payments/{paymentId}/payment-requests">
+        <uriVariables>
+            <uriVariable parameterName="paymentId" fromClass="Sylius\Component\Core\Model\Payment" fromProperty="id" toClass="Sylius\Component\Payment\Model\PaymentRequest" toProperty="payment"/>
+        </uriVariables>
+        <operations>
+            <operation class="ApiPlatform\Metadata\GetCollection">
+                <normalizationContext>
+                    <values>
+                        <value name="groups">
+                            <values>
+                                <value>sylius:admin:payment_request:index</value>
+                            </values>
+                        </value>
+                    </values>
+                </normalizationContext>
+            </operation>
+        </operations>
+    </resource>
+</resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/Payment.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/Payment.xml
deleted file mode 100644
index 755d3aae09..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/Payment.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
-
- 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.
-
--->
-
-<resources xmlns="https://api-platform.com/schema/metadata"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
->
-    <resource class="%sylius.model.payment.class%" shortName="Payment">
-        <attribute name="validation_groups">sylius</attribute>
-
-        <attribute name="order">
-            <attribute name="createdAt">DESC</attribute>
-        </attribute>
-
-        <collectionOperations>
-            <collectionOperation name="admin_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/payments</attribute>
-                <attribute name="filters">
-                    <attribute>sylius.api.search_payment_filter</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment:index</attribute>
-                        <attribute>sylius:admin:payment:index</attribute>
-                    </attribute>
-                </attribute>
-            </collectionOperation>
-        </collectionOperations>
-
-        <itemOperations>
-            <itemOperation name="admin_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/payments/{id}</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment:show</attribute>
-                        <attribute>sylius:admin:payment:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/payments/{id}</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:payment:show</attribute>
-                        <attribute>sylius:shop:payment:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="admin_complete">
-                <attribute name="method">PATCH</attribute>
-                <attribute name="input">false</attribute>
-                <attribute name="path">/admin/payments/{id}/complete</attribute>
-                <attribute name="controller">Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicatorInterface::complete</attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Completes Payment.</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:payment:show</attribute>
-                        <attribute>sylius:shop:payment:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-        </itemOperations>
-
-        <subresourceOperations>
-            <subresourceOperation name="payment_requests_get_subresource">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/payments/{id}/payment-requests</attribute>
-            </subresourceOperation>
-
-            <subresourceOperation name="api_orders_payments_get_subresource">
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment:show</attribute>
-                        <attribute>sylius:admin:payment:show</attribute>
-                    </attribute>
-                </attribute>
-            </subresourceOperation>
-        </subresourceOperations>
-
-        <property name="id" identifier="true" writable="false" />
-        <property name="createdAt" writable="false" />
-        <property name="updatedAt" writable="false" />
-        <property name="currencyCode" writable="false" />
-        <property name="amount" writable="false" />
-        <property name="state" writable="false" />
-        <property name="details" writable="false" />
-        <property name="order" writable="false" />
-        <property name="paymentRequests" readable="true" writable="false">
-            <subresource resourceClass="%sylius.model.payment_request.class%" />
-        </property>
-    </resource>
-</resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/PaymentMethod.xml
deleted file mode 100644
index 7fa7722e3d..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/PaymentMethod.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
-
- 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.
-
--->
-
-<resources xmlns="https://api-platform.com/schema/metadata"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
->
-    <resource class="%sylius.model.payment_method.class%" shortName="PaymentMethod">
-        <attribute name="validation_groups">sylius.validator.payment_method_groups_generator</attribute>
-
-        <attribute name="order">
-            <attribute name="position">ASC</attribute>
-        </attribute>
-
-        <collectionOperations>
-            <collectionOperation name="shop_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/payment-methods</attribute>
-                <attribute name="pagination_enabled">false</attribute>
-                <attribute name="filters">
-                    <attribute>Sylius\Bundle\ApiBundle\Filter\PaymentMethodFilter</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:payment_method:index</attribute>
-                        <attribute>sylius:shop:payment_method:index</attribute>
-                    </attribute>
-                </attribute>
-            </collectionOperation>
-
-            <collectionOperation name="admin_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/payment-methods</attribute>
-                <attribute name="filters">
-                    <attribute>sylius.api.payment_method_order_filter</attribute>
-                    <attribute>Sylius\Bundle\ApiBundle\Filter\Doctrine\TranslationOrderNameAndLocaleFilter</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment_method:index</attribute>
-                        <attribute>sylius:admin:payment_method:index</attribute>
-                    </attribute>
-                </attribute>
-            </collectionOperation>
-
-            <collectionOperation name="admin_post">
-                <attribute name="method">POST</attribute>
-                <attribute name="path">/admin/payment-methods</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment_method:create</attribute>
-                        <attribute>sylius:admin:payment_method:create</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment_method:show</attribute>
-                        <attribute>sylius:admin:payment_method:show</attribute>
-                    </attribute>
-                </attribute>
-            </collectionOperation>
-        </collectionOperations>
-
-        <itemOperations>
-            <itemOperation name="admin_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/payment-methods/{code}</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment_method:show</attribute>
-                        <attribute>sylius:admin:payment_method:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="admin_put">
-                <attribute name="method">PUT</attribute>
-                <attribute name="path">/admin/payment-methods/{code}</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment_method:update</attribute>
-                        <attribute>sylius:admin:payment_method:update</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:payment_method:show</attribute>
-                        <attribute>sylius:admin:payment_method:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="admin_delete">
-                <attribute name="method">DELETE</attribute>
-                <attribute name="path">/admin/payment-methods/{code}</attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/payment-methods/{code}</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:payment_method:show</attribute>
-                        <attribute>sylius:shop:payment_method:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-        </itemOperations>
-
-        <subresourceOperations>
-            <subresourceOperation name="gateway_config_get_subresource">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/payment-methods/{code}/gateway-config</attribute>
-            </subresourceOperation>
-        </subresourceOperations>
-
-        <property name="id" identifier="false" writable="false" />
-        <property name="code" identifier="true" required="true" />
-        <property name="name" writable="true" />
-        <property name="channels" writable="true" />
-        <property name="enabled" writable="true" />
-        <property name="gatewayConfig" readable="true" writable="true">
-            <subresource resourceClass="%sylius.model.gateway_config.class%" collection="false" />
-        </property>
-        <property name="translations" readable="true" writable="true">
-            <attribute name="openapi_context">
-                <attribute name="type">object</attribute>
-                <attribute name="example">
-                    <attribute name="en_US">
-                        <attribute name="name">string</attribute>
-                        <attribute name="description">string</attribute>
-                        <attribute name="instructions">string</attribute>
-                    </attribute>
-                </attribute>
-            </attribute>
-        </property>
-    </resource>
-</resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
index 8ba5f06b92..ccf25c293b 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentRequest.xml
@@ -16,43 +16,53 @@
             xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
 >
     <class name="Sylius\Component\Payment\Model\PaymentRequest">
+        <attribute name="id" ignore="true" />
+
         <attribute name="hash">
             <group>sylius:admin:payment_request:index</group>
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
+
         <attribute name="payment">
             <group>sylius:admin:payment_request:index</group>
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
+
         <attribute name="method">
             <group>sylius:admin:payment_request:index</group>
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
+
         <attribute name="action">
             <group>sylius:admin:payment_request:index</group>
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
+
         <attribute name="state">
             <group>sylius:admin:payment_request:index</group>
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
+
         <attribute name="payload">
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
+
         <attribute name="responseData">
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
+
         <attribute name="createdAt">
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
         </attribute>
+
         <attribute name="updatedAt">
             <group>sylius:admin:payment_request:show</group>
             <group>sylius:shop:payment_request:show</group>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/context_builders.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/context_builders.xml
index a211aac237..e656b64fbe 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/context_builders.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/context_builders.xml
@@ -116,6 +116,18 @@
             <argument>Sylius\Component\Core\Model\PaymentInterface</argument>
         </service>
 
+        <service
+            id="sylius_api.context_builder.payment_request_hash_aware"
+            class="Sylius\Bundle\ApiBundle\Serializer\ContextBuilder\UriVariablesAwareContextBuilder"
+            decorates="api_platform.serializer.context_builder"
+            decoration-priority="64"
+        >
+            <argument type="service" id=".inner" />
+            <argument>Sylius\Bundle\ApiBundle\Attribute\PaymentRequestHashAware</argument>
+            <argument type="constant">Sylius\Bundle\ApiBundle\Attribute\PaymentRequestHashAware::DEFAULT_ARGUMENT_NAME</argument>
+            <argument>Sylius\Component\Payment\Model\PaymentRequestInterface</argument>
+        </service>
+
         <service
             id="sylius_api.context_builder.order_token_value_aware"
             class="Sylius\Bundle\ApiBundle\Serializer\ContextBuilder\UriVariablesAwareContextBuilder"
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml
index c5e87371b0..5853ae2b12 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml
@@ -81,5 +81,12 @@
             <argument type="service" id="sylius.repository.payment"/>
             <tag name="api_platform.state_provider" priority="10"/>
         </service>
+
+        <service id="sylius_api.state_provider.shop.payment_request.item" class="Sylius\Bundle\ApiBundle\StateProvider\Shop\Payment\Request\ItemProvider">
+            <argument type="service" id="Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface" />
+            <argument type="service" id="sylius.repository.payment_request"/>
+            <argument type="service" id="sylius.api.checker.update_payment_request_eligibility"/>
+            <tag name="api_platform.state_provider" priority="10"/>
+        </service>
     </services>
 </container>

From 99fb1a9ca54aaf20e471494e8f6533b22ff718c0 Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Thu, 12 Sep 2024 14:58:15 +0200
Subject: [PATCH 119/200] Enable contract tests

---
 .../Api/Admin/PaymentRequestsTest.php         |  4 +-
 .../payment_request/get_payment_request.json  |  2 +-
 .../payment_request/post_payment_request.json |  6 +--
 .../post_payment_request_payum.json           |  6 +--
 .../payment_request/put_payment_request.json  |  6 +--
 .../put_payment_request_payum.json            |  6 +--
 .../Api/Shop/PaymentRequestsTest.php          | 51 ++++++++++---------
 7 files changed, 42 insertions(+), 39 deletions(-)
 rename {disabledTests => tests}/Api/Admin/PaymentRequestsTest.php (96%)
 rename {disabledTests => tests}/Api/Shop/PaymentRequestsTest.php (88%)

diff --git a/disabledTests/Api/Admin/PaymentRequestsTest.php b/tests/Api/Admin/PaymentRequestsTest.php
similarity index 96%
rename from disabledTests/Api/Admin/PaymentRequestsTest.php
rename to tests/Api/Admin/PaymentRequestsTest.php
index b8ecaed7ac..8653f74a2c 100644
--- a/disabledTests/Api/Admin/PaymentRequestsTest.php
+++ b/tests/Api/Admin/PaymentRequestsTest.php
@@ -33,7 +33,7 @@ final class PaymentRequestsTest extends JsonApiTestCase
 
         $fixtures = $this->loadFixturesFromFiles([
             'authentication/api_administrator.yaml',
-            'channel.yaml',
+            'channel/channel.yaml',
             'payment_method.yaml',
             'payment_request/payment_request.yaml',
             'payment_request/order.yaml',
@@ -54,7 +54,7 @@ final class PaymentRequestsTest extends JsonApiTestCase
 
         $fixtures = $this->loadFixturesFromFiles([
             'authentication/api_administrator.yaml',
-            'channel.yaml',
+            'channel/channel.yaml',
             'payment_method.yaml',
             'payment_request/payment_request.yaml',
             'payment_request/order.yaml',
diff --git a/tests/Api/Responses/shop/payment_request/get_payment_request.json b/tests/Api/Responses/shop/payment_request/get_payment_request.json
index 14fb48324c..d19b4534ea 100644
--- a/tests/Api/Responses/shop/payment_request/get_payment_request.json
+++ b/tests/Api/Responses/shop/payment_request/get_payment_request.json
@@ -16,7 +16,7 @@
     "responseData": {
         "after_url": "https:\/\/myshop.tld\/after-path"
     },
-    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "payment": "\/api\/v2\/shop\/orders\/token\/payments\/@integer@",
     "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
     "createdAt": @datetime@,
     "updatedAt": @datetime@
diff --git a/tests/Api/Responses/shop/payment_request/post_payment_request.json b/tests/Api/Responses/shop/payment_request/post_payment_request.json
index d6edf35e34..f3dc829848 100644
--- a/tests/Api/Responses/shop/payment_request/post_payment_request.json
+++ b/tests/Api/Responses/shop/payment_request/post_payment_request.json
@@ -10,8 +10,8 @@
         "after_path": "https:\/\/myshop.tld\/after-path"
     },
     "responseData": [],
-    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "payment": "\/api\/v2\/shop\/orders\/@string@\/payments\/@integer@",
     "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
-    "createdAt": @datetime@,
-    "updatedAt": @datetime@
+    "createdAt": "@datetime@",
+    "updatedAt": "@datetime@"
 }
diff --git a/tests/Api/Responses/shop/payment_request/post_payment_request_payum.json b/tests/Api/Responses/shop/payment_request/post_payment_request_payum.json
index 2ed23f5e4a..0a94f7e84a 100644
--- a/tests/Api/Responses/shop/payment_request/post_payment_request_payum.json
+++ b/tests/Api/Responses/shop/payment_request/post_payment_request_payum.json
@@ -12,8 +12,8 @@
     "responseData": {
         "after_url": "@string@"
     },
-    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "payment": "\/api\/v2\/shop\/orders\/@string@\/payments\/@integer@",
     "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
-    "createdAt": @datetime@,
-    "updatedAt": @datetime@
+    "createdAt": "@datetime@",
+    "updatedAt": "@datetime@"
 }
diff --git a/tests/Api/Responses/shop/payment_request/put_payment_request.json b/tests/Api/Responses/shop/payment_request/put_payment_request.json
index 8250100f0d..589badaa3b 100644
--- a/tests/Api/Responses/shop/payment_request/put_payment_request.json
+++ b/tests/Api/Responses/shop/payment_request/put_payment_request.json
@@ -12,8 +12,8 @@
     "responseData": {
         "after_url": "https:\/\/myshop.tld\/after-path"
     },
-    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "payment": "\/api\/v2\/shop\/orders\/@string@\/payments\/@integer@",
     "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
-    "createdAt": @datetime@,
-    "updatedAt": @datetime@
+    "createdAt": "@datetime@",
+    "updatedAt": "@datetime@"
 }
diff --git a/tests/Api/Responses/shop/payment_request/put_payment_request_payum.json b/tests/Api/Responses/shop/payment_request/put_payment_request_payum.json
index e310749a04..7f7cc1735d 100644
--- a/tests/Api/Responses/shop/payment_request/put_payment_request_payum.json
+++ b/tests/Api/Responses/shop/payment_request/put_payment_request_payum.json
@@ -12,8 +12,8 @@
     "responseData": {
         "after_url": "https:\/\/myshop.tld\/new-after-path"
     },
-    "payment": "\/api\/v2\/shop\/payments\/@integer@",
+    "payment": "\/api\/v2\/shop\/orders\/@string@\/payments\/@integer@",
     "method": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
-    "createdAt": @datetime@,
-    "updatedAt": @datetime@
+    "createdAt": "@datetime@",
+    "updatedAt": "@datetime@"
 }
diff --git a/disabledTests/Api/Shop/PaymentRequestsTest.php b/tests/Api/Shop/PaymentRequestsTest.php
similarity index 88%
rename from disabledTests/Api/Shop/PaymentRequestsTest.php
rename to tests/Api/Shop/PaymentRequestsTest.php
index 45eda051f0..a4764dbcb1 100644
--- a/disabledTests/Api/Shop/PaymentRequestsTest.php
+++ b/tests/Api/Shop/PaymentRequestsTest.php
@@ -16,17 +16,16 @@ namespace Sylius\Tests\Api\Shop;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Tests\Api\JsonApiTestCase;
 use Sylius\Tests\Api\Utils\OrderPlacerTrait;
-use Sylius\Tests\Api\Utils\ShopUserLoginTrait;
 use Symfony\Component\HttpFoundation\Response;
 
 final class PaymentRequestsTest extends JsonApiTestCase
 {
-    use ShopUserLoginTrait;
     use OrderPlacerTrait;
 
     protected function setUp(): void
     {
         $this->setUpOrderPlacer();
+        $this->setUpShopUserContext();
 
         parent::setUp();
     }
@@ -37,8 +36,8 @@ final class PaymentRequestsTest extends JsonApiTestCase
         $this->setUpDefaultGetHeaders();
 
         $fixtures = $this->loadFixturesFromFiles([
-            'authentication/customer.yaml',
-            'channel.yaml',
+            'authentication/shop_user.yaml',
+            'channel/channel.yaml',
             'payment_method.yaml',
             'payment_request/payment_request.yaml',
             'payment_request/order_with_customer.yaml',
@@ -58,9 +57,11 @@ final class PaymentRequestsTest extends JsonApiTestCase
 
     /**
      * @test
+     *
      * @dataProvider createPaymentRequestProvider
      *
      * @param array<string> $fixturesPaths
+     *
      * @throws \JsonException
      */
     public function it_creates_a_payment_request(array $fixturesPaths, string $responsePath): void
@@ -75,14 +76,14 @@ final class PaymentRequestsTest extends JsonApiTestCase
             uri: '/api/v2/shop/payment-requests',
             server: $this->headerBuilder()->withJsonLdAccept()->withJsonLdContentType()->withShopUserAuthorization('oliver@doe.com')->build(),
             content: json_encode([
-                'paymentId' => sprintf('/api/v2/shop/payments/%s', $payment->getId()),
+                'paymentId' => $payment->getId(),
                 'paymentMethodCode' => $payment->getMethod()->getCode(),
                 'action' => 'capture',
                 'payload' => [
                     'target_path' => 'https://myshop.tld/target-path',
-                    'after_path' => 'https://myshop.tld/after-path'
+                    'after_path' => 'https://myshop.tld/after-path',
                 ],
-            ], \JSON_THROW_ON_ERROR)
+            ], \JSON_THROW_ON_ERROR),
         );
 
         $this->assertResponse(
@@ -99,8 +100,8 @@ final class PaymentRequestsTest extends JsonApiTestCase
         if ($environment === 'test_cached_payum') {
             yield [
                 [
-                    'authentication/customer.yaml',
-                    'channel.yaml',
+                    'authentication/shop_user.yaml',
+                    'channel/channel.yaml',
                     'cart.yaml',
                     'country.yaml',
                     'shipping_method.yaml',
@@ -114,8 +115,8 @@ final class PaymentRequestsTest extends JsonApiTestCase
 
         yield [
             [
-                'authentication/customer.yaml',
-                'channel.yaml',
+                'authentication/shop_user.yaml',
+                'channel/channel.yaml',
                 'cart.yaml',
                 'country.yaml',
                 'shipping_method.yaml',
@@ -129,8 +130,8 @@ final class PaymentRequestsTest extends JsonApiTestCase
     public function it_does_not_create_a_payment_request_without_required_data(): void
     {
         $this->loadFixturesFromFiles([
-            'authentication/customer.yaml',
-            'channel.yaml',
+            'authentication/shop_user.yaml',
+            'channel/channel.yaml',
             'cart.yaml',
             'country.yaml',
             'shipping_method.yaml',
@@ -143,7 +144,7 @@ final class PaymentRequestsTest extends JsonApiTestCase
             method: 'POST',
             uri: '/api/v2/shop/payment-requests',
             server: $this->headerBuilder()->withJsonLdAccept()->withJsonLdContentType()->withShopUserAuthorization('oliver@doe.com')->build(),
-            content: json_encode([], \JSON_THROW_ON_ERROR)
+            content: json_encode([], \JSON_THROW_ON_ERROR),
         );
 
         $this->assertResponse(
@@ -155,9 +156,11 @@ final class PaymentRequestsTest extends JsonApiTestCase
 
     /**
      * @test
+     *
      * @dataProvider updatePaymentRequestProvider
      *
      * @param array<string> $fixturesPaths
+     *
      * @throws \JsonException
      */
     public function it_updates_a_payment_request(array $fixturesPaths, string $responsePath): void
@@ -176,9 +179,9 @@ final class PaymentRequestsTest extends JsonApiTestCase
             content: json_encode([
                 'payload' => [
                     'target_path' => 'https://myshop.tld/new-target-path',
-                    'after_path' => 'https://myshop.tld/new-after-path'
+                    'after_path' => 'https://myshop.tld/new-after-path',
                 ],
-            ], \JSON_THROW_ON_ERROR)
+            ], \JSON_THROW_ON_ERROR),
         );
 
         $this->assertResponseSuccessful($responsePath);
@@ -191,8 +194,8 @@ final class PaymentRequestsTest extends JsonApiTestCase
         if ($environment === 'test_cached_payum') {
             yield [
                 [
-                    'authentication/customer.yaml',
-                    'channel.yaml',
+                    'authentication/shop_user.yaml',
+                    'channel/channel.yaml',
                     'payment_method.yaml',
                     'payment_request/payment_request_payum.yaml',
                     'payment_request/order_with_customer.yaml',
@@ -205,8 +208,8 @@ final class PaymentRequestsTest extends JsonApiTestCase
 
         yield [
             [
-                'authentication/customer.yaml',
-                'channel.yaml',
+                'authentication/shop_user.yaml',
+                'channel/channel.yaml',
                 'payment_method.yaml',
                 'payment_request/payment_request.yaml',
                 'payment_request/order_with_customer.yaml',
@@ -221,8 +224,8 @@ final class PaymentRequestsTest extends JsonApiTestCase
         $this->setUpDefaultGetHeaders();
 
         $fixtures = $this->loadFixturesFromFiles([
-            'authentication/customer.yaml',
-            'channel.yaml',
+            'authentication/shop_user.yaml',
+            'channel/channel.yaml',
             'payment_method.yaml',
             'payment_request/payment_request.yaml',
             'payment_request/order_with_customer.yaml',
@@ -238,9 +241,9 @@ final class PaymentRequestsTest extends JsonApiTestCase
             content: json_encode([
                 'payload' => [
                     'target_path' => 'https://myshop.tld/new-target-path',
-                    'after_path' => 'https://myshop.tld/new-after-path'
+                    'after_path' => 'https://myshop.tld/new-after-path',
                 ],
-            ], \JSON_THROW_ON_ERROR)
+            ], \JSON_THROW_ON_ERROR),
         );
         $response = $this->client->getResponse();
 

From 78b10cee8808e36ec210f4ac8330956895bca737 Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Fri, 13 Sep 2024 11:37:56 +0200
Subject: [PATCH 120/200] Enable behat tests

---
 .../checking_taxons_of_product.feature                 |  8 ++++----
 .../filtering_taxons_of_product.feature                |  2 +-
 ...ying_taxons_assigned_to_an_existing_product.feature |  4 ++--
 ...sorting_products_within_a_taxon_by_position.feature | 10 +++++-----
 ...ing_taxons_that_are_used_in_promotion_rules.feature |  2 +-
 .../taxonomy/managing_taxons/browsing_taxon.feature    |  2 +-
 .../taxonomy/managing_taxons/deleting_taxon.feature    | 10 +++++-----
 .../taxonomy/managing_taxons/reordering_taxon.feature  | 10 +++++-----
 ...product_created_in_catalog_promotions_scope.feature |  2 +-
 ...ons_on_variants_once_products_taxon_changes.feature |  4 ++--
 .../paying_with_paypal_during_checkout.feature         | 10 +++++-----
 src/Sylius/Behat/Context/Api/PaypalContext.php         |  2 +-
 .../Api/Shop/Checkout/CheckoutOrderDetailsContext.php  |  2 +-
 13 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/features/admin/product/managing_products/checking_taxons_of_product.feature b/features/admin/product/managing_products/checking_taxons_of_product.feature
index f489247aa6..48270f2858 100644
--- a/features/admin/product/managing_products/checking_taxons_of_product.feature
+++ b/features/admin/product/managing_products/checking_taxons_of_product.feature
@@ -13,7 +13,7 @@ Feature: Checking taxons of a product
         And the product "T-Shirt" belongs to taxon "T-Shirts"
         And I am logged in as an administrator
 
-    @todo-ui @no-api @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Checking all taxons
         When I want to modify the "Shirt" product
         And I check all taxons
@@ -21,7 +21,7 @@ Feature: Checking taxons of a product
         Then the product "Shirt" should have the "Clothes" taxon
         And the product "Shirt" should have the "T-Shirts" taxon
 
-    @todo-ui @no-api @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Unchecking all taxons
         When I want to modify the "T-Shirt" product
         And I uncheck all taxons
@@ -29,7 +29,7 @@ Feature: Checking taxons of a product
         Then the product "Shirt" should not have the "Clothes" taxon
         And the product "Shirt" should not have the "T-Shirts" taxon
 
-    @todo-ui @no-api @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Checking all filtered taxons
         When I want to modify the "Shirt" product
         And I filter taxons by "T-Shirts"
@@ -38,7 +38,7 @@ Feature: Checking taxons of a product
         Then the product "Shirt" should have the "T-Shirts" taxon
         But the product "Shirt" should not have the "Clothes" taxon
 
-    @todo-ui @no-api @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Unchecking all filtered taxons
         When I want to modify the "T-Shirt" product
         And I filter taxons by "T-Shirts"
diff --git a/features/admin/product/managing_products/filtering_taxons_of_product.feature b/features/admin/product/managing_products/filtering_taxons_of_product.feature
index 6c6c95d5f8..a0dc738b83 100644
--- a/features/admin/product/managing_products/filtering_taxons_of_product.feature
+++ b/features/admin/product/managing_products/filtering_taxons_of_product.feature
@@ -10,7 +10,7 @@ Feature: Filtering product taxons
         And the store has a "Shirt" configurable product
         And I am logged in as an administrator
 
-    @todo-ui @no-api @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Filtering product taxons
         When I want to modify the "Shirt" product
         And I filter taxons by "T-Shirts"
diff --git a/features/admin/product/managing_products/modifying_taxons_assigned_to_an_existing_product.feature b/features/admin/product/managing_products/modifying_taxons_assigned_to_an_existing_product.feature
index e92f04cc94..53fe88f35e 100644
--- a/features/admin/product/managing_products/modifying_taxons_assigned_to_an_existing_product.feature
+++ b/features/admin/product/managing_products/modifying_taxons_assigned_to_an_existing_product.feature
@@ -12,7 +12,7 @@ Feature: Modifying taxons assigned to an existing product
         And the product "T-Shirt" belongs to taxon "Clothes"
         And I am logged in as an administrator
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Modifying taxons assigned to a product
         When I want to modify the "T-Shirt" product
         And I change that the "T-Shirt" product does not belong to the "Clothes" taxon
@@ -21,7 +21,7 @@ Feature: Modifying taxons assigned to an existing product
         Then the product "T-Shirt" should have the "T-Shirts" taxon
         And the product "T-Shirt" should not have the "Clothes" taxon
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Adding taxons to product
         When I want to modify the "Shirt" product
         And I add "Clothes" taxon to the "Shirt" product
diff --git a/features/admin/product/managing_products/sorting_products_within_a_taxon_by_position.feature b/features/admin/product/managing_products/sorting_products_within_a_taxon_by_position.feature
index e7259cea0d..cd660e1393 100644
--- a/features/admin/product/managing_products/sorting_products_within_a_taxon_by_position.feature
+++ b/features/admin/product/managing_products/sorting_products_within_a_taxon_by_position.feature
@@ -29,7 +29,7 @@ Feature: Sorting listed products from a taxon by position
         And the store has a product "Ultimate Pug" in the "Soft Toys" taxon at 19th position
         And I am logged in as an administrator
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Setting two products to position -1 on the non-last page
         When I am browsing the 1st page of products from "Soft Toys" taxon
         And I set the position of "Old pug" to "-1"
@@ -39,7 +39,7 @@ Feature: Sorting listed products from a taxon by position
         Then the one before last product on the list should have name "Old pug" with position 18
         And the last product on the list should have name "Young pug" with position 19
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Setting two products to position -1 on the last page
         When I am browsing the 2nd page of products from "Soft Toys" taxon
         And I set the position of "Pug XL" to "-1"
@@ -48,7 +48,7 @@ Feature: Sorting listed products from a taxon by position
         Then the one before last product on the list should have name "Pug XL" with position 18
         And the last product on the list should have name "Pug XS" with position 19
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Setting two products to the already occupied position on the other page
         When I am browsing the 1st page of products from "Soft Toys" taxon
         And I set the position of "Old pug" to "15"
@@ -107,7 +107,7 @@ Feature: Sorting listed products from a taxon by position
         When I am browsing the 3rd page of products from "Soft Toys" taxon
         Then the last product on the list within this taxon should have name "Big pug"
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Product with position 0 is set as the first one
         When I am browsing products from "Soft Toys" taxon
         And I set the position of "Young pug" to 0
@@ -115,7 +115,7 @@ Feature: Sorting listed products from a taxon by position
         And I go to the 1st page of products from "Soft Toys" taxon
         Then the first product on the list within this taxon should have name "Young pug"
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Being unable to use a non-numeric string as a product position
         Given I am browsing products from "Soft Toys" taxon
         When I set the position of "Young pug" to "test"
diff --git a/features/admin/promotion/managing_promotions/prevent_from_removing_taxons_that_are_used_in_promotion_rules.feature b/features/admin/promotion/managing_promotions/prevent_from_removing_taxons_that_are_used_in_promotion_rules.feature
index 6b659572b2..9282ba1796 100644
--- a/features/admin/promotion/managing_promotions/prevent_from_removing_taxons_that_are_used_in_promotion_rules.feature
+++ b/features/admin/promotion/managing_promotions/prevent_from_removing_taxons_that_are_used_in_promotion_rules.feature
@@ -9,7 +9,7 @@ Feature: Preventing from removing taxons that are used in promotion rules
         And the store has "Mugs" taxonomy
         And I am logged in as an administrator
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Being prevented from removing taxon that is in use by a promotion rule
         Given there is a promotion "Christmas sale" with "Total price of items from taxon" rule configured with "Mugs" taxon and $100 amount for "United States" channel
         When I try to delete taxon named "Mugs"
diff --git a/features/admin/taxonomy/managing_taxons/browsing_taxon.feature b/features/admin/taxonomy/managing_taxons/browsing_taxon.feature
index dcf8837883..02cedd2f41 100644
--- a/features/admin/taxonomy/managing_taxons/browsing_taxon.feature
+++ b/features/admin/taxonomy/managing_taxons/browsing_taxon.feature
@@ -8,7 +8,7 @@ Feature: Browsing taxons
         Given the store classifies its products as "T-Shirts" and "Accessories"
         And I am logged in as an administrator
 
-    @api @todo-ui @javascript
+    @api @ui @javascript
     Scenario: Browsing taxons in store
         When I want to see all taxons in store
         Then I should see 2 taxons on the list
diff --git a/features/admin/taxonomy/managing_taxons/deleting_taxon.feature b/features/admin/taxonomy/managing_taxons/deleting_taxon.feature
index 29acf55ab6..1119d141a8 100644
--- a/features/admin/taxonomy/managing_taxons/deleting_taxon.feature
+++ b/features/admin/taxonomy/managing_taxons/deleting_taxon.feature
@@ -8,13 +8,13 @@ Feature: Deleting a taxon
         Given I am logged in as an administrator
         And the store operates on a channel named "Web Store"
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Deleted taxon should disappear from the registry
         Given the store classifies its products as "T-Shirts"
         When I delete taxon named "T-Shirts"
         Then the taxon named "T-Shirts" should no longer exist in the registry
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Deleting a taxon with a child does not delete any other taxons
         Given the store classifies its products as "Main catalog"
         And the "Main catalog" taxon has children taxon "Shoes" and "Shovels"
@@ -25,14 +25,14 @@ Feature: Deleting a taxon
         And the taxon named "Women" should no longer exist in the registry
         But the "Shovels" taxon should appear in the registry
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Being unable to delete a menu taxon of a channel
         Given the store classifies its products as "T-Shirts" and "Caps"
         And channel "Web Store" has menu taxon "Caps"
         When I try to delete taxon named "Caps"
         Then I should be notified that I cannot delete a menu taxon of any channel
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Deleting a taxon that is a main taxon of a product
         Given the store classifies its products as "T-Shirts"
         And the store has a product "T-Shirts PHP"
@@ -41,7 +41,7 @@ Feature: Deleting a taxon
         Then the taxon named "T-Shirts" should no longer exist in the registry
         And the product "T-Shirts PHP" should no longer have a main taxon
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Deleting root taxon above menu taxon
         Given the store has "Main Category" taxonomy
         And the store has "Clothes Category" taxonomy
diff --git a/features/admin/taxonomy/managing_taxons/reordering_taxon.feature b/features/admin/taxonomy/managing_taxons/reordering_taxon.feature
index 4d32f677e3..eb805343e1 100644
--- a/features/admin/taxonomy/managing_taxons/reordering_taxon.feature
+++ b/features/admin/taxonomy/managing_taxons/reordering_taxon.feature
@@ -8,7 +8,7 @@ Feature: Reordering taxons
         Given the store classifies its products as "T-Shirts", "Watches", "Belts" and "Wallets"
         And I am logged in as an administrator
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Moving up the taxon on list
         When I want to see all taxons in store
         And I move up "Watches" taxon
@@ -16,7 +16,7 @@ Feature: Reordering taxons
         And I should see the taxon named "T-Shirts" in the list
         But the first taxon on the list should be "Watches"
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Moving down the taxon on list
         When I want to see all taxons in store
         And I move down "T-Shirts" taxon
@@ -24,21 +24,21 @@ Feature: Reordering taxons
         And I should see the taxon named "Watches" in the list
         But the first taxon on the list should be "Watches"
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Moving up the first taxon on list
         When I want to see all taxons in store
         And I move up "T-Shirts" taxon
         Then I should see 4 taxons on the list
         And the first taxon on the list should be "T-Shirts"
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Moving down the last taxon on list
         When I want to see all taxons in store
         And I move down "Wallets" taxon
         Then I should see 4 taxons on the list
         And the last taxon on the list should be "Wallets"
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Changing order of the taxon on list
         When I want to see all taxons in store
         And I move down "T-Shirts" taxon
diff --git a/features/hybrid/promotion/applying_catalog_promotions/applying_catalog_promotions_for_product_created_in_catalog_promotions_scope.feature b/features/hybrid/promotion/applying_catalog_promotions/applying_catalog_promotions_for_product_created_in_catalog_promotions_scope.feature
index 899dac8173..d0aeb93ccf 100644
--- a/features/hybrid/promotion/applying_catalog_promotions/applying_catalog_promotions_for_product_created_in_catalog_promotions_scope.feature
+++ b/features/hybrid/promotion/applying_catalog_promotions/applying_catalog_promotions_for_product_created_in_catalog_promotions_scope.feature
@@ -9,7 +9,7 @@ Feature: Applying catalog promotions for product created in catalog promotions s
         And the store classifies its products as "Clothes" and "Dishes"
         And I am logged in as an administrator
 
-    @no-api @todo-ui @mink:chromedriver
+    @no-api @ui @mink:chromedriver
     Scenario: Applying catalog promotion on newly created simple product
         Given there is a catalog promotion "Clothes sale" that reduces price by "30%" and applies on "Clothes" taxon
         When I create a new simple product "T-Shirt" priced at "$20.00" with "Clothes" taxon in the "United States" channel
diff --git a/features/hybrid/promotion/applying_catalog_promotions/not_reapplying_catalog_promotions_on_variants_once_products_taxon_changes.feature b/features/hybrid/promotion/applying_catalog_promotions/not_reapplying_catalog_promotions_on_variants_once_products_taxon_changes.feature
index c8db864e9c..9b5b4cb72e 100644
--- a/features/hybrid/promotion/applying_catalog_promotions/not_reapplying_catalog_promotions_on_variants_once_products_taxon_changes.feature
+++ b/features/hybrid/promotion/applying_catalog_promotions/not_reapplying_catalog_promotions_on_variants_once_products_taxon_changes.feature
@@ -16,14 +16,14 @@ Feature: Not reapplying catalog promotions on variants once the product’s taxo
         And there is disabled catalog promotion "Surprise sale" between "2021-07-01" and "2022-05-04" available in "Web-US" channel that reduces price by "90%" and applies on "Dishes" taxon
         And I am logged in as an administrator
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Changing products taxon to taxon with scheduled catalog promotion
         When I change that the "T-Shirt" product does not belong to the "Clothes" taxon
         And I add "Shirts" taxon to the "T-Shirt" product
         Then the visitor should see that the "PHP T-Shirt" variant is not discounted
         And the visitor should still see "$100.00" as the price of the "T-Shirt" product in the "Web-US" channel
 
-    @api @todo-ui @mink:chromedriver
+    @api @ui @mink:chromedriver
     Scenario: Changing products taxon to taxon with disabled catalog promotion
         When I change that the "T-Shirt" product does not belong to the "Clothes" taxon
         And I add "Dishes" taxon to the "T-Shirt" product
diff --git a/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature b/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
index 656507c023..6a9ef5e866 100644
--- a/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
+++ b/features/shop/checkout/paying_for_order/paying_with_paypal_during_checkout.feature
@@ -12,7 +12,7 @@ Feature: Paying with paypal during checkout
         And the store ships everywhere for Free
         And I am logged in as "john@example.com"
 
-    @todo-api @ui
+    @api @ui
     Scenario: Successfully authorize payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -23,7 +23,7 @@ Feature: Paying with paypal during checkout
         And I should see the thank you page
         And the latest order should have a payment with state "completed"
 
-    @todo-api @ui
+    @api @ui
     Scenario: Successful payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -32,7 +32,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been completed
         And I should see the thank you page
 
-    @todo-api @ui
+    @api @ui
     Scenario: Cancelling the payment
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -41,7 +41,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been cancelled
         And I should be able to pay again
 
-    @todo-api @ui
+    @api @ui
     Scenario: Retrying the payment with success
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
@@ -52,7 +52,7 @@ Feature: Paying with paypal during checkout
         Then I should be notified that my payment has been completed
         And I should see the thank you page
 
-    @todo-api @ui
+    @api @ui
     Scenario: Retrying the payment and failing
         Given I added product "PHP T-Shirt" to the cart
         And I have proceeded selecting "PayPal" payment method
diff --git a/src/Sylius/Behat/Context/Api/PaypalContext.php b/src/Sylius/Behat/Context/Api/PaypalContext.php
index 8b39c82379..f64e113c9e 100644
--- a/src/Sylius/Behat/Context/Api/PaypalContext.php
+++ b/src/Sylius/Behat/Context/Api/PaypalContext.php
@@ -165,7 +165,7 @@ final class PaypalContext implements Context
         $authorize = $gatewayConfig->getConfig()['use_authorize'] ?? false;
 
         $request->setContent([
-            'paymentId' => $payment['@id'],
+            'paymentId' => $payment['id'],
             'paymentMethodCode' => $payment['method'],
             'action' => $authorize
                 ? PaymentRequestInterface::ACTION_AUTHORIZE
diff --git a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
index 223a11ddb4..5af02a958d 100644
--- a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
+++ b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
@@ -73,7 +73,7 @@ final class CheckoutOrderDetailsContext implements Context
         $payment = end($payments);
 
         $paymentId = $payment['id'];
-        $response = $this->client->show(Resources::PAYMENTS, (string) $paymentId);
+        $response = $this->client->requestGet(sprintf('/api/v2/shop/orders/%s/payments/%s', $this->sharedStorage->get('cart_token'), $paymentId));
 
         return $this->responseChecker->getValue($response, 'state');
     }

From 66badc3782a58ecaedcdf3d8e61bec52819b0de0 Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Thu, 12 Sep 2024 14:59:18 +0200
Subject: [PATCH 121/200] Replace data transformer with context builder and
 upgrade item provider to APIP3

---
 .../Attribute/PaymentRequestHashAware.php     | 24 +++++
 .../Command/Payment/AddPaymentRequest.php     |  4 +-
 .../Command/Payment/UpdatePaymentRequest.php  | 26 +----
 .../PaymentRequestHashAwareInterface.php      | 22 -----
 .../Payment/UpdatePaymentRequestHandler.php   |  4 +-
 .../PaymentRequestUpdateDataProvider.php      | 55 -----------
 ...stHashAwareInputCommandDataTransformer.php | 48 ----------
 ...mentIdAwareInputCommandDataTransformer.php | 37 --------
 .../config/services/shop/state_providers.xml  |  2 +-
 .../Payment/PaymentRequest/ItemProvider.php   | 54 +++++++++++
 .../PaymentRequestUpdateDataProviderSpec.php  | 84 ----------------
 .../PaymentRequest/ItemProviderSpec.php       | 95 +++++++++++++++++++
 .../Payment/Model/PaymentRequest.php          |  2 +-
 13 files changed, 184 insertions(+), 273 deletions(-)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Attribute/PaymentRequestHashAware.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestUpdateDataProvider.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/StateProvider/Shop/Payment/PaymentRequest/ItemProvider.php
 delete mode 100644 src/Sylius/Bundle/ApiBundle/disabledSpec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
 create mode 100644 src/Sylius/Bundle/ApiBundle/spec/StateProvider/Shop/Payment/PaymentRequest/ItemProviderSpec.php

diff --git a/src/Sylius/Bundle/ApiBundle/Attribute/PaymentRequestHashAware.php b/src/Sylius/Bundle/ApiBundle/Attribute/PaymentRequestHashAware.php
new file mode 100644
index 0000000000..0da8b09c59
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Attribute/PaymentRequestHashAware.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Attribute;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+final class PaymentRequestHashAware
+{
+    public const DEFAULT_ARGUMENT_NAME = 'hash';
+
+    public function __construct(public string $constructorArgumentName = self::DEFAULT_ARGUMENT_NAME)
+    {
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index eab12ab106..2d3004a909 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -19,14 +19,14 @@ use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
 class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
 {
     public function __construct(
-        private string $paymentId,
+        private int|string $paymentId,
         private string $paymentMethodCode,
         private string $action,
         private mixed $payload = null,
     ) {
     }
 
-    public function getPaymentId(): string
+    public function getPaymentId(): int|string
     {
         return $this->paymentId;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
index a9793ec773..a7d6ae6491 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
@@ -13,31 +13,15 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ApiBundle\Command\Payment;
 
+use Sylius\Bundle\ApiBundle\Attribute\PaymentRequestHashAware;
 use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
-use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
 
-/** @experimental */
-class UpdatePaymentRequest implements PaymentRequestHashAwareInterface, IriToIdentifierConversionAwareInterface
+#[PaymentRequestHashAware]
+class UpdatePaymentRequest implements IriToIdentifierConversionAwareInterface
 {
-    protected ?string $hash = null;
-
     public function __construct(
-        private mixed $payload = null,
+        public ?string $hash = null,
+        public mixed $payload = null,
     ) {
     }
-
-    public function getPayload(): mixed
-    {
-        return $this->payload;
-    }
-
-    public function getHash(): string
-    {
-        return $this->hash;
-    }
-
-    public function setHash(string $hash): void
-    {
-        $this->hash = $hash;
-    }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php b/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
deleted file mode 100644
index f2e075002a..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Command/PaymentRequestHashAwareInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\Command;
-
-/** @experimental */
-interface PaymentRequestHashAwareInterface
-{
-    public function getHash(): string;
-
-    public function setHash(string $hash): void;
-}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 899a9c2871..554aca864c 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -32,12 +32,12 @@ final class UpdatePaymentRequestHandler implements MessageHandlerInterface
 
     public function __invoke(UpdatePaymentRequest $updatePaymentRequest): PaymentRequestInterface
     {
-        $paymentRequest = $this->paymentRequestRepository->find($updatePaymentRequest->getHash());
+        $paymentRequest = $this->paymentRequestRepository->find($updatePaymentRequest->hash);
         if (null === $paymentRequest) {
             throw new PaymentRequestNotFoundException();
         }
 
-        $paymentRequest->setPayload($updatePaymentRequest->getPayload());
+        $paymentRequest->setPayload($updatePaymentRequest->payload);
 
         return $paymentRequest;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestUpdateDataProvider.php b/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestUpdateDataProvider.php
deleted file mode 100644
index be9cb70cce..0000000000
--- a/src/Sylius/Bundle/ApiBundle/DataProvider/PaymentRequestUpdateDataProvider.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\DataProvider;
-
-use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
-use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityCheckerInterface;
-use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/** @experimental */
-final class PaymentRequestUpdateDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface
-{
-    /** @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository */
-    public function __construct(
-        private readonly PaymentRequestRepositoryInterface $paymentRequestRepository,
-        private readonly UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker
-    ){
-    }
-
-    /**
-     * @param string $id
-     * @param array<array-key, mixed> $context
-     */
-    public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
-    {
-        $paymentRequest = $this->paymentRequestRepository->find($id);
-
-        if ($this->updatePaymentRequestEligibilityChecker->isEligible($paymentRequest)) {
-            return $paymentRequest;
-        }
-
-        return null;
-    }
-
-    /** @param array<array-key, mixed> $context */
-    public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
-    {
-        return is_a($resourceClass, PaymentRequestInterface::class, true) &&
-            Request::METHOD_PUT === $context[ContextKeys::HTTP_REQUEST_METHOD_TYPE];
-    }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
deleted file mode 100644
index 6de0a27447..0000000000
--- a/src/Sylius/Bundle/ApiBundle/DataTransformer/PaymentRequestHashAwareInputCommandDataTransformer.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\DataTransformer;
-
-use Sylius\Bundle\ApiBundle\Command\PaymentRequestHashAwareInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-
-/** @experimental */
-final class PaymentRequestHashAwareInputCommandDataTransformer // implements CommandDataTransformerInterface
-{
-    /**
-     * @param PaymentRequestHashAwareInterface $object
-     * @param array<string, mixed> $context
-     *
-     * @return PaymentRequestHashAwareInterface
-     */
-    public function transform($object, string $to, array $context = [])
-    {
-        /** @var PaymentRequestInterface $paymentRequest */
-        $paymentRequest = $context['object_to_populate'];
-
-        $hash = $paymentRequest->getHash();
-        if (null === $hash) {
-            return $object;
-        }
-
-        $object->setHash($hash->toBinary());
-
-        return $object;
-    }
-
-    /** @param mixed $object */
-    public function supportsTransformation($object): bool
-    {
-        return $object instanceof PaymentRequestHashAwareInterface;
-    }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php b/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
deleted file mode 100644
index 784d93cf64..0000000000
--- a/src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\DataTransformer;
-
-use Sylius\Component\Core\Model\ShipmentInterface;
-
-final class ShipmentIdAwareInputCommandDataTransformer // implements CommandDataTransformerInterface
-{
-    /**
-     * @param array<string, mixed> $context
-     */
-    public function transform($object, string $to, array $context = [])
-    {
-        /** @var ShipmentInterface $shipment */
-        $shipment = $context['object_to_populate'];
-
-        $object->setShipmentId($shipment->getId());
-
-        return $object;
-    }
-
-    public function supportsTransformation($object): bool
-    {
-//        return $object instanceof ShipmentIdAwareInterface;
-    }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml
index 5853ae2b12..3a041c8bde 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml
@@ -82,7 +82,7 @@
             <tag name="api_platform.state_provider" priority="10"/>
         </service>
 
-        <service id="sylius_api.state_provider.shop.payment_request.item" class="Sylius\Bundle\ApiBundle\StateProvider\Shop\Payment\Request\ItemProvider">
+        <service id="sylius_api.state_provider.shop.payment.payment_request.item" class="Sylius\Bundle\ApiBundle\StateProvider\Shop\Payment\PaymentRequest\ItemProvider">
             <argument type="service" id="Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface" />
             <argument type="service" id="sylius.repository.payment_request"/>
             <argument type="service" id="sylius.api.checker.update_payment_request_eligibility"/>
diff --git a/src/Sylius/Bundle/ApiBundle/StateProvider/Shop/Payment/PaymentRequest/ItemProvider.php b/src/Sylius/Bundle/ApiBundle/StateProvider/Shop/Payment/PaymentRequest/ItemProvider.php
new file mode 100644
index 0000000000..e967ef76fd
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/StateProvider/Shop/Payment/PaymentRequest/ItemProvider.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\StateProvider\Shop\Payment\PaymentRequest;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\Metadata\Put;
+use ApiPlatform\State\ProviderInterface;
+use Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityCheckerInterface;
+use Sylius\Bundle\ApiBundle\SectionResolver\ShopApiSection;
+use Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Webmozart\Assert\Assert;
+
+/** @implements ProviderInterface<PaymentRequestInterface> */
+final readonly class ItemProvider implements ProviderInterface
+{
+    /** @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository */
+    public function __construct(
+        private SectionProviderInterface $sectionProvider,
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
+    ) {
+    }
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): array|object|null
+    {
+        Assert::true(is_a($operation->getClass(), PaymentRequestInterface::class, true));
+        Assert::isInstanceOf($operation, Put::class);
+        Assert::isInstanceOf($this->sectionProvider->getSection(), ShopApiSection::class);
+
+        $paymentRequest = $this->paymentRequestRepository->find($uriVariables['hash']);
+
+        if (
+            $paymentRequest === null ||
+            !$this->updatePaymentRequestEligibilityChecker->isEligible($paymentRequest)
+        ) {
+            return null;
+        }
+
+        return $paymentRequest;
+    }
+}
diff --git a/src/Sylius/Bundle/ApiBundle/disabledSpec/DataProvider/PaymentRequestUpdateDataProviderSpec.php b/src/Sylius/Bundle/ApiBundle/disabledSpec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
deleted file mode 100644
index 3e72c54aa1..0000000000
--- a/src/Sylius/Bundle/ApiBundle/disabledSpec/DataProvider/PaymentRequestUpdateDataProviderSpec.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ApiBundle\disabledSpec\DataProvider;
-
-use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityCheckerInterface;
-use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
-use Sylius\Component\Core\Model\ProductInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-final class PaymentRequestUpdateDataProviderSpec extends ObjectBehavior
-{
-    function let(
-        PaymentRequestRepositoryInterface $paymentRequestRepository,
-        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
-    ): void {
-        $this->beConstructedWith($paymentRequestRepository, $updatePaymentRequestEligibilityChecker);
-    }
-
-    function it_does_not_support_not_payment_request_resource(): void
-    {
-        $this
-            ->supports(ProductInterface::class, Request::METHOD_PUT, [])
-            ->shouldReturn(false)
-        ;
-    }
-
-    function it_does_not_support_not_put_request_method_type(): void
-    {
-        $this
-            ->supports(PaymentRequestInterface::class, 'shop_get', [ContextKeys::HTTP_REQUEST_METHOD_TYPE => Request::METHOD_GET])
-            ->shouldReturn(false)
-        ;
-    }
-
-    function it_supports_payment_request_resource_and_put_request_method_type(): void
-    {
-        $this
-            ->supports(PaymentRequestInterface::class, 'shop_get', [ContextKeys::HTTP_REQUEST_METHOD_TYPE => Request::METHOD_PUT])
-            ->shouldReturn(true)
-        ;
-    }
-
-    function it_providers_null_when_update_payment_request_is_not_eligible(
-        PaymentRequestRepositoryInterface $paymentRequestRepository,
-        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
-        PaymentRequestInterface $paymentRequest
-    ): void {
-        $hash = 'hash123!@#';
-        $paymentRequestRepository->find($hash)->willReturn($paymentRequest);
-        $updatePaymentRequestEligibilityChecker->isEligible($paymentRequest)->willReturn(false);
-
-        $this
-            ->getItem(PaymentRequestInterface::class, $hash, 'shop_get')
-            ->shouldReturn(null);
-    }
-
-    function it_providers_payment_request_when_update_payment_request_is_eligible(
-        PaymentRequestRepositoryInterface $paymentRequestRepository,
-        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
-        PaymentRequestInterface $paymentRequest
-    ): void {
-        $hash = 'hash123!@#';
-        $paymentRequestRepository->find($hash)->willReturn($paymentRequest);
-        $updatePaymentRequestEligibilityChecker->isEligible($paymentRequest)->willReturn(true);
-
-        $this
-            ->getItem(PaymentRequestInterface::class, $hash, 'shop_get')
-            ->shouldReturn($paymentRequest);
-    }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/spec/StateProvider/Shop/Payment/PaymentRequest/ItemProviderSpec.php b/src/Sylius/Bundle/ApiBundle/spec/StateProvider/Shop/Payment/PaymentRequest/ItemProviderSpec.php
new file mode 100644
index 0000000000..310caa3bb8
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/spec/StateProvider/Shop/Payment/PaymentRequest/ItemProviderSpec.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\ApiBundle\StateProvider\Shop\Payment\PaymentRequest;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\Metadata\Put;
+use ApiPlatform\State\ProviderInterface;
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+use Sylius\Bundle\ApiBundle\Checker\UpdatePaymentRequestEligibilityCheckerInterface;
+use Sylius\Bundle\ApiBundle\SectionResolver\AdminApiSection;
+use Sylius\Bundle\ApiBundle\SectionResolver\ShopApiSection;
+use Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+
+final class ItemProviderSpec extends ObjectBehavior
+{
+    public function let(
+        SectionProviderInterface $sectionProvider,
+        PaymentRequestRepositoryInterface $paymentRequestRepository,
+        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
+    ): void {
+        $this->beConstructedWith($sectionProvider, $paymentRequestRepository, $updatePaymentRequestEligibilityChecker);
+    }
+
+    function it_is_a_state_provider(): void
+    {
+        $this->shouldImplement(ProviderInterface::class);
+    }
+
+    function it_throws_an_exception_if_operation_class_is_not_payment(
+        Operation $operation,
+    ): void {
+        $operation->getClass()->willReturn(\stdClass::class);
+        $this->shouldThrow(\InvalidArgumentException::class)->during('provide', [$operation]);
+    }
+
+    function it_throws_an_exception_if_operation_is_not_put(
+        Operation $operation,
+    ): void {
+        $operation->getClass()->willReturn(PaymentRequestInterface::class);
+
+        $this->shouldThrow(\InvalidArgumentException::class)->during('provide', [$operation]);
+    }
+
+    function it_throws_an_exception_if_section_is_not_shop_api_section(
+        SectionProviderInterface $sectionProvider,
+    ): void {
+        $operation = new Put(class: PaymentRequestInterface::class, name: 'put');
+        $sectionProvider->getSection()->willReturn(new AdminApiSection());
+
+        $this->shouldThrow(\InvalidArgumentException::class)->during('provide', [$operation, [], []]);
+    }
+
+    function it_returns_nothing_if_payment_request_is_not_found(
+        SectionProviderInterface $sectionProvider,
+        PaymentRequestRepositoryInterface $paymentRequestRepository,
+        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
+    ): void {
+        $hash = 'hash';
+        $operation = new Put(class: PaymentRequestInterface::class, name: 'put');
+        $sectionProvider->getSection()->willReturn(new ShopApiSection());
+        $paymentRequestRepository->find($hash)->willReturn(null);
+        $updatePaymentRequestEligibilityChecker->isEligible(Argument::any())->shouldNotBeCalled();
+
+        $this->provide($operation, ['hash' => $hash], [])->shouldReturn(null);
+    }
+
+    function it_returns_payment_request_by_hash(
+        SectionProviderInterface $sectionProvider,
+        PaymentRequestRepositoryInterface $paymentRequestRepository,
+        UpdatePaymentRequestEligibilityCheckerInterface $updatePaymentRequestEligibilityChecker,
+        PaymentRequestInterface $paymentRequest,
+    ): void {
+        $hash = 'hash';
+        $operation = new Put(class: PaymentRequestInterface::class, name: 'put');
+        $sectionProvider->getSection()->willReturn(new ShopApiSection());
+        $paymentRequestRepository->find($hash)->willReturn($paymentRequest);
+        $updatePaymentRequestEligibilityChecker->isEligible($paymentRequest)->willReturn(true);
+
+        $this->provide($operation, ['hash' => $hash], [])->shouldReturn($paymentRequest);
+    }
+}
diff --git a/src/Sylius/Component/Payment/Model/PaymentRequest.php b/src/Sylius/Component/Payment/Model/PaymentRequest.php
index 17271e3771..e2c39985b4 100644
--- a/src/Sylius/Component/Payment/Model/PaymentRequest.php
+++ b/src/Sylius/Component/Payment/Model/PaymentRequest.php
@@ -28,7 +28,7 @@ class PaymentRequest implements PaymentRequestInterface
 
     protected mixed $payload = null;
 
-    /** @var array<string, mixed> $responseData */
+    /** @var array<string, mixed> */
     protected array $responseData = [];
 
     public function __construct(

From 192b089864a93be28040321f21d7f2be42df3717 Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Fri, 13 Sep 2024 11:06:18 +0200
Subject: [PATCH 122/200] Update baseline and fix PHPStan

---
 phpstan-baseline.neon                         | 20 -------------------
 .../PaymentRequestFactoryInterface.php        |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 9a867ece02..e5da9b7dc3 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1195,26 +1195,6 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/ApiBundle/DataTransformer/OrderTokenValueAwareInputCommandDataTransformer.php
 
-		-
-			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\DataTransformer\\\\ShipmentIdAwareInputCommandDataTransformer\\:\\:supportsTransformation\\(\\) has parameter \\$object with no type specified\\.$#"
-			count: 1
-			path: src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
-
-		-
-			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\DataTransformer\\\\ShipmentIdAwareInputCommandDataTransformer\\:\\:transform\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
-
-		-
-			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\DataTransformer\\\\ShipmentIdAwareInputCommandDataTransformer\\:\\:transform\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
-
-		-
-			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\DataTransformer\\\\ShipmentIdAwareInputCommandDataTransformer\\:\\:transform\\(\\) has parameter \\$object with no type specified\\.$#"
-			count: 1
-			path: src/Sylius/Bundle/ApiBundle/DataTransformer/ShipmentIdAwareInputCommandDataTransformer.php
-
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\ApiBundle\\\\DataTransformer\\\\SubresourceIdAwareCommandDataTransformer\\:\\:supportsTransformation\\(\\) has parameter \\$object with no type specified\\.$#"
 			count: 1
diff --git a/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php b/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php
index a2ff987ea5..a944431780 100644
--- a/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php
+++ b/src/Sylius/Component/Payment/Factory/PaymentRequestFactoryInterface.php
@@ -16,7 +16,7 @@ namespace Sylius\Component\Payment\Factory;
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
+use Sylius\Resource\Factory\FactoryInterface;
 
 /**
  * @template T of PaymentRequestInterface

From 34e82da64f93317d0f45e4368ad314a7eb36665a Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Mon, 16 Sep 2024 12:02:58 +0200
Subject: [PATCH 123/200] Remove getters from AddPaymentRequest

---
 .../Command/Payment/AddPaymentRequest.php     | 28 +++----------------
 .../Payment/AddPaymentRequestHandler.php      |  8 +++---
 ...ymentRequestActionEligibilityValidator.php |  2 +-
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index 2d3004a909..8e42e31da8 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -19,30 +19,10 @@ use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
 class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
 {
     public function __construct(
-        private int|string $paymentId,
-        private string $paymentMethodCode,
-        private string $action,
-        private mixed $payload = null,
+        public readonly int|string $paymentId,
+        public readonly string $paymentMethodCode,
+        public readonly string $action,
+        public readonly mixed $payload = null,
     ) {
     }
-
-    public function getPaymentId(): int|string
-    {
-        return $this->paymentId;
-    }
-
-    public function getPaymentMethodCode(): string
-    {
-        return $this->paymentMethodCode;
-    }
-
-    public function getAction(): string
-    {
-        return $this->action;
-    }
-
-    public function getPayload(): mixed
-    {
-        return $this->payload;
-    }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 70d0513820..5ed88739b1 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -55,7 +55,7 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
     {
         /** @var PaymentMethodInterface|null $paymentMethod */
         $paymentMethod = $this->paymentMethodRepository->findOneBy([
-            'code' => $addPaymentRequest->getPaymentMethodCode(),
+            'code' => $addPaymentRequest->paymentMethodCode,
         ]);
 
         if (null === $paymentMethod) {
@@ -63,15 +63,15 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         }
 
         /** @var PaymentInterface|null $payment */
-        $payment = $this->paymentRepository->find($addPaymentRequest->getPaymentId());
+        $payment = $this->paymentRepository->find($addPaymentRequest->paymentId);
 
         if (null === $payment) {
             throw new PaymentNotFoundException();
         }
 
         $paymentRequest = $this->paymentRequestFactory->create($payment, $paymentMethod);
-        $paymentRequest->setAction($addPaymentRequest->getAction());
-        $paymentRequest->setPayload($addPaymentRequest->getPayload());
+        $paymentRequest->setAction($addPaymentRequest->action);
+        $paymentRequest->setPayload($addPaymentRequest->payload);
 
         return $paymentRequest;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
index f404e921fe..f22e496b73 100644
--- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
+++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
@@ -65,7 +65,7 @@ final class ChosenPaymentRequestActionEligibilityValidator extends ConstraintVal
     private function getCommandProvider(AddPaymentRequest $addPaymentRequest): ?PaymentRequestCommandProviderInterface
     {
         /** @var PaymentMethodInterface|null $paymentMethod */
-        $paymentMethod = $this->paymentMethodRepository->findOneBy(['code' => $addPaymentRequest->getPaymentMethodCode()]);
+        $paymentMethod = $this->paymentMethodRepository->findOneBy(['code' => $addPaymentRequest->paymentMethodCode]);
 
         if ($paymentMethod === null) {
             return null;

From 4941c4e78359ba23de26388c2f9ea45556729635 Mon Sep 17 00:00:00 2001
From: Kamil Grygierzec <kam.grygierzec@gmail.com>
Date: Tue, 17 Sep 2024 08:58:41 +0200
Subject: [PATCH 124/200] Make the hash in UpdatePaymentRequest required

---
 .../Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
index a7d6ae6491..5b58e697e6 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/UpdatePaymentRequest.php
@@ -20,7 +20,7 @@ use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
 class UpdatePaymentRequest implements IriToIdentifierConversionAwareInterface
 {
     public function __construct(
-        public ?string $hash = null,
+        public readonly string $hash,
         public mixed $payload = null,
     ) {
     }

From 1d0cf0a11e0919d6b7e72da388010b41161ebb78 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Sat, 24 Aug 2024 22:14:00 +0200
Subject: [PATCH 125/200] Add deprecation notice mention by @diimpp

---
 .../EventSubscriber/PaymentRequestEventSubscriber.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/EventSubscriber/PaymentRequestEventSubscriber.php b/src/Sylius/Bundle/ApiBundle/EventSubscriber/PaymentRequestEventSubscriber.php
index f7192c31be..609ea74e5b 100644
--- a/src/Sylius/Bundle/ApiBundle/EventSubscriber/PaymentRequestEventSubscriber.php
+++ b/src/Sylius/Bundle/ApiBundle/EventSubscriber/PaymentRequestEventSubscriber.php
@@ -23,7 +23,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
 
 final class PaymentRequestEventSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private PaymentRequestAnnouncerInterface $paymentMethodAnnouncer)
+    public function __construct(private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer)
     {
     }
 
@@ -44,13 +44,13 @@ final class PaymentRequestEventSubscriber implements EventSubscriberInterface
 
         $method = $event->getRequest()->getMethod();
         if ($method === Request::METHOD_POST) {
-            $this->paymentMethodAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
+            $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
 
             return;
         }
 
         if (in_array($method, [Request::METHOD_PUT, Request::METHOD_PATCH], true)) {
-            $this->paymentMethodAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
+            $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
         }
     }
 }

From fa525c51824a7b1e1f42e875b75b0709d569dab2 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:12:32 +0300
Subject: [PATCH 126/200] Move the SyliusPayumBundle Order pay controller
 action to a dedicated ShopBundle controller action

# Conflicts:
#	UPGRADE-2.0.md

# Conflicts:
#	src/Sylius/Bundle/PayumBundle/Controller/PayumController.php
#	src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
---
 .../Controller/PayumController.php            |  75 -----------
 .../Resources/config/services/controller.xml  |   8 --
 .../Controller/OrderPayController.php         |  61 +++++++++
 .../Provider/DefaultPayResponseProvider.php   |  43 ++++++
 .../Provider/PayResponseProviderInterface.php |  31 +++++
 .../PaymentRequestPayResponseProvider.php     |  34 +++++
 .../Provider/PayumPayResponseProvider.php     | 127 ++++++++++++++++++
 .../Resources/config/routing/order.yml        |   2 +-
 .../ShopBundle/Resources/config/services.xml  |   1 +
 .../Resources/config/services/controller.xml  |  13 ++
 .../Resources/config/services/providers.xml   |  35 +++++
 11 files changed, 346 insertions(+), 84 deletions(-)
 create mode 100644 src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/PayResponseProviderInterface.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml

diff --git a/src/Sylius/Bundle/PayumBundle/Controller/PayumController.php b/src/Sylius/Bundle/PayumBundle/Controller/PayumController.php
index 30c4c96bbc..3afb222fc9 100644
--- a/src/Sylius/Bundle/PayumBundle/Controller/PayumController.php
+++ b/src/Sylius/Bundle/PayumBundle/Controller/PayumController.php
@@ -13,70 +13,31 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\Controller;
 
-use Payum\Core\Model\GatewayConfigInterface;
 use Payum\Core\Payum;
 use Payum\Core\Request\Generic;
 use Payum\Core\Request\GetStatusInterface;
-use Payum\Core\Security\GenericTokenFactoryInterface;
 use Payum\Core\Security\HttpRequestVerifierInterface;
-use Payum\Core\Security\TokenInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactoryInterface;
-use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface;
-use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Component\Order\Repository\OrderRepositoryInterface;
-use Sylius\Resource\Metadata\MetadataInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\RouterInterface;
 
 final class PayumController
 {
     public function __construct(
         private Payum $payum,
-        private OrderRepositoryInterface $orderRepository,
-        private MetadataInterface $orderMetadata,
-        private RequestConfigurationFactoryInterface $requestConfigurationFactory,
         private RouterInterface $router,
         private GetStatusFactoryInterface $getStatusRequestFactory,
         private ResolveNextRouteFactoryInterface $resolveNextRouteRequestFactory,
     ) {
     }
 
-    public function prepareCaptureAction(Request $request, $tokenValue): Response
-    {
-        $configuration = $this->requestConfigurationFactory->create($this->orderMetadata, $request);
-
-        /** @var OrderInterface|null $order */
-        $order = $this->orderRepository->findOneByTokenValue($tokenValue);
-
-        if (null === $order) {
-            throw new NotFoundHttpException(sprintf('Order with token "%s" does not exist.', $tokenValue));
-        }
-
-        $request->getSession()->set('sylius_order_id', $order->getId());
-        $payment = $order->getLastPayment(PaymentInterface::STATE_NEW);
-
-        if (null === $payment) {
-            $url = $this->router->generate('sylius_shop_order_thank_you');
-
-            return new RedirectResponse($url);
-        }
-
-        $token = $this->provideTokenBasedOnPayment($payment, $configuration->getParameters()->get('redirect'));
-
-        return new RedirectResponse($token->getTargetUrl());
-    }
-
     public function afterCaptureAction(Request $request): Response
     {
-        $configuration = $this->requestConfigurationFactory->create($this->orderMetadata, $request);
-
         $token = $this->getHttpRequestVerifier()->verify($request);
 
         /** @var Generic&GetStatusInterface $status */
@@ -97,44 +58,8 @@ final class PayumController
         return new RedirectResponse($this->router->generate($resolveNextRoute->getRouteName(), $resolveNextRoute->getRouteParameters()));
     }
 
-    private function getTokenFactory(): GenericTokenFactoryInterface
-    {
-        return $this->payum->getTokenFactory();
-    }
-
     private function getHttpRequestVerifier(): HttpRequestVerifierInterface
     {
         return $this->payum->getHttpRequestVerifier();
     }
-
-    private function provideTokenBasedOnPayment(PaymentInterface $payment, array $redirectOptions): TokenInterface
-    {
-        /** @var PaymentMethodInterface $paymentMethod */
-        $paymentMethod = $payment->getMethod();
-
-        /** @var GatewayConfigInterface $gatewayConfig */
-        $gatewayConfig = $paymentMethod->getGatewayConfig();
-
-        if (isset($gatewayConfig->getConfig()['use_authorize']) && true === (bool) $gatewayConfig->getConfig()['use_authorize']) {
-            $token = $this->getTokenFactory()->createAuthorizeToken(
-                $gatewayConfig->getGatewayName(),
-                $payment,
-                $redirectOptions['route']
-                    ?? null,
-                $redirectOptions['parameters']
-                    ?? [],
-            );
-        } else {
-            $token = $this->getTokenFactory()->createCaptureToken(
-                $gatewayConfig->getGatewayName(),
-                $payment,
-                $redirectOptions['route']
-                    ?? null,
-                $redirectOptions['parameters']
-                    ?? [],
-            );
-        }
-
-        return $token;
-    }
 }
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
index b2cb1aa1b2..9ead44adac 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
@@ -8,14 +8,6 @@
 
         <service id="sylius.controller.payum" class="Sylius\Bundle\PayumBundle\Controller\PayumController" public="true">
             <argument type="service" id="payum" />
-            <argument type="service" id="sylius.repository.order" />
-            <argument type="service">
-                <service class="Sylius\Resource\Metadata\MetadataInterface">
-                    <factory service="sylius.resource_registry" method="get" />
-                    <argument type="string">sylius.order</argument>
-                </service>
-            </argument>
-            <argument type="service" id="sylius.resource_controller.request_configuration_factory" />
             <argument type="service" id="router" />
             <argument type="service" id="sylius.factory.payum_get_status_action" />
             <argument type="service" id="sylius.factory.payum_resolve_next_route" />
diff --git a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php b/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
new file mode 100644
index 0000000000..d158b3ba77
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Controller;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface;
+use Sylius\Bundle\ShopBundle\Provider\PayResponseProviderInterface;
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Order\Repository\OrderRepositoryInterface;
+use Sylius\Component\Resource\Metadata\MetadataInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+final class OrderPayController
+{
+    /**
+     * @param iterable<PayResponseProviderInterface> $payResponseProviders
+     * @param OrderRepositoryInterface<OrderInterface> $orderRepository
+     */
+    public function __construct(
+        private OrderRepositoryInterface $orderRepository,
+        private MetadataInterface $orderMetadata,
+        private RequestConfigurationFactoryInterface $requestConfigurationFactory,
+        private iterable $payResponseProviders,
+        private PayResponseProviderInterface $defaultPayResponseProvider,
+    ) {
+    }
+
+    public function payAction(Request $request, string $tokenValue): Response
+    {
+        $configuration = $this->requestConfigurationFactory->create($this->orderMetadata, $request);
+
+        /** @var OrderInterface|null $order */
+        $order = $this->orderRepository->findOneByTokenValue($tokenValue);
+
+        if (null === $order) {
+            throw new NotFoundHttpException(sprintf('Order with token "%s" does not exist.', $tokenValue));
+        }
+
+        $request->getSession()->set('sylius_order_id', $order->getId());
+
+        foreach ($this->payResponseProviders as $provider) {
+            if ($provider->supports($configuration, $order)) {
+                return $provider->getResponse($configuration, $order);
+            }
+        }
+
+        return $this->defaultPayResponseProvider->getResponse($configuration, $order);
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php
new file mode 100644
index 0000000000..d4b875441a
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Core\Model\OrderInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\RouterInterface;
+
+final class DefaultPayResponseProvider implements PayResponseProviderInterface
+{
+    public function __construct(
+        private RouterInterface $router,
+    ) {
+    }
+
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        OrderInterface $order
+    ): Response {
+        $url = $this->router->generate('sylius_shop_order_thank_you');
+
+        return new RedirectResponse($url);
+    }
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        OrderInterface $order
+    ): bool {
+        return true;
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayResponseProviderInterface.php b/src/Sylius/Bundle/ShopBundle/Provider/PayResponseProviderInterface.php
new file mode 100644
index 0000000000..ff94bd84f2
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayResponseProviderInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Core\Model\OrderInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+interface PayResponseProviderInterface
+{
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        OrderInterface $order
+    ): Response;
+
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        OrderInterface $order
+    ): bool;
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
new file mode 100644
index 0000000000..13c0bf9145
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Core\Model\OrderInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+final class PaymentRequestPayResponseProvider implements PayResponseProviderInterface
+{
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        OrderInterface $order
+    ): Response {
+        return new Response('', Response::HTTP_NO_CONTENT);
+    }
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        OrderInterface $order
+    ): bool {
+        return true;
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
new file mode 100644
index 0000000000..0eec1bf3c4
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider;
+
+use Payum\Core\Exception\InvalidArgumentException;
+use Payum\Core\Payum;
+use Payum\Core\Security\TokenInterface;
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
+use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Webmozart\Assert\Assert;
+
+final class PayumPayResponseProvider implements PayResponseProviderInterface
+{
+    public function __construct(
+        private Payum $payum,
+    ) {
+    }
+
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        OrderInterface $order
+    ): Response {
+        $payment = $this->getPaymentFromOrder($order);
+        Assert::notNull($payment, 'An existing payment with state "new" must exist.');
+
+        $redirectOptions = $requestConfiguration->getParameters()->get('redirect');
+        if (is_string($redirectOptions)) {
+            $redirectOptions = [
+                'route' => $redirectOptions,
+            ];
+        }
+        $token = $this->provideTokenBasedOnPayment($payment, $redirectOptions);
+
+        return new RedirectResponse($token->getTargetUrl());
+    }
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        OrderInterface $order
+    ): bool {
+
+        $payment = $this->getPaymentFromOrder($order);
+        if (null === $payment) {
+            return false;
+        }
+
+        $gatewayConfig = $this->getGatewayConfigFromPayment($payment);
+        if (null === $gatewayConfig) {
+            return false;
+        }
+
+        $gatewayName = $gatewayConfig->getGatewayName() ?? '';
+
+        try {
+            $this->payum->getGateway($gatewayName);
+        } catch (InvalidArgumentException) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array{route: ?string, parameters: ?string[]} $redirectOptions
+     */
+    private function provideTokenBasedOnPayment(PaymentInterface $payment, array $redirectOptions): TokenInterface
+    {
+        $gatewayConfig = $this->getGatewayConfigFromPayment($payment);
+        Assert::notNull($gatewayConfig, 'An existing gateway config must exist.');
+
+        $config = $gatewayConfig->getConfig();
+        $tokenFactory = $this->payum->getTokenFactory();
+
+        if (isset($config['use_authorize']) && true === (bool) $config['use_authorize']) {
+            $token = $tokenFactory->createAuthorizeToken(
+                $gatewayConfig->getGatewayName(),
+                $payment,
+                $redirectOptions['route'] ?? null,
+                $redirectOptions['parameters'] ?? [],
+            );
+        } else {
+            $token = $tokenFactory->createCaptureToken(
+                $gatewayConfig->getGatewayName(),
+                $payment,
+                $redirectOptions['route'] ?? null,
+                $redirectOptions['parameters'] ?? [],
+            );
+        }
+
+        return $token;
+    }
+
+    private function getPaymentFromOrder(OrderInterface $order): ?PaymentInterface
+    {
+        return $order->getLastPayment(BasePaymentInterface::STATE_NEW);
+    }
+
+    private function getGatewayConfigFromPayment(PaymentInterface $payment): ?GatewayConfigInterface
+    {
+        $paymentMethod = $payment->getMethod();
+        if (null === $paymentMethod) {
+            return null;
+        }
+
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        if (null === $gatewayConfig) {
+            return null;
+        }
+
+        return $gatewayConfig;
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
index 1e01ddb5df..0bb19bef57 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
@@ -13,7 +13,7 @@ sylius_shop_order_pay:
     path: /{tokenValue}/pay
     methods: [GET]
     defaults:
-        _controller: sylius.controller.payum::prepareCaptureAction
+        _controller: sylius.controller.shop.order_pay::payAction
         _sylius:
             redirect:
                 route: sylius_shop_order_after_pay
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
index 7d78b73319..4f29076dd3 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
@@ -17,6 +17,7 @@
         <import resource="services/email.xml" />
         <import resource="services/listeners.xml" />
         <import resource="services/menu.xml" />
+        <import resource="services/providers.xml" />
         <import resource="services/twig.xml" />
     </imports>
     <services>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
index b3ec867ac1..fcc16fd90e 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
@@ -54,5 +54,18 @@
 
             <tag name="controller.service_arguments" />
         </service>
+
+        <service id="sylius.controller.shop.order_pay" class="Sylius\Bundle\ShopBundle\Controller\OrderPayController">
+            <argument type="service" id="sylius.repository.order" />
+            <argument type="service">
+                <service class="Sylius\Component\Resource\Metadata\MetadataInterface">
+                    <factory service="sylius.resource_registry" method="get" />
+                    <argument type="string">sylius.order</argument>
+                </service>
+            </argument>
+            <argument type="service" id="sylius.resource_controller.request_configuration_factory" />
+            <argument type="tagged" tag="sylius.shop.provider.pay_response" />
+            <argument type="service" id="sylius.shop.provider.pay_response.default" />
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
new file mode 100644
index 0000000000..06053cac32
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
@@ -0,0 +1,35 @@
+<?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>
+
+        <service id="sylius.shop.provider.pay_response.default" class="Sylius\Bundle\ShopBundle\Provider\DefaultPayResponseProvider">
+            <argument type="service" id="router" />
+            <tag name="sylius.shop.provider.pay_response" priority="-300" />
+        </service>
+
+        <service id="sylius.shop.provider.pay_response.payum" class="Sylius\Bundle\ShopBundle\Provider\PayumPayResponseProvider">
+            <argument type="service" id="payum" />
+            <tag name="sylius.shop.provider.pay_response" priority="-200" />
+        </service>
+
+        <service id="sylius.shop.provider.pay_response.payment_request" class="Sylius\Bundle\ShopBundle\Provider\PaymentRequestPayResponseProvider">
+            <tag name="sylius.shop.provider.pay_response" priority="-100" />
+        </service>
+
+    </services>
+</container>

From 30b87592dab924f204474cc2474efb9589f24b52 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Aug 2024 22:46:25 +0200
Subject: [PATCH 127/200] Replace else by a return
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
---
 .../Provider/PayumPayResponseProvider.php        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
index 0eec1bf3c4..1bb03d3ea8 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
@@ -87,14 +87,7 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
         $tokenFactory = $this->payum->getTokenFactory();
 
         if (isset($config['use_authorize']) && true === (bool) $config['use_authorize']) {
-            $token = $tokenFactory->createAuthorizeToken(
-                $gatewayConfig->getGatewayName(),
-                $payment,
-                $redirectOptions['route'] ?? null,
-                $redirectOptions['parameters'] ?? [],
-            );
-        } else {
-            $token = $tokenFactory->createCaptureToken(
+            return $tokenFactory->createAuthorizeToken(
                 $gatewayConfig->getGatewayName(),
                 $payment,
                 $redirectOptions['route'] ?? null,
@@ -102,7 +95,12 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
             );
         }
 
-        return $token;
+        return $tokenFactory->createCaptureToken(
+            $gatewayConfig->getGatewayName(),
+            $payment,
+            $redirectOptions['route'] ?? null,
+            $redirectOptions['parameters'] ?? [],
+        );
     }
 
     private function getPaymentFromOrder(OrderInterface $order): ?PaymentInterface

From 55c8043dcce6d6058ffb57ce17825b98ce8b8dca Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Aug 2024 22:47:01 +0200
Subject: [PATCH 128/200] Format new line

Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
---
 .../Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php
index d4b875441a..66b8b8f5ab 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php
@@ -34,6 +34,7 @@ final class DefaultPayResponseProvider implements PayResponseProviderInterface
 
         return new RedirectResponse($url);
     }
+    
     public function supports(
         RequestConfiguration $requestConfiguration,
         OrderInterface $order

From 46e7bcc3ca0d175beeeb55295010b0dd8841c3b0 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Aug 2024 22:47:23 +0200
Subject: [PATCH 129/200] Explicit assert

Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
---
 .../Bundle/ShopBundle/Provider/PayumPayResponseProvider.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
index 1bb03d3ea8..d21f731f37 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
@@ -37,7 +37,7 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
         OrderInterface $order
     ): Response {
         $payment = $this->getPaymentFromOrder($order);
-        Assert::notNull($payment, 'An existing payment with state "new" must exist.');
+        Assert::notNull($payment, sprintf('Order (id %s) must have last payment in state "new".', $order->getId());
 
         $redirectOptions = $requestConfiguration->getParameters()->get('redirect');
         if (is_string($redirectOptions)) {

From f204d119b536a0f9cd490b32b8815861552e8813 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Aug 2024 22:47:41 +0200
Subject: [PATCH 130/200] Format new line

Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
---
 .../ShopBundle/Provider/PaymentRequestPayResponseProvider.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
index 13c0bf9145..2cb94e7060 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
@@ -25,6 +25,7 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
     ): Response {
         return new Response('', Response::HTTP_NO_CONTENT);
     }
+    
     public function supports(
         RequestConfiguration $requestConfiguration,
         OrderInterface $order

From 6b2177b507c9f2e38d458976aa20967c5d4852af Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 28 Aug 2024 22:51:21 +0200
Subject: [PATCH 131/200] Simplify gateway check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
---
 .../ShopBundle/Provider/PayumPayResponseProvider.php      | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
index d21f731f37..6cdee5cbf8 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
@@ -66,13 +66,7 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
 
         $gatewayName = $gatewayConfig->getGatewayName() ?? '';
 
-        try {
-            $this->payum->getGateway($gatewayName);
-        } catch (InvalidArgumentException) {
-            return false;
-        }
-
-        return true;
+		return isset($this->payum->getGateways()[$gatewayName]);
     }
 
     /**

From ab16307e7f6917d0dd3685a3bc57df917b6bd17f Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 29 Aug 2024 00:06:14 +0300
Subject: [PATCH 132/200] Remove default response provider and introduce
 LogicException instead

---
 .../Bundle/ShopBundle/Controller/OrderPayController.php  | 4 ++--
 ...onseProvider.php => NoPaymentPayResponseProvider.php} | 9 ++++++---
 .../ShopBundle/Resources/config/services/controller.xml  | 1 -
 .../ShopBundle/Resources/config/services/providers.xml   | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename src/Sylius/Bundle/ShopBundle/Provider/{DefaultPayResponseProvider.php => NoPaymentPayResponseProvider.php} (81%)

diff --git a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php b/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
index d158b3ba77..3e634f1ff2 100644
--- a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
+++ b/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ShopBundle\Controller;
 
+use LogicException;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface;
 use Sylius\Bundle\ShopBundle\Provider\PayResponseProviderInterface;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -33,7 +34,6 @@ final class OrderPayController
         private MetadataInterface $orderMetadata,
         private RequestConfigurationFactoryInterface $requestConfigurationFactory,
         private iterable $payResponseProviders,
-        private PayResponseProviderInterface $defaultPayResponseProvider,
     ) {
     }
 
@@ -56,6 +56,6 @@ final class OrderPayController
             }
         }
 
-        return $this->defaultPayResponseProvider->getResponse($configuration, $order);
+        throw new LogicException(sprintf('No "pay response provider" available for order (id %s).',  $order->getId()));
     }
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
similarity index 81%
rename from src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php
rename to src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
index 66b8b8f5ab..bd449ad542 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/DefaultPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
@@ -15,11 +15,12 @@ namespace Sylius\Bundle\ShopBundle\Provider;
 
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Payment\Model\PaymentInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
 
-final class DefaultPayResponseProvider implements PayResponseProviderInterface
+final class NoPaymentPayResponseProvider implements PayResponseProviderInterface
 {
     public function __construct(
         private RouterInterface $router,
@@ -34,11 +35,13 @@ final class DefaultPayResponseProvider implements PayResponseProviderInterface
 
         return new RedirectResponse($url);
     }
-    
+
     public function supports(
         RequestConfiguration $requestConfiguration,
         OrderInterface $order
     ): bool {
-        return true;
+        $payment = $order->getLastPayment(PaymentInterface::STATE_NEW);
+
+        return null === $payment;
     }
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
index fcc16fd90e..d7af5faa31 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
@@ -65,7 +65,6 @@
             </argument>
             <argument type="service" id="sylius.resource_controller.request_configuration_factory" />
             <argument type="tagged" tag="sylius.shop.provider.pay_response" />
-            <argument type="service" id="sylius.shop.provider.pay_response.default" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
index 06053cac32..af442e3572 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
@@ -17,7 +17,7 @@
 >
     <services>
 
-        <service id="sylius.shop.provider.pay_response.default" class="Sylius\Bundle\ShopBundle\Provider\DefaultPayResponseProvider">
+        <service id="sylius.shop.provider.pay_response.no_payment" class="Sylius\Bundle\ShopBundle\Provider\NoPaymentPayResponseProvider">
             <argument type="service" id="router" />
             <tag name="sylius.shop.provider.pay_response" priority="-300" />
         </service>

From 597cd9be5578bf9f32425a68cf4d0ded4f935e08 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 29 Aug 2024 00:06:48 +0300
Subject: [PATCH 133/200] Fix typo and shorten return

---
 .../ShopBundle/Provider/PayumPayResponseProvider.php     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
index 6cdee5cbf8..ae726cfef6 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ShopBundle\Provider;
 
-use Payum\Core\Exception\InvalidArgumentException;
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
@@ -37,7 +36,7 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
         OrderInterface $order
     ): Response {
         $payment = $this->getPaymentFromOrder($order);
-        Assert::notNull($payment, sprintf('Order (id %s) must have last payment in state "new".', $order->getId());
+        Assert::notNull($payment, sprintf('Order (id %s) must have last payment in state "new".', $order->getId()));
 
         $redirectOptions = $requestConfiguration->getParameters()->get('redirect');
         if (is_string($redirectOptions)) {
@@ -110,10 +109,6 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
         }
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
-        if (null === $gatewayConfig) {
-            return null;
-        }
-
-        return $gatewayConfig;
+        return $gatewayConfig ?? null;
     }
 }

From dae0ae907226fa067c144d7f2dc775531abe93d1 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 2 Sep 2024 20:10:59 +0300
Subject: [PATCH 134/200] Refactor and enhance thrown message

---
 .../CommandProvider/ActionsCommandProvider.php        | 11 ++++++++---
 .../CommandProvider/GatewayFactoryCommandProvider.php |  9 +++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
index 96ff0b3ef2..6413ea6ec4 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
@@ -26,7 +26,8 @@ final class ActionsCommandProvider implements ServiceProviderAwareCommandProvide
 
     public function supports(PaymentRequestInterface $paymentRequest): bool
     {
-        $commandProvider = $this->locator->get($paymentRequest->getAction());
+        $action = $paymentRequest->getAction();
+        $commandProvider = $this->getCommandProvider($action);
         if (null === $commandProvider) {
             return false;
         }
@@ -36,9 +37,13 @@ final class ActionsCommandProvider implements ServiceProviderAwareCommandProvide
 
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
-        $commandProvider = $this->locator->get($paymentRequest->getAction());
+        $action = $paymentRequest->getAction();
+        $commandProvider = $this->locator->get($action);
         if (null === $commandProvider) {
-            throw new PaymentRequestNotSupportedException();
+            throw new PaymentRequestNotSupportedException(sprintf(
+                'No payment request command provider supported for this action "%s".',
+                $action
+            ));
         }
 
         return $commandProvider->provide($paymentRequest);
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
index 575a8c2693..1229a8237e 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
@@ -51,7 +51,10 @@ final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommand
         $factoryName = $this->getFactoryName($paymentRequest);
         $commandProvider = $this->getCommandProvider($factoryName);
         if (null === $commandProvider) {
-            throw new PaymentRequestNotSupportedException();
+            throw new PaymentRequestNotSupportedException(sprintf(
+                'No payment request command provider supported for for the payment method factory name "%s".',
+                $factoryName
+            ));
         }
 
         return $commandProvider->provide($paymentRequest);
@@ -72,8 +75,6 @@ final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommand
         /** @var PaymentMethodInterface $paymentMethod */
         $paymentMethod = $paymentRequest->getMethod();
 
-        $factoryName = $this->gatewayFactoryNameProvider->provide($paymentMethod);
-
-        return $factoryName;
+        return $this->gatewayFactoryNameProvider->provide($paymentMethod);
     }
 }

From bcc8155a726124d68b0a5604fd0799586be29259 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 2 Sep 2024 20:17:06 +0300
Subject: [PATCH 135/200] Add PaymentRequest HttpResponseProviders

---
 .../Provider/ActionsHttpResponseProvider.php  | 66 ++++++++++++++++
 .../GatewayFactoryHttpResponseProvider.php    | 79 +++++++++++++++++++
 .../HttpResponseProviderInterface.php         | 33 ++++++++
 .../ServiceProviderAwareProviderInterface.php | 24 ++++++
 .../services/payment_request/providers.xml    |  5 ++
 5 files changed, 207 insertions(+)
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
new file mode 100644
index 0000000000..667c820b0f
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+
+final class ActionsHttpResponseProvider implements ServiceProviderAwareProviderInterface
+{
+    public function __construct(
+        private ServiceProviderInterface $locator,
+    ) {
+    }
+
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): Response {
+        $action = $paymentRequest->getAction();
+        $httpResponseProvider = $this->getHttpResponseProvider($action);
+        if (null === $httpResponseProvider) {
+            throw new PaymentRequestNotSupportedException(sprintf(
+                'No payment request HTTP Response provider supported for this action "%s".',
+                $action
+            ));
+        }
+
+        return $httpResponseProvider->getResponse($requestConfiguration, $paymentRequest);
+    }
+
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): bool {
+        $action = $paymentRequest->getAction();
+        $httpResponseProvider = $this->getHttpResponseProvider($action);
+        if (null === $httpResponseProvider) {
+            return false;
+        }
+
+        return $httpResponseProvider->supports($requestConfiguration, $paymentRequest);
+    }
+
+    public function getProviderIndex(): array {
+        return $this->locator->getProvidedServices();
+    }
+
+    public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface
+    {
+        return $this->locator->get($index);
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
new file mode 100644
index 0000000000..e1ff5582bb
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+
+final class GatewayFactoryHttpResponseProvider implements ServiceProviderAwareProviderInterface
+{
+    public function __construct(
+        private GatewayFactoryNameProviderInterface $gatewayFactoryNameProvider,
+        private ServiceProviderInterface $locator,
+    ) {
+    }
+
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): Response {
+        $factoryName = $this->getFactoryName($paymentRequest);
+
+        $httpResponseProvider = $this->getHttpResponseProvider($factoryName);
+
+        if (null === $httpResponseProvider) {
+            throw new PaymentRequestNotSupportedException(sprintf(
+                'No payment request HTTP Response provider supported for the payment method factory name "%s".',
+                $factoryName
+            ));
+        }
+
+        return $httpResponseProvider->getResponse($requestConfiguration, $paymentRequest);
+    }
+
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): bool {
+        $factoryName = $this->getFactoryName($paymentRequest);
+        $httpResponseProvider = $this->getHttpResponseProvider($factoryName);
+
+        if (null === $httpResponseProvider) {
+            return false;
+        }
+
+        return $httpResponseProvider->supports($requestConfiguration, $paymentRequest);
+    }
+
+    public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface
+    {
+        return $this->locator->get($index);
+    }
+
+    public function getProviderIndex(): array {
+        return $this->locator->getProvidedServices();
+    }
+
+    private function getFactoryName(PaymentRequestInterface $paymentRequest): string
+    {
+        /** @var PaymentMethodInterface $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+
+        return $this->gatewayFactoryNameProvider->provide($paymentMethod);
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
new file mode 100644
index 0000000000..8d83556654
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Flux:: shop sources.
+ * COPYRIGHT (C) 2024, HARMAN INTERNATIONAL. ALL RIGHTS RESERVED.
+ * -----------------------------------------------------------------------------
+ * CONFIDENTIAL: NO PART OF THIS DOCUMENT MAY BE REPRODUCED IN ANY FORM WITHOUT THE
+ * EXPRESSED WRITTEN PERMISSION OF HARMAN INTERNATIONAL.
+ * DO NOT DISCLOSE ANY INFORMATION CONTAINED IN THIS DOCUMENT TO ANY THIRD-PARTY
+ * WITHOUT THE PRIOR WRITTEN CONSENT OF HARMAN INTERNATIONAL.
+ *
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+interface HttpResponseProviderInterface
+{
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): Response;
+
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): bool;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php
new file mode 100644
index 0000000000..595b6ae53d
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Flux:: shop sources.
+ * COPYRIGHT (C) 2024, HARMAN INTERNATIONAL. ALL RIGHTS RESERVED.
+ * -----------------------------------------------------------------------------
+ * CONFIDENTIAL: NO PART OF THIS DOCUMENT MAY BE REPRODUCED IN ANY FORM WITHOUT THE
+ * EXPRESSED WRITTEN PERMISSION OF HARMAN INTERNATIONAL.
+ * DO NOT DISCLOSE ANY INFORMATION CONTAINED IN THIS DOCUMENT TO ANY THIRD-PARTY
+ * WITHOUT THE PRIOR WRITTEN CONSENT OF HARMAN INTERNATIONAL.
+ *
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+interface ServiceProviderAwareProviderInterface extends HttpResponseProviderInterface
+{
+    public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface;
+
+    /** @return string[] */
+    public function getProviderIndex(): array;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
index 8ba2227b76..af297aaca5 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
@@ -23,5 +23,10 @@
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProvider">
             <argument type="service" id="sylius.repository.payment_request" />
         </service>
+
+        <service id="sylius.payment_request.provider.http_response.gateway_factory" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryHttpResponseProvider">
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProviderInterface" />
+            <argument type="tagged_locator" tag="sylius.payment_request.http_response.provider" index-by="gateway-factory" />
+        </service>
     </services>
 </container>

From 416021d1bb6031764bc1dad411a3b307fa7ea15f Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 2 Sep 2024 20:17:42 +0300
Subject: [PATCH 136/200] Add PaymentToPayResolver to get the last payment via
 a service

---
 .../Resolver/PaymentToPayResolver.php         | 29 +++++++++++++++++++
 .../PaymentToPayResolverInterface.php         | 24 +++++++++++++++
 .../Resources/config/services/resolvers.xml   | 25 ++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolver.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml

diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolver.php b/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolver.php
new file mode 100644
index 0000000000..2e928ef973
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolver.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Resolver;
+
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
+
+final class PaymentToPayResolver implements PaymentToPayResolverInterface
+{
+    public function __construct(
+        private string $state,
+    ) {
+    }
+
+    public function getLastPayment(OrderInterface $order): ?PaymentInterface {
+        return $order->getLastPayment($this->state);
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php b/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php
new file mode 100644
index 0000000000..f9b69289e0
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Flux:: shop sources.
+ * COPYRIGHT (C) 2024, HARMAN INTERNATIONAL. ALL RIGHTS RESERVED.
+ * -----------------------------------------------------------------------------
+ * CONFIDENTIAL: NO PART OF THIS DOCUMENT MAY BE REPRODUCED IN ANY FORM WITHOUT THE
+ * EXPRESSED WRITTEN PERMISSION OF HARMAN INTERNATIONAL.
+ * DO NOT DISCLOSE ANY INFORMATION CONTAINED IN THIS DOCUMENT TO ANY THIRD-PARTY
+ * WITHOUT THE PRIOR WRITTEN CONSENT OF HARMAN INTERNATIONAL.
+ *
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Resolver;
+
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
+
+interface PaymentToPayResolverInterface
+{
+    public function getLastPayment(OrderInterface $order): ?PaymentInterface;
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
new file mode 100644
index 0000000000..17ebc847c4
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
@@ -0,0 +1,25 @@
+<?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>
+
+        <service id="sylius.shop.resolver.payment_to_pay" class="Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolver">
+            <argument type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_NEW</argument>
+        </service>
+
+    </services>
+</container>

From 72529811772219d8dc052292a3b841029da0a881 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 3 Sep 2024 10:20:54 +0300
Subject: [PATCH 137/200] Add payment request http response provider

---
 .../Provider/NoPaymentPayResponseProvider.php |  6 +--
 .../PaymentRequestPayResponseProvider.php     | 40 ++++++++++++++++++-
 .../Provider/PayumPayResponseProvider.php     | 12 ++----
 .../ShopBundle/Resources/config/services.xml  |  1 +
 .../Resources/config/services/providers.xml   | 17 +++++---
 5 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
index bd449ad542..228642132e 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ShopBundle\Provider;
 
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolverInterface;
 use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Payment\Model\PaymentInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
@@ -23,6 +23,7 @@ use Symfony\Component\Routing\RouterInterface;
 final class NoPaymentPayResponseProvider implements PayResponseProviderInterface
 {
     public function __construct(
+        private PaymentToPayResolverInterface $paymentToPayResolver,
         private RouterInterface $router,
     ) {
     }
@@ -40,8 +41,7 @@ final class NoPaymentPayResponseProvider implements PayResponseProviderInterface
         RequestConfiguration $requestConfiguration,
         OrderInterface $order
     ): bool {
-        $payment = $order->getLastPayment(PaymentInterface::STATE_NEW);
-
+        $payment = $this->paymentToPayResolver->getLastPayment($order);
         return null === $payment;
     }
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
index 2cb94e7060..4188e4848b 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
@@ -13,19 +13,55 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\ShopBundle\Provider;
 
+use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolverInterface;
 use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\RouterInterface;
+use Webmozart\Assert\Assert;
+
+use function sprintf;
 
 final class PaymentRequestPayResponseProvider implements PayResponseProviderInterface
 {
+    public function __construct(
+        private PaymentToPayResolverInterface $paymentToPayResolver,
+        private PaymentRequestFactoryInterface $paymentRequestFactory,
+        private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
+        private ServiceProviderAwareProviderInterface $httpResponseProvider,
+        private RouterInterface $router,
+    ) {
+    }
+
     public function getResponse(
         RequestConfiguration $requestConfiguration,
         OrderInterface $order
     ): Response {
-        return new Response('', Response::HTTP_NO_CONTENT);
+        $payment = $this->paymentToPayResolver->getLastPayment($order);
+        Assert::notNull($payment, sprintf('Order (id %s) must have last payment in state "new".', $order->getId()));
+
+        $paymentMethod = $payment->getMethod();
+        Assert::notNull($paymentMethod, sprintf('Payment (id %s) must have payment method.', $payment->getId()));
+
+        $paymentRequest = $this->paymentRequestFactory->create($payment, $paymentMethod);
+
+        $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
+
+        if ($this->httpResponseProvider->supports($requestConfiguration, $paymentRequest)) {
+            return $this->httpResponseProvider->getResponse($requestConfiguration, $paymentRequest);
+        }
+
+        $url = $this->router->generate('sylius_shop_order_after_pay', [
+            'tokenValue' => $order->getTokenValue(),
+        ]);
+
+        return new RedirectResponse($url);
     }
-    
+
     public function supports(
         RequestConfiguration $requestConfiguration,
         OrderInterface $order
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
index ae726cfef6..0c674f657a 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
@@ -16,10 +16,10 @@ namespace Sylius\Bundle\ShopBundle\Provider;
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolverInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\GatewayConfigInterface;
-use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Webmozart\Assert\Assert;
@@ -28,6 +28,7 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
 {
     public function __construct(
         private Payum $payum,
+        private PaymentToPayResolverInterface $paymentToPayResolver,
     ) {
     }
 
@@ -35,7 +36,7 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
         RequestConfiguration $requestConfiguration,
         OrderInterface $order
     ): Response {
-        $payment = $this->getPaymentFromOrder($order);
+        $payment = $this->paymentToPayResolver->getLastPayment($order);
         Assert::notNull($payment, sprintf('Order (id %s) must have last payment in state "new".', $order->getId()));
 
         $redirectOptions = $requestConfiguration->getParameters()->get('redirect');
@@ -53,7 +54,7 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
         OrderInterface $order
     ): bool {
 
-        $payment = $this->getPaymentFromOrder($order);
+        $payment = $this->paymentToPayResolver->getLastPayment($order);
         if (null === $payment) {
             return false;
         }
@@ -96,11 +97,6 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
         );
     }
 
-    private function getPaymentFromOrder(OrderInterface $order): ?PaymentInterface
-    {
-        return $order->getLastPayment(BasePaymentInterface::STATE_NEW);
-    }
-
     private function getGatewayConfigFromPayment(PaymentInterface $payment): ?GatewayConfigInterface
     {
         $paymentMethod = $payment->getMethod();
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
index 4f29076dd3..6b42ea205f 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
@@ -18,6 +18,7 @@
         <import resource="services/listeners.xml" />
         <import resource="services/menu.xml" />
         <import resource="services/providers.xml" />
+        <import resource="services/resolvers.xml" />
         <import resource="services/twig.xml" />
     </imports>
     <services>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
index af442e3572..024d4640d4 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
@@ -17,17 +17,24 @@
 >
     <services>
 
-        <service id="sylius.shop.provider.pay_response.no_payment" class="Sylius\Bundle\ShopBundle\Provider\NoPaymentPayResponseProvider">
-            <argument type="service" id="router" />
+        <service id="sylius.shop.provider.pay_response.payum" class="Sylius\Bundle\ShopBundle\Provider\PayumPayResponseProvider">
+            <argument type="service" id="payum" />
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
             <tag name="sylius.shop.provider.pay_response" priority="-300" />
         </service>
 
-        <service id="sylius.shop.provider.pay_response.payum" class="Sylius\Bundle\ShopBundle\Provider\PayumPayResponseProvider">
-            <argument type="service" id="payum" />
+        <service id="sylius.shop.provider.pay_response.payment_request" class="Sylius\Bundle\ShopBundle\Provider\PaymentRequestPayResponseProvider">
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <argument type="service" id="sylius.factory.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
+            <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
+            <argument type="service" id="router" />
             <tag name="sylius.shop.provider.pay_response" priority="-200" />
         </service>
 
-        <service id="sylius.shop.provider.pay_response.payment_request" class="Sylius\Bundle\ShopBundle\Provider\PaymentRequestPayResponseProvider">
+        <service id="sylius.shop.provider.pay_response.no_payment" class="Sylius\Bundle\ShopBundle\Provider\NoPaymentPayResponseProvider">
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <argument type="service" id="router" />
             <tag name="sylius.shop.provider.pay_response" priority="-100" />
         </service>
 

From 7d081266d1ad3cc531c054c33a12b0f5ec67769d Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 3 Sep 2024 10:21:58 +0300
Subject: [PATCH 138/200] Add order tokenValue to the after pay route

---
 src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
index 0bb19bef57..bbdfdd4c45 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
@@ -19,7 +19,7 @@ sylius_shop_order_pay:
                 route: sylius_shop_order_after_pay
 
 sylius_shop_order_after_pay:
-    path: /after-pay
+    path: /{tokenValue?}/after-pay
     methods: [GET, POST]
     defaults:
         _controller: sylius.controller.payum::afterCaptureAction

From 3cd5265ff0de75198fc79b2730a4513ea567bfa4 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:53:33 +0300
Subject: [PATCH 139/200] Specify type

---
 .../PaymentRequest/Provider/ActionsHttpResponseProvider.php    | 3 +++
 .../Provider/GatewayFactoryHttpResponseProvider.php            | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
index 667c820b0f..26e9d0b677 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
@@ -21,6 +21,9 @@ use Symfony\Contracts\Service\ServiceProviderInterface;
 
 final class ActionsHttpResponseProvider implements ServiceProviderAwareProviderInterface
 {
+    /**
+     * @param ServiceProviderInterface<HttpResponseProviderInterface> $locator
+     */
     public function __construct(
         private ServiceProviderInterface $locator,
     ) {
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
index e1ff5582bb..73d977fae0 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
@@ -22,6 +22,9 @@ use Symfony\Contracts\Service\ServiceProviderInterface;
 
 final class GatewayFactoryHttpResponseProvider implements ServiceProviderAwareProviderInterface
 {
+    /**
+     * @param ServiceProviderInterface<HttpResponseProviderInterface> $locator
+     */
     public function __construct(
         private GatewayFactoryNameProviderInterface $gatewayFactoryNameProvider,
         private ServiceProviderInterface $locator,

From f790c3adb65eb7663794ba07bed3c38348799169 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:55:20 +0300
Subject: [PATCH 140/200] Move payum controller body to a dedicated service

---
 .../Resources/config/services/controller.xml  | 16 ---------
 .../Handler/PaymentStatusFlashHandler.php     | 31 ++++++++++++++++
 .../PaymentStatusFlashHandlerInterface.php    | 23 ++++++++++++
 .../AfterPayResponseProviderInterface.php     | 25 +++++++++++++
 .../PayumAfterPayResponseProvider.php}        | 36 +++++++++++--------
 5 files changed, 101 insertions(+), 30 deletions(-)
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
 create mode 100644 src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandler.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandlerInterface.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/AfterPayResponseProviderInterface.php
 rename src/Sylius/Bundle/{PayumBundle/Controller/PayumController.php => ShopBundle/Provider/PayumAfterPayResponseProvider.php} (59%)

diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
deleted file mode 100644
index 9ead44adac..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-
-<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.controller.payum" class="Sylius\Bundle\PayumBundle\Controller\PayumController" public="true">
-            <argument type="service" id="payum" />
-            <argument type="service" id="router" />
-            <argument type="service" id="sylius.factory.payum_get_status_action" />
-            <argument type="service" id="sylius.factory.payum_resolve_next_route" />
-        </service>
-    </services>
-</container>
diff --git a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandler.php b/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandler.php
new file mode 100644
index 0000000000..7d9b72f4ff
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandler.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Handler;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Payment\Model\PaymentInterface;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+
+final class PaymentStatusFlashHandler implements PaymentStatusFlashHandlerInterface
+{
+    public function handle(RequestConfiguration $requestConfiguration, string $status): void
+    {
+        $request = $requestConfiguration->getRequest();
+        if (PaymentInterface::STATE_NEW !== $status) {
+            /** @var FlashBagInterface $flashBag */
+            $flashBag = $request->getSession()->getBag('flashes');
+            $flashBag->add('info', sprintf('sylius.payment.%s', $status));
+        }
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandlerInterface.php b/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandlerInterface.php
new file mode 100644
index 0000000000..a43e3ed427
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandlerInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Handler;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Core\Model\OrderInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+interface PaymentStatusFlashHandlerInterface
+{
+    public function handle(RequestConfiguration $requestConfiguration, string $status): void;
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/AfterPayResponseProviderInterface.php b/src/Sylius/Bundle/ShopBundle/Provider/AfterPayResponseProviderInterface.php
new file mode 100644
index 0000000000..e37a89cc7f
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/AfterPayResponseProviderInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Core\Model\OrderInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+interface AfterPayResponseProviderInterface
+{
+    public function getResponse(RequestConfiguration $requestConfiguration): Response;
+
+    public function supports(RequestConfiguration $requestConfiguration): bool;
+}
diff --git a/src/Sylius/Bundle/PayumBundle/Controller/PayumController.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php
similarity index 59%
rename from src/Sylius/Bundle/PayumBundle/Controller/PayumController.php
rename to src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php
index 3afb222fc9..023fcc40cd 100644
--- a/src/Sylius/Bundle/PayumBundle/Controller/PayumController.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\PayumBundle\Controller;
+namespace Sylius\Bundle\ShopBundle\Provider;
 
 use Payum\Core\Payum;
 use Payum\Core\Request\Generic;
@@ -19,43 +19,51 @@ use Payum\Core\Request\GetStatusInterface;
 use Payum\Core\Security\HttpRequestVerifierInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactoryInterface;
-use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Bundle\ShopBundle\Handler\PaymentStatusFlashHandlerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\Routing\RouterInterface;
 
-final class PayumController
+final class PayumAfterPayResponseProvider implements AfterPayResponseProviderInterface
 {
     public function __construct(
         private Payum $payum,
         private RouterInterface $router,
         private GetStatusFactoryInterface $getStatusRequestFactory,
         private ResolveNextRouteFactoryInterface $resolveNextRouteRequestFactory,
+        private PaymentStatusFlashHandlerInterface $paymentStatusFlashHandler,
     ) {
     }
 
-    public function afterCaptureAction(Request $request): Response
+    public function getResponse(RequestConfiguration $requestConfiguration): Response
     {
-        $token = $this->getHttpRequestVerifier()->verify($request);
+        $token = $this->getHttpRequestVerifier()->verify($requestConfiguration->getRequest());
 
-        /** @var Generic&GetStatusInterface $status */
+        /** @var GetStatusInterface&Generic $status */
         $status = $this->getStatusRequestFactory->createNewWithModel($token);
         $this->payum->getGateway($token->getGatewayName())->execute($status);
 
         $resolveNextRoute = $this->resolveNextRouteRequestFactory->createNewWithModel($status->getFirstModel());
         $this->payum->getGateway($token->getGatewayName())->execute($resolveNextRoute);
 
+        $this->paymentStatusFlashHandler->handle($requestConfiguration, (string) $status->getValue());
+
+        $url = $this->router->generate(
+            $resolveNextRoute->getRouteName(),
+            $resolveNextRoute->getRouteParameters()
+        );
+
         $this->getHttpRequestVerifier()->invalidate($token);
 
-        if (PaymentInterface::STATE_NEW !== $status->getValue()) {
-            /** @var FlashBagInterface $flashBag */
-            $flashBag = $request->getSession()->getBag('flashes');
-            $flashBag->add('info', sprintf('sylius.payment.%s', $status->getValue()));
-        }
+        return new RedirectResponse($url);
+    }
+    public function supports(RequestConfiguration $requestConfiguration): bool
+    {
+        $request = $requestConfiguration->getRequest();
+        $hash = $request->attributes->get('payum_token', $request->get('payum_token', false));
 
-        return new RedirectResponse($this->router->generate($resolveNextRoute->getRouteName(), $resolveNextRoute->getRouteParameters()));
+		return false !== $hash;
     }
 
     private function getHttpRequestVerifier(): HttpRequestVerifierInterface

From e01567955ac019c2761a9bccde98b30f1053499d Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:56:12 +0300
Subject: [PATCH 141/200] Create new controller action to replace the payum
 after capture one

---
 .../Controller/OrderPayController.php         | 23 ++++++++++++++++++-
 .../Resources/config/routing/order.yml        |  4 ++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php b/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
index 3e634f1ff2..b960c32297 100644
--- a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
+++ b/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
@@ -14,26 +14,34 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ShopBundle\Controller;
 
 use LogicException;
+use Payum\Core\Request\Generic;
+use Payum\Core\Request\GetStatusInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface;
+use Sylius\Bundle\ShopBundle\Provider\AfterPayResponseProviderInterface;
 use Sylius\Bundle\ShopBundle\Provider\PayResponseProviderInterface;
 use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Order\Repository\OrderRepositoryInterface;
 use Sylius\Component\Resource\Metadata\MetadataInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 final class OrderPayController
 {
     /**
-     * @param iterable<PayResponseProviderInterface> $payResponseProviders
      * @param OrderRepositoryInterface<OrderInterface> $orderRepository
+     * @param iterable<PayResponseProviderInterface> $payResponseProviders
+     * @param iterable<AfterPayResponseProviderInterface> $afterPayResponseProviders
      */
     public function __construct(
         private OrderRepositoryInterface $orderRepository,
         private MetadataInterface $orderMetadata,
         private RequestConfigurationFactoryInterface $requestConfigurationFactory,
         private iterable $payResponseProviders,
+        private iterable $afterPayResponseProviders,
     ) {
     }
 
@@ -58,4 +66,17 @@ final class OrderPayController
 
         throw new LogicException(sprintf('No "pay response provider" available for order (id %s).',  $order->getId()));
     }
+
+    public function afterPayAction(Request $request): Response
+    {
+        $configuration = $this->requestConfigurationFactory->create($this->orderMetadata, $request);
+
+        foreach ($this->afterPayResponseProviders as $provider) {
+            if ($provider->supports($configuration)) {
+                return $provider->getResponse($configuration);
+            }
+        }
+
+        throw new LogicException(sprintf('No "after pay response provider" available.'));
+    }
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
index bbdfdd4c45..b6b2b466b7 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
@@ -19,10 +19,10 @@ sylius_shop_order_pay:
                 route: sylius_shop_order_after_pay
 
 sylius_shop_order_after_pay:
-    path: /{tokenValue?}/after-pay
+    path: /{hash?}/after-pay
     methods: [GET, POST]
     defaults:
-        _controller: sylius.controller.payum::afterCaptureAction
+        _controller: sylius.controller.shop.order_pay::afterPayAction
 
 sylius_shop_order_show:
     path: /{tokenValue}

From e7e162b7564544e1d8306e887a99b27bce9b0e41 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:57:11 +0300
Subject: [PATCH 142/200] Change tokenValue to payment request hash

---
 .../Provider/PaymentRequestPayResponseProvider.php          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
index 4188e4848b..da02c7ad30 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
@@ -19,6 +19,7 @@ use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolverInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
@@ -28,6 +29,9 @@ use function sprintf;
 
 final class PaymentRequestPayResponseProvider implements PayResponseProviderInterface
 {
+    /**
+     * @param PaymentRequestFactoryInterface<PaymentRequestInterface> $paymentRequestFactory
+     */
     public function __construct(
         private PaymentToPayResolverInterface $paymentToPayResolver,
         private PaymentRequestFactoryInterface $paymentRequestFactory,
@@ -56,7 +60,7 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
         }
 
         $url = $this->router->generate('sylius_shop_order_after_pay', [
-            'tokenValue' => $order->getTokenValue(),
+            'hash' => $paymentRequest->getId(),
         ]);
 
         return new RedirectResponse($url);

From 1b4679ef8b0b610c54fd9865b553e624dfe384d4 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 13:02:39 +0300
Subject: [PATCH 143/200] Introduce PaymentRequest after pay

---
 ...ndler.php => PaymentStateFlashHandler.php} |  8 +-
 ... => PaymentStateFlashHandlerInterface.php} |  4 +-
 ...PaymentRequestAfterPayResponseProvider.php | 81 +++++++++++++++++++
 .../PayumAfterPayResponseProvider.php         |  4 +-
 .../Resolver/AfterPayNextResponseResolver.php | 54 +++++++++++++
 .../AfterPayNextResponseResolverInterface.php | 28 +++++++
 .../ShopBundle/Resources/config/services.xml  |  1 +
 .../Resources/config/services/controller.xml  |  1 +
 .../Resources/config/services/handlers.xml    | 23 ++++++
 .../Resources/config/services/providers.xml   | 19 +++++
 .../Resources/config/services/resolvers.xml   |  4 +
 11 files changed, 219 insertions(+), 8 deletions(-)
 rename src/Sylius/Bundle/ShopBundle/Handler/{PaymentStatusFlashHandler.php => PaymentStateFlashHandler.php} (81%)
 rename src/Sylius/Bundle/ShopBundle/Handler/{PaymentStatusFlashHandlerInterface.php => PaymentStateFlashHandlerInterface.php} (87%)
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolver.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resources/config/services/handlers.xml

diff --git a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandler.php b/src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandler.php
similarity index 81%
rename from src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandler.php
rename to src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandler.php
index 7d9b72f4ff..e695956533 100644
--- a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandler.php
+++ b/src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandler.php
@@ -17,15 +17,15 @@ use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Payment\Model\PaymentInterface;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 
-final class PaymentStatusFlashHandler implements PaymentStatusFlashHandlerInterface
+final class PaymentStateFlashHandler implements PaymentStateFlashHandlerInterface
 {
-    public function handle(RequestConfiguration $requestConfiguration, string $status): void
+    public function handle(RequestConfiguration $requestConfiguration, string $state): void
     {
         $request = $requestConfiguration->getRequest();
-        if (PaymentInterface::STATE_NEW !== $status) {
+        if (PaymentInterface::STATE_NEW !== $state) {
             /** @var FlashBagInterface $flashBag */
             $flashBag = $request->getSession()->getBag('flashes');
-            $flashBag->add('info', sprintf('sylius.payment.%s', $status));
+            $flashBag->add('info', sprintf('sylius.payment.%s', $state));
         }
     }
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandlerInterface.php b/src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandlerInterface.php
similarity index 87%
rename from src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandlerInterface.php
rename to src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandlerInterface.php
index a43e3ed427..c835a492a2 100644
--- a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStatusFlashHandlerInterface.php
+++ b/src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandlerInterface.php
@@ -17,7 +17,7 @@ use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Core\Model\OrderInterface;
 use Symfony\Component\HttpFoundation\Response;
 
-interface PaymentStatusFlashHandlerInterface
+interface PaymentStateFlashHandlerInterface
 {
-    public function handle(RequestConfiguration $requestConfiguration, string $status): void;
+    public function handle(RequestConfiguration $requestConfiguration, string $state): void;
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
new file mode 100644
index 0000000000..028877a217
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider;
+
+use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Bundle\ShopBundle\Handler\PaymentStateFlashHandlerInterface;
+use Sylius\Bundle\ShopBundle\Resolver\AfterPayNextResponseResolverInterface;
+use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Webmozart\Assert\Assert;
+
+use function sprintf;
+
+final class PaymentRequestAfterPayResponseProvider implements AfterPayResponseProviderInterface
+{
+    /**
+     * @param PaymentRequestFactoryInterface<PaymentRequestInterface> $paymentRequestFactory
+     * @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository
+     */
+    public function __construct(
+        private PaymentRequestFactoryInterface $paymentRequestFactory,
+        private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
+        private ServiceProviderAwareProviderInterface $httpResponseProvider,
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private PaymentStateFlashHandlerInterface $paymentStateFlashHandler,
+        private AfterPayNextResponseResolverInterface $afterPayNextResponseResolver,
+    ) {
+    }
+
+    public function getResponse(RequestConfiguration $requestConfiguration): Response
+    {
+        $hash = $this->getPaymentRequestHash($requestConfiguration);
+        Assert::notNull($hash, 'A request attribute "hash" is required to retrieve the related order.');
+
+        $paymentRequest = $this->paymentRequestRepository->find($hash);
+        if (null === $paymentRequest) {
+            throw new NotFoundHttpException(sprintf('The Payment Request with hash "%s" does not exist.', $hash));
+        }
+
+        $statusPaymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($paymentRequest);
+        $statusPaymentRequest->setAction(PaymentRequestInterface::ACTION_STATUS);
+
+        $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($statusPaymentRequest);
+
+        if ($this->httpResponseProvider->supports($requestConfiguration, $statusPaymentRequest)) {
+            return $this->httpResponseProvider->getResponse($requestConfiguration, $statusPaymentRequest);
+        }
+
+        $this->paymentStateFlashHandler->handle($requestConfiguration, $paymentRequest->getPayment()->getState());
+
+        return $this->afterPayNextResponseResolver->getResponse($requestConfiguration, $statusPaymentRequest);
+    }
+
+    public function supports(RequestConfiguration $requestConfiguration): bool
+    {
+        $hash = $this->getPaymentRequestHash($requestConfiguration);
+
+        return null !== $hash;
+    }
+
+    private function getPaymentRequestHash(RequestConfiguration $requestConfiguration): mixed
+    {
+        return $requestConfiguration->getRequest()->attributes->get('hash');
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php
index 023fcc40cd..23adbb8af2 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php
@@ -20,7 +20,7 @@ use Payum\Core\Security\HttpRequestVerifierInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactoryInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Bundle\ShopBundle\Handler\PaymentStatusFlashHandlerInterface;
+use Sylius\Bundle\ShopBundle\Handler\PaymentStateFlashHandlerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
@@ -32,7 +32,7 @@ final class PayumAfterPayResponseProvider implements AfterPayResponseProviderInt
         private RouterInterface $router,
         private GetStatusFactoryInterface $getStatusRequestFactory,
         private ResolveNextRouteFactoryInterface $resolveNextRouteRequestFactory,
-        private PaymentStatusFlashHandlerInterface $paymentStatusFlashHandler,
+        private PaymentStateFlashHandlerInterface $paymentStatusFlashHandler,
     ) {
     }
 
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolver.php b/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolver.php
new file mode 100644
index 0000000000..b47adbd761
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolver.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Resolver;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\RouterInterface;
+use Webmozart\Assert\Assert;
+
+final class AfterPayNextResponseResolver implements AfterPayNextResponseResolverInterface
+{
+    public function __construct(
+        private RouterInterface $router,
+    ) {}
+
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): Response {
+        /** @var PaymentInterface $payment */
+        $payment = $paymentRequest->getPayment();
+        $order = $payment->getOrder();
+        Assert::notNull($order, 'An order is required at this point.');
+
+        $route = 'sylius_shop_order_show';
+        $params = ['tokenValue' => $order->getTokenValue()];
+
+        if (
+            $payment->getState() === BasePaymentInterface::STATE_COMPLETED ||
+            $payment->getState() === BasePaymentInterface::STATE_AUTHORIZED
+        ) {
+            $route = 'sylius_shop_order_thank_you';
+        }
+
+        $url = $this->router->generate($route, $params);
+
+        return new RedirectResponse($url);
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php b/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php
new file mode 100644
index 0000000000..bd0165dec7
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Flux:: shop sources.
+ * COPYRIGHT (C) 2024, HARMAN INTERNATIONAL. ALL RIGHTS RESERVED.
+ * -----------------------------------------------------------------------------
+ * CONFIDENTIAL: NO PART OF THIS DOCUMENT MAY BE REPRODUCED IN ANY FORM WITHOUT THE
+ * EXPRESSED WRITTEN PERMISSION OF HARMAN INTERNATIONAL.
+ * DO NOT DISCLOSE ANY INFORMATION CONTAINED IN THIS DOCUMENT TO ANY THIRD-PARTY
+ * WITHOUT THE PRIOR WRITTEN CONSENT OF HARMAN INTERNATIONAL.
+ *
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Resolver;
+
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+interface AfterPayNextResponseResolverInterface
+{
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): Response;
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
index 6b42ea205f..547f2b719f 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
@@ -15,6 +15,7 @@
     <imports>
         <import resource="services/controller.xml" />
         <import resource="services/email.xml" />
+        <import resource="services/handlers.xml" />
         <import resource="services/listeners.xml" />
         <import resource="services/menu.xml" />
         <import resource="services/providers.xml" />
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
index d7af5faa31..ab0b900838 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
@@ -65,6 +65,7 @@
             </argument>
             <argument type="service" id="sylius.resource_controller.request_configuration_factory" />
             <argument type="tagged" tag="sylius.shop.provider.pay_response" />
+            <argument type="tagged" tag="sylius.shop.provider.after_pay_response" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/handlers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/handlers.xml
new file mode 100644
index 0000000000..c3121f2950
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/handlers.xml
@@ -0,0 +1,23 @@
+<?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>
+
+        <service id="sylius.shop.handler.payment_state_flash" class="Sylius\Bundle\ShopBundle\Handler\PaymentStateFlashHandler" />
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
index 024d4640d4..1e4d811af9 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
@@ -38,5 +38,24 @@
             <tag name="sylius.shop.provider.pay_response" priority="-100" />
         </service>
 
+        <service id="sylius.shop.provider.after_pay_response.payum" class="Sylius\Bundle\ShopBundle\Provider\PayumAfterPayResponseProvider">
+            <argument type="service" id="payum" />
+            <argument type="service" id="router" />
+            <argument type="service" id="sylius.factory.payum_get_status_action" />
+            <argument type="service" id="sylius.factory.payum_resolve_next_route" />
+            <argument type="service" id="sylius.shop.handler.payment_state_flash" />
+            <tag name="sylius.shop.provider.after_pay_response" priority="-100" />
+        </service>
+
+        <service id="sylius.shop.provider.after_pay_response.payment_request" class="Sylius\Bundle\ShopBundle\Provider\PaymentRequestAfterPayResponseProvider">
+            <argument type="service" id="sylius.factory.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
+            <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
+            <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="sylius.shop.handler.payment_state_flash" />
+            <argument type="service" id="sylius.shop.resolver.after_pay_response" />
+            <tag name="sylius.shop.provider.after_pay_response" priority="-100" />
+        </service>
+
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
index 17ebc847c4..5a042852f5 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
@@ -21,5 +21,9 @@
             <argument type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_NEW</argument>
         </service>
 
+        <service id="sylius.shop.resolver.after_pay_response" class="Sylius\Bundle\ShopBundle\Resolver\AfterPayNextResponseResolver">
+            <argument type="service" id="router" />
+        </service>
+
     </services>
 </container>

From cd44afc591030f395b1ca879ee7fe8207c875ad2 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 14:00:33 +0300
Subject: [PATCH 144/200] Rename service

---
 .../Bundle/ShopBundle/Resources/config/services/providers.xml   | 2 +-
 .../Bundle/ShopBundle/Resources/config/services/resolvers.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
index 1e4d811af9..a8ad905d96 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
@@ -53,7 +53,7 @@
             <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="sylius.shop.handler.payment_state_flash" />
-            <argument type="service" id="sylius.shop.resolver.after_pay_response" />
+            <argument type="service" id="sylius.shop.resolver.after_pay_next_response" />
             <tag name="sylius.shop.provider.after_pay_response" priority="-100" />
         </service>
 
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
index 5a042852f5..d5906d5b71 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
@@ -21,7 +21,7 @@
             <argument type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_NEW</argument>
         </service>
 
-        <service id="sylius.shop.resolver.after_pay_response" class="Sylius\Bundle\ShopBundle\Resolver\AfterPayNextResponseResolver">
+        <service id="sylius.shop.resolver.after_pay_next_response" class="Sylius\Bundle\ShopBundle\Resolver\AfterPayNextResponseResolver">
             <argument type="service" id="router" />
         </service>
 

From adf81c538e91df562f2be90cb49881da0fef937a Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 17:07:59 +0200
Subject: [PATCH 145/200] Missing refactoring
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
---
 .../PaymentRequest/CommandProvider/ActionsCommandProvider.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
index 6413ea6ec4..6b157f4d15 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
@@ -38,7 +38,7 @@ final class ActionsCommandProvider implements ServiceProviderAwareCommandProvide
     public function provide(PaymentRequestInterface $paymentRequest): object
     {
         $action = $paymentRequest->getAction();
-        $commandProvider = $this->locator->get($action);
+        $commandProvider = $this->getCommandProvider($action);
         if (null === $commandProvider) {
             throw new PaymentRequestNotSupportedException(sprintf(
                 'No payment request command provider supported for this action "%s".',

From a10d6abc68b3ceaa18f2780e2cbd9081f190af95 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 18:16:15 +0300
Subject: [PATCH 146/200] Replace file header

---
 .../Provider/HttpResponseProviderInterface.php       | 12 +++++-------
 .../ServiceProviderAwareProviderInterface.php        | 12 +++++-------
 .../AfterPayNextResponseResolverInterface.php        | 12 +++++-------
 .../Resolver/PaymentToPayResolverInterface.php       | 12 +++++-------
 4 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
index 8d83556654..bf9049cc6f 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
@@ -1,14 +1,12 @@
 <?php
 
 /*
- * This file is part of the Flux:: shop sources.
- * COPYRIGHT (C) 2024, HARMAN INTERNATIONAL. ALL RIGHTS RESERVED.
- * -----------------------------------------------------------------------------
- * CONFIDENTIAL: NO PART OF THIS DOCUMENT MAY BE REPRODUCED IN ANY FORM WITHOUT THE
- * EXPRESSED WRITTEN PERMISSION OF HARMAN INTERNATIONAL.
- * DO NOT DISCLOSE ANY INFORMATION CONTAINED IN THIS DOCUMENT TO ANY THIRD-PARTY
- * WITHOUT THE PRIOR WRITTEN CONSENT OF HARMAN INTERNATIONAL.
+ * 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.
  */
 
 declare(strict_types=1);
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php
index 595b6ae53d..d3092c0473 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php
@@ -1,14 +1,12 @@
 <?php
 
 /*
- * This file is part of the Flux:: shop sources.
- * COPYRIGHT (C) 2024, HARMAN INTERNATIONAL. ALL RIGHTS RESERVED.
- * -----------------------------------------------------------------------------
- * CONFIDENTIAL: NO PART OF THIS DOCUMENT MAY BE REPRODUCED IN ANY FORM WITHOUT THE
- * EXPRESSED WRITTEN PERMISSION OF HARMAN INTERNATIONAL.
- * DO NOT DISCLOSE ANY INFORMATION CONTAINED IN THIS DOCUMENT TO ANY THIRD-PARTY
- * WITHOUT THE PRIOR WRITTEN CONSENT OF HARMAN INTERNATIONAL.
+ * 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.
  */
 
 declare(strict_types=1);
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php b/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php
index bd0165dec7..ae1131f4f5 100644
--- a/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php
+++ b/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php
@@ -1,14 +1,12 @@
 <?php
 
 /*
- * This file is part of the Flux:: shop sources.
- * COPYRIGHT (C) 2024, HARMAN INTERNATIONAL. ALL RIGHTS RESERVED.
- * -----------------------------------------------------------------------------
- * CONFIDENTIAL: NO PART OF THIS DOCUMENT MAY BE REPRODUCED IN ANY FORM WITHOUT THE
- * EXPRESSED WRITTEN PERMISSION OF HARMAN INTERNATIONAL.
- * DO NOT DISCLOSE ANY INFORMATION CONTAINED IN THIS DOCUMENT TO ANY THIRD-PARTY
- * WITHOUT THE PRIOR WRITTEN CONSENT OF HARMAN INTERNATIONAL.
+ * 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.
  */
 
 declare(strict_types=1);
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php b/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php
index f9b69289e0..c8e582ba28 100644
--- a/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php
+++ b/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php
@@ -1,14 +1,12 @@
 <?php
 
 /*
- * This file is part of the Flux:: shop sources.
- * COPYRIGHT (C) 2024, HARMAN INTERNATIONAL. ALL RIGHTS RESERVED.
- * -----------------------------------------------------------------------------
- * CONFIDENTIAL: NO PART OF THIS DOCUMENT MAY BE REPRODUCED IN ANY FORM WITHOUT THE
- * EXPRESSED WRITTEN PERMISSION OF HARMAN INTERNATIONAL.
- * DO NOT DISCLOSE ANY INFORMATION CONTAINED IN THIS DOCUMENT TO ANY THIRD-PARTY
- * WITHOUT THE PRIOR WRITTEN CONSENT OF HARMAN INTERNATIONAL.
+ * 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.
  */
 
 declare(strict_types=1);

From d3e59ff70d78cf8705298ebf277ee9897ca1fa8e Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 17:17:18 +0200
Subject: [PATCH 147/200] Remove function import
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
---
 .../Provider/PaymentRequestAfterPayResponseProvider.php         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
index 028877a217..10fb555c2f 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -25,8 +25,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Webmozart\Assert\Assert;
 
-use function sprintf;
-
 final class PaymentRequestAfterPayResponseProvider implements AfterPayResponseProviderInterface
 {
     /**

From a312315c852ad51965361b67da147e9375d9b7c0 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 18:24:37 +0300
Subject: [PATCH 148/200] Remove global function use

---
 .../ShopBundle/Provider/PaymentRequestPayResponseProvider.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
index da02c7ad30..e00dd62567 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
@@ -25,8 +25,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
 use Webmozart\Assert\Assert;
 
-use function sprintf;
-
 final class PaymentRequestPayResponseProvider implements PayResponseProviderInterface
 {
     /**

From 6e8673b08b83b8a4830ec02364d8c0598bc6c0f9 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 17:28:00 +0200
Subject: [PATCH 149/200] Refactor via quick syntax
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
---
 .../ShopBundle/Provider/PayumPayResponseProvider.php      | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
index 0c674f657a..8316b6dbe5 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
@@ -99,12 +99,6 @@ final class PayumPayResponseProvider implements PayResponseProviderInterface
 
     private function getGatewayConfigFromPayment(PaymentInterface $payment): ?GatewayConfigInterface
     {
-        $paymentMethod = $payment->getMethod();
-        if (null === $paymentMethod) {
-            return null;
-        }
-
-        $gatewayConfig = $paymentMethod->getGatewayConfig();
-        return $gatewayConfig ?? null;
+        return $payment->getMethod()?->getGatewayConfig();
     }
 }

From f07ed55ce9ad157bceb964187b4a2f1fe54be736 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 17:42:39 +0200
Subject: [PATCH 150/200] Line return
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
---
 .../PaymentRequest/Provider/ActionsHttpResponseProvider.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
index 26e9d0b677..0ca75399f0 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
@@ -58,7 +58,8 @@ final class ActionsHttpResponseProvider implements ServiceProviderAwareProviderI
         return $httpResponseProvider->supports($requestConfiguration, $paymentRequest);
     }
 
-    public function getProviderIndex(): array {
+    public function getProviderIndex(): array
+    {
         return $this->locator->getProvidedServices();
     }
 

From 6eb63158b4628341e4346bd5f608323c624d479b Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 19:58:31 +0300
Subject: [PATCH 151/200] Avoid publicly displaying available actions

---
 .../ApiBundle/Resources/translations/validators.en.yaml       | 2 +-
 .../Constraints/ChosenPaymentRequestActionEligibility.php     | 2 --
 .../ChosenPaymentRequestActionEligibilityValidator.php        | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/translations/validators.en.yaml b/src/Sylius/Bundle/ApiBundle/Resources/translations/validators.en.yaml
index 66b4cc5870..5ae40d7bac 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/translations/validators.en.yaml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/translations/validators.en.yaml
@@ -28,7 +28,7 @@ sylius:
         not_exist: 'The payment method with %code% code does not exist.'
     payment_request:
         action_not_available: 'The payment request (method code "%code%" and payment id "%id%") has no handler. Please choose another payment method.'
-        not_available: 'The payment request is not supporting this action (actions available are: %actions%).'
+        not_available: 'The payment request is not supporting this action.'
     product:
         not_exist: 'The product %productName% does not exist.'
     product_variant:
diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php
index 262340bab3..35822af532 100644
--- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php
+++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php
@@ -19,8 +19,6 @@ final class ChosenPaymentRequestActionEligibility extends Constraint
 {
     public string $notAvailable = 'sylius.payment_request.action_not_available';
 
-    public string $notExist = 'sylius.payment_method.not_exist';
-
     public function validatedBy(): string
     {
         return 'sylius_api_chosen_payment_request_action_eligibility';
diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
index f22e496b73..fe988756fc 100644
--- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
+++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibilityValidator.php
@@ -57,9 +57,7 @@ final class ChosenPaymentRequestActionEligibilityValidator extends ConstraintVal
             return;
         }
 
-        $availableActions = $gatewayFactoryCommandProvider->getCommandProviderIndex();
-
-        $this->context->addViolation($constraint->notAvailable, ['%actions%' => implode(', ', $availableActions)]);
+        $this->context->addViolation($constraint->notAvailable);
     }
 
     private function getCommandProvider(AddPaymentRequest $addPaymentRequest): ?PaymentRequestCommandProviderInterface

From 2dba6210db4017976595485165f4c847c330dc70 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 19:59:15 +0300
Subject: [PATCH 152/200] Refactor to abstract class to avoid duplicating code

---
 .../AbstractServiceCommandProvider.php        | 62 +++++++++++++++++
 .../ActionsCommandProvider.php                | 43 ++----------
 .../GatewayFactoryCommandProvider.php         | 47 +++----------
 ...eProviderAwareCommandProviderInterface.php |  2 +-
 .../Provider/AbstractServiceProvider.php      | 68 +++++++++++++++++++
 .../Provider/ActionsHttpResponseProvider.php  | 46 ++-----------
 .../GatewayFactoryHttpResponseProvider.php    | 57 ++--------------
 .../Provider/GatewayFactoryNameProvider.php   | 10 +++
 .../GatewayFactoryNameProviderInterface.php   |  3 +
 .../HttpResponseProviderInterface.php         | 10 +--
 .../ServiceProviderAwareProviderInterface.php |  2 +-
 11 files changed, 173 insertions(+), 177 deletions(-)
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
new file mode 100644
index 0000000000..ffe896cd0a
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
+
+use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+
+abstract class AbstractServiceCommandProvider implements ServiceProviderAwareCommandProviderInterface
+{
+    /** @var ServiceProviderInterface<PaymentRequestCommandProviderInterface> */
+    protected ServiceProviderInterface $locator;
+
+    public function supports(PaymentRequestInterface $paymentRequest): bool
+    {
+        $index = $this->getCommandProviderIndex($paymentRequest);
+        $httpResponseProvider = $this->getCommandProvider($index);
+        if (null === $httpResponseProvider) {
+            return false;
+        }
+
+        return $httpResponseProvider->supports($paymentRequest);
+    }
+
+    public function provide(PaymentRequestInterface $paymentRequest): object
+    {
+        $index = $this->getCommandProviderIndex($paymentRequest);
+        $commandProvider = $this->getCommandProvider($index);
+        if (null === $commandProvider) {
+            throw new PaymentRequestNotSupportedException(sprintf(
+                'No payment request command provider supported for "%s" (command providers available are: %s).',
+                $index,
+                implode(', ', $this->getCommandProviderIndexes()),
+            ));
+        }
+
+        return $commandProvider->provide($paymentRequest);
+    }
+
+    public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface
+    {
+        return $this->locator->get($index);
+    }
+
+    public function getCommandProviderIndexes(): array
+    {
+        return $this->locator->getProvidedServices();
+    }
+
+    abstract protected function getCommandProviderIndex(PaymentRequestInterface $paymentRequest): string;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
index 6b157f4d15..8c38fe21d4 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ActionsCommandProvider.php
@@ -13,49 +13,20 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider;
 
-use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
 
-final class ActionsCommandProvider implements ServiceProviderAwareCommandProviderInterface
+final class ActionsCommandProvider extends AbstractServiceCommandProvider
 {
+    /**
+     * @param ServiceProviderInterface<PaymentRequestCommandProviderInterface> $locator
+     */
     public function __construct(
-        private ServiceProviderInterface $locator,
+        protected ServiceProviderInterface $locator,
     ) {
     }
 
-    public function supports(PaymentRequestInterface $paymentRequest): bool
-    {
-        $action = $paymentRequest->getAction();
-        $commandProvider = $this->getCommandProvider($action);
-        if (null === $commandProvider) {
-            return false;
-        }
-
-        return $commandProvider->supports($paymentRequest);
-    }
-
-    public function provide(PaymentRequestInterface $paymentRequest): object
-    {
-        $action = $paymentRequest->getAction();
-        $commandProvider = $this->getCommandProvider($action);
-        if (null === $commandProvider) {
-            throw new PaymentRequestNotSupportedException(sprintf(
-                'No payment request command provider supported for this action "%s".',
-                $action
-            ));
-        }
-
-        return $commandProvider->provide($paymentRequest);
-    }
-
-    public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface
-    {
-        return $this->locator->get($index);
-    }
-
-    public function getCommandProviderIndex(): array
-    {
-        return $this->locator->getProvidedServices();
+    protected function getCommandProviderIndex(PaymentRequestInterface $paymentRequest): string {
+        return $paymentRequest->getAction();
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
index 1229a8237e..e216c80110 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/GatewayFactoryCommandProvider.php
@@ -20,12 +20,15 @@ use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
 
-final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommandProviderInterface
+final class GatewayFactoryCommandProvider extends AbstractServiceCommandProvider
 {
+    /**
+     * @param ServiceProviderInterface<PaymentRequestCommandProviderInterface> $locator
+     */
     public function __construct(
         private PaymentRequestDuplicationCheckerInterface $paymentRequestDuplicationChecker,
         private GatewayFactoryNameProviderInterface $gatewayFactoryNameProvider,
-        private ServiceProviderInterface $locator,
+        protected ServiceProviderInterface $locator,
     ) {
     }
 
@@ -37,44 +40,10 @@ final class GatewayFactoryCommandProvider implements ServiceProviderAwareCommand
             return false;
         }
 
-        $factoryName = $this->getFactoryName($paymentRequest);
-        $commandProvider = $this->getCommandProvider($factoryName);
-        if (null === $commandProvider) {
-            return false;
-        }
-
-        return $commandProvider->supports($paymentRequest);
+        return parent::supports($paymentRequest);
     }
 
-    public function provide(PaymentRequestInterface $paymentRequest): object
-    {
-        $factoryName = $this->getFactoryName($paymentRequest);
-        $commandProvider = $this->getCommandProvider($factoryName);
-        if (null === $commandProvider) {
-            throw new PaymentRequestNotSupportedException(sprintf(
-                'No payment request command provider supported for for the payment method factory name "%s".',
-                $factoryName
-            ));
-        }
-
-        return $commandProvider->provide($paymentRequest);
-    }
-
-    public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface
-    {
-        return $this->locator->get($index);
-    }
-
-    public function getCommandProviderIndex(): array
-    {
-        return $this->locator->getProvidedServices();
-    }
-
-    private function getFactoryName(PaymentRequestInterface $paymentRequest): string
-    {
-        /** @var PaymentMethodInterface $paymentMethod */
-        $paymentMethod = $paymentRequest->getMethod();
-
-        return $this->gatewayFactoryNameProvider->provide($paymentMethod);
+    protected function getCommandProviderIndex(PaymentRequestInterface $paymentRequest): string {
+        return $this->gatewayFactoryNameProvider->provideFromPaymentRequest($paymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
index 3c0412c52e..b71d2dc5af 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/ServiceProviderAwareCommandProviderInterface.php
@@ -18,5 +18,5 @@ interface ServiceProviderAwareCommandProviderInterface extends PaymentRequestCom
     public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface;
 
     /** @return string[] */
-    public function getCommandProviderIndex(): array;
+    public function getCommandProviderIndexes(): array;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php
new file mode 100644
index 0000000000..fbb215042c
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+
+abstract class AbstractServiceProvider implements ServiceProviderAwareProviderInterface
+{
+    /** @var ServiceProviderInterface<HttpResponseProviderInterface> */
+    protected ServiceProviderInterface $locator;
+
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): bool {
+        $index = $this->getHttpResponseProviderIndex($paymentRequest);
+        $httpResponseProvider = $this->getHttpResponseProvider($index);
+        if (null === $httpResponseProvider) {
+            return false;
+        }
+
+        return $httpResponseProvider->supports($requestConfiguration, $paymentRequest);
+    }
+
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): Response {
+        $index = $this->getHttpResponseProviderIndex($paymentRequest);
+        $httpResponseProvider = $this->getHttpResponseProvider($index);
+        if (null === $httpResponseProvider) {
+            throw new PaymentRequestNotSupportedException(sprintf(
+                'No PaymentRequest HTTP Response provider supported for "%s" (providers available are: %s).',
+                $index,
+                implode(', ', $this->getProviderIndexes()),
+            ));
+        }
+
+        return $httpResponseProvider->getResponse($requestConfiguration, $paymentRequest);
+    }
+
+    public function getProviderIndexes(): array
+    {
+        return $this->locator->getProvidedServices();
+    }
+
+    public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface
+    {
+        return $this->locator->get($index);
+    }
+
+    abstract protected function getHttpResponseProviderIndex(PaymentRequestInterface $paymentRequest): string;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
index 0ca75399f0..dd1324f2d3 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ActionsHttpResponseProvider.php
@@ -13,58 +13,20 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
-use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
-use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Service\ServiceProviderInterface;
 
-final class ActionsHttpResponseProvider implements ServiceProviderAwareProviderInterface
+final class ActionsHttpResponseProvider extends AbstractServiceProvider
 {
     /**
      * @param ServiceProviderInterface<HttpResponseProviderInterface> $locator
      */
     public function __construct(
-        private ServiceProviderInterface $locator,
+        protected ServiceProviderInterface $locator,
     ) {
     }
 
-    public function getResponse(
-        RequestConfiguration $requestConfiguration,
-        PaymentRequestInterface $paymentRequest,
-    ): Response {
-        $action = $paymentRequest->getAction();
-        $httpResponseProvider = $this->getHttpResponseProvider($action);
-        if (null === $httpResponseProvider) {
-            throw new PaymentRequestNotSupportedException(sprintf(
-                'No payment request HTTP Response provider supported for this action "%s".',
-                $action
-            ));
-        }
-
-        return $httpResponseProvider->getResponse($requestConfiguration, $paymentRequest);
-    }
-
-    public function supports(
-        RequestConfiguration $requestConfiguration,
-        PaymentRequestInterface $paymentRequest,
-    ): bool {
-        $action = $paymentRequest->getAction();
-        $httpResponseProvider = $this->getHttpResponseProvider($action);
-        if (null === $httpResponseProvider) {
-            return false;
-        }
-
-        return $httpResponseProvider->supports($requestConfiguration, $paymentRequest);
-    }
-
-    public function getProviderIndex(): array
-    {
-        return $this->locator->getProvidedServices();
-    }
-
-    public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface
-    {
-        return $this->locator->get($index);
+    protected function getHttpResponseProviderIndex(PaymentRequestInterface $paymentRequest): string {
+        return $paymentRequest->getAction();
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
index 73d977fae0..3c88f3929c 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryHttpResponseProvider.php
@@ -13,70 +13,21 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
-use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
-use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Service\ServiceProviderInterface;
 
-final class GatewayFactoryHttpResponseProvider implements ServiceProviderAwareProviderInterface
+final class GatewayFactoryHttpResponseProvider extends AbstractServiceProvider
 {
     /**
      * @param ServiceProviderInterface<HttpResponseProviderInterface> $locator
      */
     public function __construct(
         private GatewayFactoryNameProviderInterface $gatewayFactoryNameProvider,
-        private ServiceProviderInterface $locator,
+        protected ServiceProviderInterface $locator,
     ) {
     }
 
-    public function getResponse(
-        RequestConfiguration $requestConfiguration,
-        PaymentRequestInterface $paymentRequest,
-    ): Response {
-        $factoryName = $this->getFactoryName($paymentRequest);
-
-        $httpResponseProvider = $this->getHttpResponseProvider($factoryName);
-
-        if (null === $httpResponseProvider) {
-            throw new PaymentRequestNotSupportedException(sprintf(
-                'No payment request HTTP Response provider supported for the payment method factory name "%s".',
-                $factoryName
-            ));
-        }
-
-        return $httpResponseProvider->getResponse($requestConfiguration, $paymentRequest);
-    }
-
-    public function supports(
-        RequestConfiguration $requestConfiguration,
-        PaymentRequestInterface $paymentRequest,
-    ): bool {
-        $factoryName = $this->getFactoryName($paymentRequest);
-        $httpResponseProvider = $this->getHttpResponseProvider($factoryName);
-
-        if (null === $httpResponseProvider) {
-            return false;
-        }
-
-        return $httpResponseProvider->supports($requestConfiguration, $paymentRequest);
-    }
-
-    public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface
-    {
-        return $this->locator->get($index);
-    }
-
-    public function getProviderIndex(): array {
-        return $this->locator->getProvidedServices();
-    }
-
-    private function getFactoryName(PaymentRequestInterface $paymentRequest): string
-    {
-        /** @var PaymentMethodInterface $paymentMethod */
-        $paymentMethod = $paymentRequest->getMethod();
-
-        return $this->gatewayFactoryNameProvider->provide($paymentMethod);
+    protected function getHttpResponseProviderIndex(PaymentRequestInterface $paymentRequest): string {
+        return $this->gatewayFactoryNameProvider->provideFromPaymentRequest($paymentRequest);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
index b713e3cde1..888df46bc5 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProvider.php
@@ -14,13 +14,23 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
 use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\GatewayConfigInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class GatewayFactoryNameProvider implements GatewayFactoryNameProviderInterface
 {
     public function provide(PaymentMethodInterface $paymentMethod): string
     {
+        /** @var GatewayConfigInterface $gatewayConfig */
         $gatewayConfig = $paymentMethod->getGatewayConfig();
 
         return $gatewayConfig->getConfig()['factory'] ?? $gatewayConfig->getFactoryName();
     }
+
+    public function provideFromPaymentRequest(PaymentRequestInterface $paymentRequest): string {
+        /** @var PaymentMethodInterface $paymentMethod */
+        $paymentMethod = $paymentRequest->getMethod();
+
+        return $this->provide($paymentMethod);
+    }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
index 14b0565fbe..9c282b1a6d 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/GatewayFactoryNameProviderInterface.php
@@ -14,8 +14,11 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
 
 use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 interface GatewayFactoryNameProviderInterface
 {
     public function provide(PaymentMethodInterface $paymentMethod): string;
+
+    public function provideFromPaymentRequest(PaymentRequestInterface $paymentRequest): string;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
index bf9049cc6f..5286aadf4e 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/HttpResponseProviderInterface.php
@@ -19,13 +19,13 @@ use Symfony\Component\HttpFoundation\Response;
 
 interface HttpResponseProviderInterface
 {
-    public function getResponse(
-        RequestConfiguration $requestConfiguration,
-        PaymentRequestInterface $paymentRequest,
-    ): Response;
-
     public function supports(
         RequestConfiguration $requestConfiguration,
         PaymentRequestInterface $paymentRequest,
     ): bool;
+
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): Response;
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php
index d3092c0473..c80e4adfc3 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/ServiceProviderAwareProviderInterface.php
@@ -18,5 +18,5 @@ interface ServiceProviderAwareProviderInterface extends HttpResponseProviderInte
     public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface;
 
     /** @return string[] */
-    public function getProviderIndex(): array;
+    public function getProviderIndexes(): array;
 }

From ae4de164661a6c0daac979fd6fa6a8bd6156783e Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 22:14:08 +0300
Subject: [PATCH 153/200] Fix indexed by action not type

---
 .../config/services/integrations/payum/offline.xml        | 6 +++---
 .../integrations/payum/paypal_express_checkout.xml        | 8 ++++----
 .../config/services/integrations/payum/stripe.xml         | 8 ++++----
 .../payment_request/offline/command_providers.xml         | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
index b4e7df5fa8..d6454020af 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
@@ -19,16 +19,16 @@
         <defaults public="true" />
 
         <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.offline" index-by="type" />
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.offline" index-by="action" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="offline" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.offline" type="capture" />
+            <tag name="sylius.payment_request.command_provider.payum.offline" action="capture" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.offline.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\StatusCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.offline" type="status" />
+            <tag name="sylius.payment_request.command_provider.payum.offline" action="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
index 6e2c38e481..379645a71e 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
@@ -19,20 +19,20 @@
         <defaults public="true" />
 
         <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.paypal_express_checkout" index-by="type" />
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.paypal_express_checkout" index-by="action" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="paypal_express_checkout" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="capture" />
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" action="capture" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="authorize" />
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" action="authorize" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\StatusCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" type="status" />
+            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" action="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
index d1695fd786..5e741b35d0 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
@@ -19,20 +19,20 @@
         <defaults public="true" />
 
         <service id="sylius.payment_request.command_provider.payum.stripe_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.stripe_checkout" index-by="type" />
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.stripe_checkout" index-by="action" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="stripe_checkout" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.stripe_checkout.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" type="capture" />
+            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" action="capture" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.stripe_checkout.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" type="authorize" />
+            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" action="authorize" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.stripe_checkout.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\StatusCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" type="status" />
+            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" action="status" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
index 3b54b48e12..512b7b513b 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
@@ -17,12 +17,12 @@
 >
     <services>
         <service id="sylius.payment_request.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="type" />
+            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="action" />
             <tag name="sylius.payment_request.command_provider" gateway-factory="offline" priority="-100" />
         </service>
 
         <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline\CapturePaymentRequestCommandProvider">
-            <tag name="sylius.payment_request.command_provider.offline" type="capture" />
+            <tag name="sylius.payment_request.command_provider.offline" action="capture" />
         </service>
     </services>
 </container>

From f8dc3bd0e4186d3af7ec37bbd60ac9fed0c10676 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Wed, 4 Sep 2024 22:16:39 +0300
Subject: [PATCH 154/200] Introduce parameterized url for the thank you page
 url

---
 .../Controller/OrderPayController.php         |  2 +-
 .../DependencyInjection/Configuration.php     | 11 ++++
 .../SyliusShopExtension.php                   | 10 ++++
 .../Provider/NoPaymentPayResponseProvider.php |  5 +-
 .../Offline/StatusHttpResponseProvider.php    | 50 +++++++++++++++++
 .../Provider/OrderPayFinalUrlProvider.php     | 53 ++++++++++++++++++
 .../OrderPayFinalUrlProviderInterface.php     | 21 ++++++++
 ...PaymentRequestAfterPayResponseProvider.php | 13 +++--
 .../Resolver/AfterPayNextResponseResolver.php | 54 -------------------
 .../AfterPayNextResponseResolverInterface.php | 26 ---------
 .../Resources/config/services/providers.xml   | 21 +++++++-
 .../Resources/config/services/resolvers.xml   |  4 --
 12 files changed, 176 insertions(+), 94 deletions(-)
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/Offline/StatusHttpResponseProvider.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProvider.php
 create mode 100644 src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProviderInterface.php
 delete mode 100644 src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolver.php
 delete mode 100644 src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php

diff --git a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php b/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
index b960c32297..69b871da1d 100644
--- a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
+++ b/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
@@ -77,6 +77,6 @@ final class OrderPayController
             }
         }
 
-        throw new LogicException(sprintf('No "after pay response provider" available.'));
+        throw new LogicException('No "after pay response provider" available.');
     }
 }
diff --git a/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
index 6348e5fd4d..3c8bdc9bc6 100644
--- a/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
@@ -66,6 +66,17 @@ final class Configuration implements ConfigurationInterface
                         ->end()
                     ->end()
                 ->end()
+                ->arrayNode('order_pay')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('final_route')
+                            ->defaultValue('sylius_shop_order_thank_you')
+                        ->end()
+                        ->arrayNode('final_route_parameters')
+                            ->addDefaultsIfNotSet()
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 
diff --git a/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php b/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
index 7d779d2cd3..aa4a1e1290 100644
--- a/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
+++ b/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
@@ -41,6 +41,16 @@ final class SyliusShopExtension extends Extension
             'sylius_shop.product_grid.include_all_descendants',
             $config['product_grid']['include_all_descendants'],
         );
+
+        $container->setParameter(
+            'sylius_shop.order_pay.final_route',
+            $config['order_pay']['final_route'],
+        );
+        $container->setParameter(
+            'sylius_shop.order_pay.final_route_parameters',
+            $config['order_pay']['final_route_parameters'],
+        );
+
         $this->configureCheckoutResolverIfNeeded($config['checkout_resolver'], $container);
     }
 
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
index 228642132e..0236bb984f 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
@@ -18,13 +18,12 @@ use Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolverInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\RouterInterface;
 
 final class NoPaymentPayResponseProvider implements PayResponseProviderInterface
 {
     public function __construct(
         private PaymentToPayResolverInterface $paymentToPayResolver,
-        private RouterInterface $router,
+        private OrderPayFinalUrlProviderInterface $orderPayFinalUrlProvider,
     ) {
     }
 
@@ -32,7 +31,7 @@ final class NoPaymentPayResponseProvider implements PayResponseProviderInterface
         RequestConfiguration $requestConfiguration,
         OrderInterface $order
     ): Response {
-        $url = $this->router->generate('sylius_shop_order_thank_you');
+        $url = $this->orderPayFinalUrlProvider->getUrl(null);
 
         return new RedirectResponse($url);
     }
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/Offline/StatusHttpResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/Offline/StatusHttpResponseProvider.php
new file mode 100644
index 0000000000..33ceb2f631
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/Offline/StatusHttpResponseProvider.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider\Offline;
+
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\HttpResponseProviderInterface;
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\RouterInterface;
+
+final class StatusHttpResponseProvider implements HttpResponseProviderInterface
+{
+    /**
+     * @param array<string, string> $finalRouteParameters
+     */
+    public function __construct(
+        private RouterInterface $router,
+        private string $finalRoute,
+        private array $finalRouteParameters,
+    ) {
+    }
+
+    public function supports(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): bool {
+        return $paymentRequest->getAction() === PaymentRequestInterface::ACTION_STATUS;
+    }
+
+    public function getResponse(
+        RequestConfiguration $requestConfiguration,
+        PaymentRequestInterface $paymentRequest,
+    ): Response {
+        $finalUrl = $this->router->generate($this->finalRoute, $this->finalRouteParameters);
+
+        return new RedirectResponse($finalUrl);
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProvider.php
new file mode 100644
index 0000000000..b768cb174f
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProvider.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider;
+
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
+use Symfony\Component\Routing\RouterInterface;
+
+final class OrderPayFinalUrlProvider implements OrderPayFinalUrlProviderInterface
+{
+    /**
+     * @param array<string, string> $finalRouteParameters
+     */
+    public function __construct(
+        private RouterInterface $router,
+        private string $finalRoute,
+        private array $finalRouteParameters,
+    ) {
+    }
+
+    public function getUrl(?PaymentInterface $payment): string {
+        $finalUrl = $this->router->generate($this->finalRoute, $this->finalRouteParameters);
+        if (
+            null === $payment ||
+            $payment->getState() === BasePaymentInterface::STATE_COMPLETED ||
+            $payment->getState() === BasePaymentInterface::STATE_AUTHORIZED
+        ) {
+            return $finalUrl;
+        }
+
+        /** @var OrderInterface $order */
+        $order = $payment->getOrder();
+
+        return $this->router->generate(
+            'sylius_shop_order_show',
+            [
+                'tokenValue' => $order->getTokenValue(),
+            ]
+        );
+    }
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProviderInterface.php b/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProviderInterface.php
new file mode 100644
index 0000000000..f3917f59dd
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ShopBundle\Provider;
+
+use Sylius\Component\Core\Model\PaymentInterface;
+
+interface OrderPayFinalUrlProviderInterface
+{
+    public function getUrl(?PaymentInterface $payment): string;
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
index 10fb555c2f..f8cf8c8a9d 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -17,10 +17,11 @@ use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInt
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Bundle\ShopBundle\Handler\PaymentStateFlashHandlerInterface;
-use Sylius\Bundle\ShopBundle\Resolver\AfterPayNextResponseResolverInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Webmozart\Assert\Assert;
@@ -37,7 +38,7 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
         private PaymentStateFlashHandlerInterface $paymentStateFlashHandler,
-        private AfterPayNextResponseResolverInterface $afterPayNextResponseResolver,
+        private OrderPayFinalUrlProviderInterface $orderPayFinalUrlProvider,
     ) {
     }
 
@@ -60,9 +61,13 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
             return $this->httpResponseProvider->getResponse($requestConfiguration, $statusPaymentRequest);
         }
 
-        $this->paymentStateFlashHandler->handle($requestConfiguration, $paymentRequest->getPayment()->getState());
+        /** @var PaymentInterface $payment */
+        $payment = $paymentRequest->getPayment();
+        $this->paymentStateFlashHandler->handle($requestConfiguration, $payment->getState());
 
-        return $this->afterPayNextResponseResolver->getResponse($requestConfiguration, $statusPaymentRequest);
+        $url = $this->orderPayFinalUrlProvider->getUrl($payment);
+
+        return new RedirectResponse($url);
     }
 
     public function supports(RequestConfiguration $requestConfiguration): bool
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolver.php b/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolver.php
deleted file mode 100644
index b47adbd761..0000000000
--- a/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolver.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ShopBundle\Resolver;
-
-use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Component\Core\Model\PaymentInterface;
-use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\RouterInterface;
-use Webmozart\Assert\Assert;
-
-final class AfterPayNextResponseResolver implements AfterPayNextResponseResolverInterface
-{
-    public function __construct(
-        private RouterInterface $router,
-    ) {}
-
-    public function getResponse(
-        RequestConfiguration $requestConfiguration,
-        PaymentRequestInterface $paymentRequest,
-    ): Response {
-        /** @var PaymentInterface $payment */
-        $payment = $paymentRequest->getPayment();
-        $order = $payment->getOrder();
-        Assert::notNull($order, 'An order is required at this point.');
-
-        $route = 'sylius_shop_order_show';
-        $params = ['tokenValue' => $order->getTokenValue()];
-
-        if (
-            $payment->getState() === BasePaymentInterface::STATE_COMPLETED ||
-            $payment->getState() === BasePaymentInterface::STATE_AUTHORIZED
-        ) {
-            $route = 'sylius_shop_order_thank_you';
-        }
-
-        $url = $this->router->generate($route, $params);
-
-        return new RedirectResponse($url);
-    }
-}
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php b/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php
deleted file mode 100644
index ae1131f4f5..0000000000
--- a/src/Sylius/Bundle/ShopBundle/Resolver/AfterPayNextResponseResolverInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\ShopBundle\Resolver;
-
-use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Component\HttpFoundation\Response;
-
-interface AfterPayNextResponseResolverInterface
-{
-    public function getResponse(
-        RequestConfiguration $requestConfiguration,
-        PaymentRequestInterface $paymentRequest,
-    ): Response;
-}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
index a8ad905d96..e2bc162d53 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
@@ -32,9 +32,15 @@
             <tag name="sylius.shop.provider.pay_response" priority="-200" />
         </service>
 
+        <service id="sylius.shop.provider.order_pay_final_url" class="Sylius\Bundle\ShopBundle\Provider\OrderPayFinalUrlProvider">
+            <argument type="service" id="router" />
+            <argument type="string">%sylius_shop.order_pay.final_route%</argument>
+            <argument type="string">%sylius_shop.order_pay.final_route_parameters%</argument>
+        </service>
+
         <service id="sylius.shop.provider.pay_response.no_payment" class="Sylius\Bundle\ShopBundle\Provider\NoPaymentPayResponseProvider">
             <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <argument type="service" id="router" />
+            <argument type="service" id="sylius.shop.provider.order_pay_final_url" />
             <tag name="sylius.shop.provider.pay_response" priority="-100" />
         </service>
 
@@ -53,9 +59,20 @@
             <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="sylius.shop.handler.payment_state_flash" />
-            <argument type="service" id="sylius.shop.resolver.after_pay_next_response" />
+            <argument type="service" id="sylius.shop.provider.order_pay_final_url" />
             <tag name="sylius.shop.provider.after_pay_response" priority="-100" />
         </service>
 
+        <service id="sylius.shop.provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ActionsHttpResponseProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.http_response.provider.offline" index-by="action" />
+        </service>
+
+        <service id="sylius.payment_request.http_response.provider.offline.capture" class="Sylius\Bundle\ShopBundle\Provider\Offline\StatusHttpResponseProvider">
+            <argument type="service" id="router" />
+            <argument type="string">%sylius_shop.order_pay.final_route%</argument>
+            <argument type="string">%sylius_shop.order_pay.final_route_parameters%</argument>
+            <tag name="sylius.payment_request.http_response.provider.offline" action="status" />
+        </service>
+
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
index d5906d5b71..17ebc847c4 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
@@ -21,9 +21,5 @@
             <argument type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_NEW</argument>
         </service>
 
-        <service id="sylius.shop.resolver.after_pay_next_response" class="Sylius\Bundle\ShopBundle\Resolver\AfterPayNextResponseResolver">
-            <argument type="service" id="router" />
-        </service>
-
     </services>
 </container>

From 4172ac5e0a490c776458838afe9f290efa9131fd Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 12:47:49 +0300
Subject: [PATCH 155/200] Move ShopBundle order_pay classes to CoreBundle

---
 phpstan-baseline.neon                         |  5 ++
 .../Controller/OrderPayController.php         | 11 +--
 .../Handler/PaymentStateFlashHandler.php      | 20 +++--
 .../PaymentStateFlashHandlerInterface.php     |  4 +-
 .../Processor/RouteParametersProcessor.php    | 39 ++++++++++
 .../RouteParametersProcessorInterface.php     | 23 ++++++
 .../AfterPayResponseProviderInterface.php     |  3 +-
 .../OrderPay/Provider/FinalUrlProvider.php}   | 36 +++++----
 .../Provider/FinalUrlProviderInterface.php}   |  4 +-
 .../Provider/NoPaymentPayResponseProvider.php |  6 +-
 .../Offline/StatusHttpResponseProvider.php    | 14 ++--
 .../Provider/PayResponseProviderInterface.php |  2 +-
 ...PaymentRequestAfterPayResponseProvider.php |  6 +-
 .../PaymentRequestPayResponseProvider.php     |  6 +-
 .../PayumAfterPayResponseProvider.php         |  4 +-
 .../Provider/PayumPayResponseProvider.php     |  4 +-
 .../Resolver/PaymentToPayResolver.php         |  2 +-
 .../PaymentToPayResolverInterface.php         |  2 +-
 .../Resources/config/services/order_pay.xml   | 19 +++++
 .../config/services/order_pay/controllers.xml | 29 +++++++
 .../config/services/order_pay/handlers.xml    | 23 ++++++
 .../services/order_pay/offline/providers.xml  | 25 ++++++
 .../config/services/order_pay/processors.xml  | 25 ++++++
 .../config/services/order_pay/providers.xml   | 53 +++++++++++++
 .../DependencyInjection/Configuration.php     | 11 +++
 .../SyliusShopExtension.php                   | 19 +++--
 .../Resources/config/routing/order.yml        |  4 +-
 .../ShopBundle/Resources/config/services.xml  |  3 -
 .../Resources/config/services/controller.xml  | 13 ----
 .../services/integrations/order_pay.xml       | 18 +++++
 .../integrations/order_pay/controllers.xml    | 24 ++++++
 .../{ => integrations/order_pay}/handlers.xml |  2 +-
 .../order_pay/offline/providers.xml           | 26 +++++++
 .../integrations/order_pay/providers.xml      | 63 +++++++++++++++
 .../order_pay}/resolvers.xml                  |  2 +-
 .../Resources/config/services/providers.xml   | 78 -------------------
 36 files changed, 462 insertions(+), 166 deletions(-)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Controller/OrderPayController.php (85%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Handler/PaymentStateFlashHandler.php (58%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Handler/PaymentStateFlashHandlerInterface.php (76%)
 create mode 100644 src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessor.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessorInterface.php
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Provider/AfterPayResponseProviderInterface.php (86%)
 rename src/Sylius/Bundle/{ShopBundle/Provider/OrderPayFinalUrlProvider.php => CoreBundle/OrderPay/Provider/FinalUrlProvider.php} (50%)
 rename src/Sylius/Bundle/{ShopBundle/Provider/OrderPayFinalUrlProviderInterface.php => CoreBundle/OrderPay/Provider/FinalUrlProviderInterface.php} (80%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Provider/NoPaymentPayResponseProvider.php (85%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Provider/Offline/StatusHttpResponseProvider.php (74%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Provider/PayResponseProviderInterface.php (92%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Provider/PaymentRequestAfterPayResponseProvider.php (94%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Provider/PaymentRequestPayResponseProvider.php (95%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Provider/PayumAfterPayResponseProvider.php (95%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Provider/PayumPayResponseProvider.php (96%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Resolver/PaymentToPayResolver.php (92%)
 rename src/Sylius/Bundle/{ShopBundle => CoreBundle/OrderPay}/Resolver/PaymentToPayResolverInterface.php (89%)
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/controllers.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/handlers.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/offline/providers.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/processors.xml
 create mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay.xml
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/controllers.xml
 rename src/Sylius/Bundle/ShopBundle/Resources/config/services/{ => integrations/order_pay}/handlers.xml (77%)
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
 create mode 100644 src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
 rename src/Sylius/Bundle/ShopBundle/Resources/config/services/{ => integrations/order_pay}/resolvers.xml (91%)
 delete mode 100644 src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e5da9b7dc3..948c1e59f6 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -4315,6 +4315,11 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
 
+		-
+			message: "#^Method Sylius\\\\Bundle\\\\ShopBundle\\\\DependencyInjection\\\\SyliusShopExtension\\:\\:configureOrderPay\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
+
 		-
 			message: "#^Method Sylius\\\\Bundle\\\\ShopBundle\\\\EventListener\\\\UserImpersonatedListener\\:\\:__construct\\(\\) has parameter \\$orderRepository with generic interface Sylius\\\\Component\\\\Core\\\\Repository\\\\OrderRepositoryInterface but does not specify its types\\: T$#"
 			count: 1
diff --git a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Controller/OrderPayController.php
similarity index 85%
rename from src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Controller/OrderPayController.php
index 69b871da1d..fc7d836cda 100644
--- a/src/Sylius/Bundle/ShopBundle/Controller/OrderPayController.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Controller/OrderPayController.php
@@ -11,22 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Controller;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Controller;
 
 use LogicException;
-use Payum\Core\Request\Generic;
-use Payum\Core\Request\GetStatusInterface;
+use Sylius\Bundle\CoreBundle\OrderPay\Provider\AfterPayResponseProviderInterface;
+use Sylius\Bundle\CoreBundle\OrderPay\Provider\PayResponseProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface;
-use Sylius\Bundle\ShopBundle\Provider\AfterPayResponseProviderInterface;
-use Sylius\Bundle\ShopBundle\Provider\PayResponseProviderInterface;
 use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Order\Repository\OrderRepositoryInterface;
 use Sylius\Component\Resource\Metadata\MetadataInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 final class OrderPayController
diff --git a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandler.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Handler/PaymentStateFlashHandler.php
similarity index 58%
rename from src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandler.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Handler/PaymentStateFlashHandler.php
index e695956533..1147c5a445 100644
--- a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Handler/PaymentStateFlashHandler.php
@@ -11,21 +11,31 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Handler;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Handler;
 
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Payment\Model\PaymentInterface;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 
 final class PaymentStateFlashHandler implements PaymentStateFlashHandlerInterface
 {
+    public function __construct(
+        private string $format = 'sylius.payment.%s',
+    ) {
+    }
+
     public function handle(RequestConfiguration $requestConfiguration, string $state): void
     {
         $request = $requestConfiguration->getRequest();
+
+        if (!$request->hasSession()) {
+            return;
+        }
+
+        /** @var FlashBagAwareSessionInterface $session */
+        $session = $request->getSession();
         if (PaymentInterface::STATE_NEW !== $state) {
-            /** @var FlashBagInterface $flashBag */
-            $flashBag = $request->getSession()->getBag('flashes');
-            $flashBag->add('info', sprintf('sylius.payment.%s', $state));
+            $session->getFlashBag()->add('info', sprintf($this->format, $state));
         }
     }
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandlerInterface.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Handler/PaymentStateFlashHandlerInterface.php
similarity index 76%
rename from src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandlerInterface.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Handler/PaymentStateFlashHandlerInterface.php
index c835a492a2..ab574afeb8 100644
--- a/src/Sylius/Bundle/ShopBundle/Handler/PaymentStateFlashHandlerInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Handler/PaymentStateFlashHandlerInterface.php
@@ -11,11 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Handler;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Handler;
 
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Component\Core\Model\OrderInterface;
-use Symfony\Component\HttpFoundation\Response;
 
 interface PaymentStateFlashHandlerInterface
 {
diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessor.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessor.php
new file mode 100644
index 0000000000..c2e7b396fd
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessor.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\OrderPay\Processor;
+
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\Routing\RouterInterface;
+
+final class RouteParametersProcessor implements RouteParametersProcessorInterface
+{
+    public function __construct(
+        private ExpressionLanguage $expressionLanguage,
+        private RouterInterface $router,
+    ) {
+    }
+
+    public function process(string $route, array $rawParameters, array $context): string
+    {
+        $parameters = [];
+        foreach ($rawParameters as $key => $rawParameter) {
+            $parameters[$key] = (string) $this->expressionLanguage->evaluate($rawParameter, $context);
+        }
+
+        return $this->router->generate(
+            $route,
+            $parameters,
+        );
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessorInterface.php
new file mode 100644
index 0000000000..94b65fe523
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessorInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\OrderPay\Processor;
+
+interface RouteParametersProcessorInterface
+{
+    /**
+     * @param array<string, string|int|bool> $rawParameters
+     * @param array<string, mixed> $context
+     */
+    public function process(string $route, array $rawParameters, array $context): string;
+}
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/AfterPayResponseProviderInterface.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayResponseProviderInterface.php
similarity index 86%
rename from src/Sylius/Bundle/ShopBundle/Provider/AfterPayResponseProviderInterface.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayResponseProviderInterface.php
index e37a89cc7f..b1ebdbd321 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/AfterPayResponseProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayResponseProviderInterface.php
@@ -11,10 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Component\Core\Model\OrderInterface;
 use Symfony\Component\HttpFoundation\Response;
 
 interface AfterPayResponseProviderInterface
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/FinalUrlProvider.php
similarity index 50%
rename from src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProvider.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/FinalUrlProvider.php
index b768cb174f..5d54312ac2 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/FinalUrlProvider.php
@@ -11,43 +11,49 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
-use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Bundle\CoreBundle\OrderPay\Processor\RouteParametersProcessorInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
-use Symfony\Component\Routing\RouterInterface;
 
-final class OrderPayFinalUrlProvider implements OrderPayFinalUrlProviderInterface
+final class FinalUrlProvider implements FinalUrlProviderInterface
 {
     /**
      * @param array<string, string> $finalRouteParameters
+     * @param array<string, string> $retryRouteParameters
      */
     public function __construct(
-        private RouterInterface $router,
+        private RouteParametersProcessorInterface $routeParametersProcessor,
         private string $finalRoute,
         private array $finalRouteParameters,
+        private string $retryRoute,
+        private array $retryRouteParameters,
     ) {
     }
 
     public function getUrl(?PaymentInterface $payment): string {
-        $finalUrl = $this->router->generate($this->finalRoute, $this->finalRouteParameters);
+        $context = [
+            'payment' => $payment,
+            'order' => $payment?->getOrder(),
+        ];
+
         if (
             null === $payment ||
             $payment->getState() === BasePaymentInterface::STATE_COMPLETED ||
             $payment->getState() === BasePaymentInterface::STATE_AUTHORIZED
         ) {
-            return $finalUrl;
+            return $this->routeParametersProcessor->process(
+                $this->finalRoute,
+                $this->finalRouteParameters,
+                $context
+            );
         }
 
-        /** @var OrderInterface $order */
-        $order = $payment->getOrder();
-
-        return $this->router->generate(
-            'sylius_shop_order_show',
-            [
-                'tokenValue' => $order->getTokenValue(),
-            ]
+        return $this->routeParametersProcessor->process(
+            $this->retryRoute,
+            $this->retryRouteParameters,
+            $context
         );
     }
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProviderInterface.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/FinalUrlProviderInterface.php
similarity index 80%
rename from src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProviderInterface.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/FinalUrlProviderInterface.php
index f3917f59dd..852f62ebf1 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/OrderPayFinalUrlProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/FinalUrlProviderInterface.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
 use Sylius\Component\Core\Model\PaymentInterface;
 
-interface OrderPayFinalUrlProviderInterface
+interface FinalUrlProviderInterface
 {
     public function getUrl(?PaymentInterface $payment): string;
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/NoPaymentPayResponseProvider.php
similarity index 85%
rename from src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/NoPaymentPayResponseProvider.php
index 0236bb984f..bc2ae6f9d5 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/NoPaymentPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/NoPaymentPayResponseProvider.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
+use Sylius\Bundle\CoreBundle\OrderPay\Resolver\PaymentToPayResolverInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolverInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -23,7 +23,7 @@ final class NoPaymentPayResponseProvider implements PayResponseProviderInterface
 {
     public function __construct(
         private PaymentToPayResolverInterface $paymentToPayResolver,
-        private OrderPayFinalUrlProviderInterface $orderPayFinalUrlProvider,
+        private FinalUrlProviderInterface $orderPayFinalUrlProvider,
     ) {
     }
 
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/Offline/StatusHttpResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/Offline/StatusHttpResponseProvider.php
similarity index 74%
rename from src/Sylius/Bundle/ShopBundle/Provider/Offline/StatusHttpResponseProvider.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/Offline/StatusHttpResponseProvider.php
index 33ceb2f631..16b7b12db1 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/Offline/StatusHttpResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/Offline/StatusHttpResponseProvider.php
@@ -11,24 +11,19 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider\Offline;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider\Offline;
 
+use Sylius\Bundle\CoreBundle\OrderPay\Provider\FinalUrlProviderInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\HttpResponseProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\RouterInterface;
 
 final class StatusHttpResponseProvider implements HttpResponseProviderInterface
 {
-    /**
-     * @param array<string, string> $finalRouteParameters
-     */
     public function __construct(
-        private RouterInterface $router,
-        private string $finalRoute,
-        private array $finalRouteParameters,
+        private FinalUrlProviderInterface $finalUrlProvider,
     ) {
     }
 
@@ -43,7 +38,8 @@ final class StatusHttpResponseProvider implements HttpResponseProviderInterface
         RequestConfiguration $requestConfiguration,
         PaymentRequestInterface $paymentRequest,
     ): Response {
-        $finalUrl = $this->router->generate($this->finalRoute, $this->finalRouteParameters);
+        // Force null payment to go to the thank you page
+        $finalUrl = $this->finalUrlProvider->getUrl(null);
 
         return new RedirectResponse($finalUrl);
     }
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayResponseProviderInterface.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayResponseProviderInterface.php
similarity index 92%
rename from src/Sylius/Bundle/ShopBundle/Provider/PayResponseProviderInterface.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayResponseProviderInterface.php
index ff94bd84f2..4e9122ba2c 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayResponseProviderInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayResponseProviderInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Core\Model\OrderInterface;
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
similarity index 94%
rename from src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
index f8cf8c8a9d..c309ab31a3 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
+use Sylius\Bundle\CoreBundle\OrderPay\Handler\PaymentStateFlashHandlerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Bundle\ShopBundle\Handler\PaymentStateFlashHandlerInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
@@ -38,7 +38,7 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
         private PaymentStateFlashHandlerInterface $paymentStateFlashHandler,
-        private OrderPayFinalUrlProviderInterface $orderPayFinalUrlProvider,
+        private FinalUrlProviderInterface $orderPayFinalUrlProvider,
     ) {
     }
 
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
similarity index 95%
rename from src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
index e00dd62567..2306161e42 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
+use Sylius\Bundle\CoreBundle\OrderPay\Resolver\PaymentToPayResolverInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolverInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
@@ -31,11 +31,11 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
      * @param PaymentRequestFactoryInterface<PaymentRequestInterface> $paymentRequestFactory
      */
     public function __construct(
-        private PaymentToPayResolverInterface $paymentToPayResolver,
         private PaymentRequestFactoryInterface $paymentRequestFactory,
         private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
         private RouterInterface $router,
+        private PaymentToPayResolverInterface $paymentToPayResolver,
     ) {
     }
 
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayumAfterPayResponseProvider.php
similarity index 95%
rename from src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayumAfterPayResponseProvider.php
index 23adbb8af2..1dad19f08c 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayumAfterPayResponseProvider.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
 use Payum\Core\Payum;
 use Payum\Core\Request\Generic;
 use Payum\Core\Request\GetStatusInterface;
 use Payum\Core\Security\HttpRequestVerifierInterface;
+use Sylius\Bundle\CoreBundle\OrderPay\Handler\PaymentStateFlashHandlerInterface;
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactoryInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Bundle\ShopBundle\Handler\PaymentStateFlashHandlerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
diff --git a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayumPayResponseProvider.php
similarity index 96%
rename from src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayumPayResponseProvider.php
index 8316b6dbe5..3c8b1531ae 100644
--- a/src/Sylius/Bundle/ShopBundle/Provider/PayumPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PayumPayResponseProvider.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Provider;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
 use Payum\Core\Payum;
 use Payum\Core\Security\TokenInterface;
+use Sylius\Bundle\CoreBundle\OrderPay\Resolver\PaymentToPayResolverInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
-use Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolverInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\GatewayConfigInterface;
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolver.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Resolver/PaymentToPayResolver.php
similarity index 92%
rename from src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolver.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Resolver/PaymentToPayResolver.php
index 2e928ef973..1536c8e190 100644
--- a/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolver.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Resolver/PaymentToPayResolver.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Resolver;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Resolver;
 
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
diff --git a/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Resolver/PaymentToPayResolverInterface.php
similarity index 89%
rename from src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php
rename to src/Sylius/Bundle/CoreBundle/OrderPay/Resolver/PaymentToPayResolverInterface.php
index c8e582ba28..f60b23e08d 100644
--- a/src/Sylius/Bundle/ShopBundle/Resolver/PaymentToPayResolverInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Resolver/PaymentToPayResolverInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShopBundle\Resolver;
+namespace Sylius\Bundle\CoreBundle\OrderPay\Resolver;
 
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay.xml
new file mode 100644
index 0000000000..9799504e9c
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay.xml
@@ -0,0 +1,19 @@
+<?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">
+    <imports>
+        <import resource="order_pay/*.xml" />
+        <import resource="order_pay/offline/*.xml"/>
+    </imports>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/controllers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/controllers.xml
new file mode 100644
index 0000000000..f7087130d2
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/controllers.xml
@@ -0,0 +1,29 @@
+<?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>
+
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Controller\OrderPayController" class="Sylius\Bundle\CoreBundle\OrderPay\Controller\OrderPayController">
+            <argument type="service" id="sylius.repository.order" />
+            <argument type="service">
+                <service class="Sylius\Component\Resource\Metadata\MetadataInterface">
+                    <factory service="sylius.resource_registry" method="get" />
+                    <argument type="string">sylius.order</argument>
+                </service>
+            </argument>
+            <argument type="service" id="sylius.resource_controller.request_configuration_factory" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/handlers.xml
new file mode 100644
index 0000000000..c70ab8107d
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/handlers.xml
@@ -0,0 +1,23 @@
+<?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>
+
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Handler\PaymentStateFlashHandlerInterface" class="Sylius\Bundle\CoreBundle\OrderPay\Handler\PaymentStateFlashHandler" />
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/offline/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/offline/providers.xml
new file mode 100644
index 0000000000..abee57b423
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/offline/providers.xml
@@ -0,0 +1,25 @@
+<?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>
+
+        <service id="sylius.shop.provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ActionsHttpResponseProvider">
+            <argument type="tagged_locator" tag="sylius.payment_request.http_response.provider.offline" index-by="action" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/processors.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/processors.xml
new file mode 100644
index 0000000000..774f59e71d
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/processors.xml
@@ -0,0 +1,25 @@
+<?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>
+
+        <service id="Sylius\Bundle\CoreBundle\OrderPay\Processor\RouteParametersProcessorInterface" class="Sylius\Bundle\CoreBundle\OrderPay\Processor\RouteParametersProcessor">
+            <argument type="service">
+                <service class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" />
+            </argument>
+            <argument type="service" id="router" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
new file mode 100644
index 0000000000..502044031a
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
@@ -0,0 +1,53 @@
+<?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>
+
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\FinalUrlProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\FinalUrlProvider">
+            <argument type="service" id="Sylius\Bundle\CoreBundle\OrderPay\Processor\RouteParametersProcessorInterface" />
+        </service>
+
+        <!-- Pay -->
+
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider">
+            <argument type="service" id="payum" />
+        </service>
+
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
+            <argument type="service" id="sylius.factory.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
+            <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
+            <argument type="service" id="router" />
+        </service>
+
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider" />
+
+        <!-- After pay -->
+
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumAfterPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumAfterPayResponseProvider">
+            <argument type="service" id="payum" />
+            <argument type="service" id="router" />
+            <argument type="service" id="sylius.factory.payum_get_status_action" />
+            <argument type="service" id="sylius.factory.payum_resolve_next_route" />
+        </service>
+
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider">
+            <argument type="service" id="sylius.factory.payment_request" />
+            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
+            <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
+            <argument type="service" id="sylius.repository.payment_request" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
index 3c8bdc9bc6..5e0fbd0965 100644
--- a/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
@@ -75,6 +75,17 @@ final class Configuration implements ConfigurationInterface
                         ->arrayNode('final_route_parameters')
                             ->addDefaultsIfNotSet()
                         ->end()
+                        ->scalarNode('retry_route')
+                            ->defaultValue('sylius_shop_order_show')
+                        ->end()
+                        ->arrayNode('retry_route_parameters')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->scalarNode('tokenValue')
+                                    ->defaultValue('order.tokenValue')
+                               ->end()
+                            ->end()
+                        ->end()
                     ->end()
                 ->end()
             ->end()
diff --git a/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php b/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
index aa4a1e1290..ea45556132 100644
--- a/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
+++ b/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
@@ -42,14 +42,8 @@ final class SyliusShopExtension extends Extension
             $config['product_grid']['include_all_descendants'],
         );
 
-        $container->setParameter(
-            'sylius_shop.order_pay.final_route',
-            $config['order_pay']['final_route'],
-        );
-        $container->setParameter(
-            'sylius_shop.order_pay.final_route_parameters',
-            $config['order_pay']['final_route_parameters'],
-        );
+        $this->configureOrderPay($config['order_pay'], $container);
+        $loader->load('services/integrations/order_pay.xml');
 
         $this->configureCheckoutResolverIfNeeded($config['checkout_resolver'], $container);
     }
@@ -109,4 +103,13 @@ final class SyliusShopExtension extends Extension
 
         return $checkoutRedirectListener;
     }
+
+    private function configureOrderPay(array $config, ContainerBuilder $container): void
+    {
+        $container->setParameter('sylius_shop.order_pay.final_route', $config['final_route']);
+        $container->setParameter('sylius_shop.order_pay.final_route_parameters', $config['final_route_parameters']);
+        $container->setParameter('sylius_shop.order_pay.final_route', $config['retry_route']);
+        $container->setParameter('sylius_shop.order_pay.final_route_parameters', $config['retry_route_parameters']);
+    }
+
 }
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
index b6b2b466b7..e9f98eb850 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
@@ -13,7 +13,7 @@ sylius_shop_order_pay:
     path: /{tokenValue}/pay
     methods: [GET]
     defaults:
-        _controller: sylius.controller.shop.order_pay::payAction
+        _controller: sylius.shop.controller.order_pay::payAction
         _sylius:
             redirect:
                 route: sylius_shop_order_after_pay
@@ -22,7 +22,7 @@ sylius_shop_order_after_pay:
     path: /{hash?}/after-pay
     methods: [GET, POST]
     defaults:
-        _controller: sylius.controller.shop.order_pay::afterPayAction
+        _controller: sylius.shop.controller.order_pay::afterPayAction
 
 sylius_shop_order_show:
     path: /{tokenValue}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
index 547f2b719f..7d78b73319 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
@@ -15,11 +15,8 @@
     <imports>
         <import resource="services/controller.xml" />
         <import resource="services/email.xml" />
-        <import resource="services/handlers.xml" />
         <import resource="services/listeners.xml" />
         <import resource="services/menu.xml" />
-        <import resource="services/providers.xml" />
-        <import resource="services/resolvers.xml" />
         <import resource="services/twig.xml" />
     </imports>
     <services>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
index ab0b900838..b3ec867ac1 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
@@ -54,18 +54,5 @@
 
             <tag name="controller.service_arguments" />
         </service>
-
-        <service id="sylius.controller.shop.order_pay" class="Sylius\Bundle\ShopBundle\Controller\OrderPayController">
-            <argument type="service" id="sylius.repository.order" />
-            <argument type="service">
-                <service class="Sylius\Component\Resource\Metadata\MetadataInterface">
-                    <factory service="sylius.resource_registry" method="get" />
-                    <argument type="string">sylius.order</argument>
-                </service>
-            </argument>
-            <argument type="service" id="sylius.resource_controller.request_configuration_factory" />
-            <argument type="tagged" tag="sylius.shop.provider.pay_response" />
-            <argument type="tagged" tag="sylius.shop.provider.after_pay_response" />
-        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay.xml
new file mode 100644
index 0000000000..a69327eac6
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay.xml
@@ -0,0 +1,18 @@
+<?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">
+    <imports>
+        <import resource="order_pay/*.xml"/>
+    </imports>
+</container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/controllers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/controllers.xml
new file mode 100644
index 0000000000..e9657e2ebd
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/controllers.xml
@@ -0,0 +1,24 @@
+<?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.shop.controller.order_pay" parent="Sylius\Bundle\CoreBundle\OrderPay\Controller\OrderPayController">
+            <argument type="tagged" tag="sylius.shop.order_pay.provider.pay_response" />
+            <argument type="tagged" tag="sylius.shop.order_pay.provider.after_pay_response" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/handlers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/handlers.xml
similarity index 77%
rename from src/Sylius/Bundle/ShopBundle/Resources/config/services/handlers.xml
rename to src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/handlers.xml
index c3121f2950..8b508f2984 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/handlers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/handlers.xml
@@ -17,7 +17,7 @@
 >
     <services>
 
-        <service id="sylius.shop.handler.payment_state_flash" class="Sylius\Bundle\ShopBundle\Handler\PaymentStateFlashHandler" />
+        <service id="sylius.shop.order_pay.handler.payment_state_flash" parent="Sylius\Bundle\CoreBundle\OrderPay\Handler\PaymentStateFlashHandlerInterface" />
 
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
new file mode 100644
index 0000000000..49c8e93cab
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
@@ -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>
+
+        <service id="sylius.payment_request.http_response.provider.offline.capture" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\Offline\StatusHttpResponseProvider">
+            <argument type="service" id="sylius.shop.provider.order_pay_final_url" />
+            <tag name="sylius.payment_request.http_response.provider.offline" action="status" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
new file mode 100644
index 0000000000..25d9993748
--- /dev/null
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
@@ -0,0 +1,63 @@
+<?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"
+>
+    <imports>
+        <import resource="offline/*.xml"/>
+    </imports>
+
+    <services>
+
+        <service id="sylius.shop.order_pay.provider.order_pay_final_url" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\FinalUrlProvider">
+            <argument type="string">%sylius_shop.order_pay.final_route%</argument>
+            <argument type="string">%sylius_shop.order_pay.final_route_parameters%</argument>
+            <argument type="string">%sylius_shop.order_pay.retry_route%</argument>
+            <argument type="string">%sylius_shop.order_pay.retry_route_parameters%</argument>
+        </service>
+
+        <!-- Pay -->
+
+        <service id="sylius.shop.order_pay.provider.pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider">
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-300" />
+        </service>
+
+        <service id="sylius.shop.order_pay.provider.pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-200" />
+        </service>
+
+        <service id="sylius.shop.order_pay.provider.pay_response.no_payment" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider">
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <argument type="service" id="sylius.shop.order_pay.provider.order_pay_final_url" />
+            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-100" />
+        </service>
+
+        <!-- After pay -->
+
+        <service id="sylius.shop.order_pay.provider.after_pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumAfterPayResponseProvider">
+            <argument type="service" id="sylius.shop.order_pay.handler.payment_state_flash" />
+            <tag name="sylius.shop.order_pay.provider.after_pay_response" priority="-100" />
+        </service>
+
+        <service id="sylius.shop.order_pay.provider.after_pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider">
+            <argument type="service" id="sylius.shop.order_pay.handler.payment_state_flash" />
+            <argument type="service" id="sylius.shop.order_pay.provider.order_pay_final_url" />
+            <tag name="sylius.shop.order_pay.provider.after_pay_response" priority="-100" />
+        </service>
+
+    </services>
+</container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/resolvers.xml
similarity index 91%
rename from src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
rename to src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/resolvers.xml
index 17ebc847c4..285c40bd67 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/resolvers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/resolvers.xml
@@ -17,7 +17,7 @@
 >
     <services>
 
-        <service id="sylius.shop.resolver.payment_to_pay" class="Sylius\Bundle\ShopBundle\Resolver\PaymentToPayResolver">
+        <service id="sylius.shop.resolver.payment_to_pay" class="Sylius\Bundle\CoreBundle\OrderPay\Resolver\PaymentToPayResolver">
             <argument type="constant">Sylius\Component\Payment\Model\PaymentInterface::STATE_NEW</argument>
         </service>
 
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
deleted file mode 100644
index e2bc162d53..0000000000
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/providers.xml
+++ /dev/null
@@ -1,78 +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>
-
-        <service id="sylius.shop.provider.pay_response.payum" class="Sylius\Bundle\ShopBundle\Provider\PayumPayResponseProvider">
-            <argument type="service" id="payum" />
-            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <tag name="sylius.shop.provider.pay_response" priority="-300" />
-        </service>
-
-        <service id="sylius.shop.provider.pay_response.payment_request" class="Sylius\Bundle\ShopBundle\Provider\PaymentRequestPayResponseProvider">
-            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <argument type="service" id="sylius.factory.payment_request" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
-            <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
-            <argument type="service" id="router" />
-            <tag name="sylius.shop.provider.pay_response" priority="-200" />
-        </service>
-
-        <service id="sylius.shop.provider.order_pay_final_url" class="Sylius\Bundle\ShopBundle\Provider\OrderPayFinalUrlProvider">
-            <argument type="service" id="router" />
-            <argument type="string">%sylius_shop.order_pay.final_route%</argument>
-            <argument type="string">%sylius_shop.order_pay.final_route_parameters%</argument>
-        </service>
-
-        <service id="sylius.shop.provider.pay_response.no_payment" class="Sylius\Bundle\ShopBundle\Provider\NoPaymentPayResponseProvider">
-            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <argument type="service" id="sylius.shop.provider.order_pay_final_url" />
-            <tag name="sylius.shop.provider.pay_response" priority="-100" />
-        </service>
-
-        <service id="sylius.shop.provider.after_pay_response.payum" class="Sylius\Bundle\ShopBundle\Provider\PayumAfterPayResponseProvider">
-            <argument type="service" id="payum" />
-            <argument type="service" id="router" />
-            <argument type="service" id="sylius.factory.payum_get_status_action" />
-            <argument type="service" id="sylius.factory.payum_resolve_next_route" />
-            <argument type="service" id="sylius.shop.handler.payment_state_flash" />
-            <tag name="sylius.shop.provider.after_pay_response" priority="-100" />
-        </service>
-
-        <service id="sylius.shop.provider.after_pay_response.payment_request" class="Sylius\Bundle\ShopBundle\Provider\PaymentRequestAfterPayResponseProvider">
-            <argument type="service" id="sylius.factory.payment_request" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
-            <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
-            <argument type="service" id="sylius.repository.payment_request" />
-            <argument type="service" id="sylius.shop.handler.payment_state_flash" />
-            <argument type="service" id="sylius.shop.provider.order_pay_final_url" />
-            <tag name="sylius.shop.provider.after_pay_response" priority="-100" />
-        </service>
-
-        <service id="sylius.shop.provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ActionsHttpResponseProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.http_response.provider.offline" index-by="action" />
-        </service>
-
-        <service id="sylius.payment_request.http_response.provider.offline.capture" class="Sylius\Bundle\ShopBundle\Provider\Offline\StatusHttpResponseProvider">
-            <argument type="service" id="router" />
-            <argument type="string">%sylius_shop.order_pay.final_route%</argument>
-            <argument type="string">%sylius_shop.order_pay.final_route_parameters%</argument>
-            <tag name="sylius.payment_request.http_response.provider.offline" action="status" />
-        </service>
-
-    </services>
-</container>

From 43248410bc1a0025ca46bd71cb143b55078f8692 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 17:16:59 +0300
Subject: [PATCH 156/200] set authorize action when using use_authorize => true

---
 .../OrderPay/Provider/PaymentRequestPayResponseProvider.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
index 2306161e42..d2ef52b8db 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
@@ -51,6 +51,12 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
 
         $paymentRequest = $this->paymentRequestFactory->create($payment, $paymentMethod);
 
+        $action = $paymentRequest->getAction();
+        if ($paymentMethod->getGatewayConfig()?->getConfig()['use_authorize'] ?? false) {
+            $action = PaymentRequestInterface::ACTION_AUTHORIZE;
+        }
+        $paymentRequest->setAction($action);
+
         $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
 
         if ($this->httpResponseProvider->supports($requestConfiguration, $paymentRequest)) {

From bb2b00a3b5d6d7db3bcb04180ec0d9ca4bf76d5d Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:32:51 +0300
Subject: [PATCH 157/200] Add some specs tests

---
 .../RouteParametersProcessorSpec.php          | 76 ++++++++++++++++
 .../Provider/FinalUrlProviderSpec.php         | 89 +++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 src/Sylius/Bundle/CoreBundle/spec/OrderPay/Processor/RouteParametersProcessorSpec.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php

diff --git a/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Processor/RouteParametersProcessorSpec.php b/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Processor/RouteParametersProcessorSpec.php
new file mode 100644
index 0000000000..5adfdc8cb7
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Processor/RouteParametersProcessorSpec.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\CoreBundle\OrderPay\Processor;
+
+use PhpSpec\ObjectBehavior;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\Routing\RouterInterface;
+
+final class RouteParametersProcessorSpec extends ObjectBehavior
+{
+    function let(
+        ExpressionLanguage $expressionLanguage,
+        RouterInterface $router,
+    ): void {
+        $this->beConstructedWith(
+            $expressionLanguage,
+            $router,
+        );
+    }
+
+    function it_processes_from_a_route(
+        RouterInterface $router,
+    ): void {
+        $router->generate('a_route', [])->willReturn('https://localhost/a_route');
+
+        $this->process('a_route')->shouldReturn('https://localhost/a_route');
+    }
+
+    function it_processes_from_a_route_and_parameters(
+        RouterInterface $router,
+        ExpressionLanguage $expressionLanguage,
+    ): void {
+        $expressionLanguage->evaluate('value', [])->willReturn('value')->shouldBeCalledOnce();
+
+        $router->generate(
+            'a_route',
+            ['aParam'=>'value'],
+        )->willReturn('https://localhost/a_route?aParam=value');
+
+        $this->process(
+            'a_route',
+            ['aParam' => 'value'],
+        )->shouldReturn('https://localhost/a_route?aParam=value');
+    }
+
+    function it_processes_from_a_route_and_parameters_and_context(
+        RouterInterface $router,
+        ExpressionLanguage $expressionLanguage,
+    ): void {
+        $expressionLanguage->evaluate('value', [
+            'value' => '1'
+        ])->willReturn('1')->shouldBeCalledOnce();
+
+        $router->generate(
+            'a_route',
+            ['aParam'=>'1'],
+        )->willReturn('https://localhost/a_route?aParam=1');
+
+        $this->process(
+            'a_route',
+            ['aParam' => 'value'],
+            ['value' => '1'],
+        )->shouldReturn('https://localhost/a_route?aParam=1');
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php b/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php
new file mode 100644
index 0000000000..e174d56a3b
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\CoreBundle\OrderPay\Provider;
+
+use Sylius\Bundle\CoreBundle\OrderPay\Processor\RouteParametersProcessorInterface;
+use PhpSpec\ObjectBehavior;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
+
+class FinalUrlProviderSpec extends ObjectBehavior
+{
+    function let(
+        RouteParametersProcessorInterface $routeParametersProcessor,
+    ): void {
+        $this->beConstructedWith(
+            $routeParametersProcessor,
+            'final_route',
+            [],
+            'retry_route',
+            [],
+        );
+    }
+    function it_provides_a_final_url_from_null_payment(
+        RouteParametersProcessorInterface $routeParametersProcessor,
+    ): void {
+        $routeParametersProcessor->process('final_route', [], [
+            'payment' => null,
+            'order' => null,
+        ])->willReturn('http://localhost/final_route');
+
+        $this->getUrl(null)->shouldReturn('http://localhost/final_route');
+    }
+
+    function it_provides_a_final_url_from_payment_with_state_complete(
+        PaymentInterface $payment,
+        RouteParametersProcessorInterface $routeParametersProcessor,
+    ): void {
+        $payment->getOrder()->willReturn(null);
+        $payment->getState()->willReturn(BasePaymentInterface::STATE_COMPLETED);
+
+        $routeParametersProcessor->process('final_route', [], [
+            'payment' => $payment->getWrappedObject(),
+            'order' => null,
+        ])->willReturn('http://localhost/final_route');
+
+        $this->getUrl($payment)->shouldReturn('http://localhost/final_route');
+    }
+
+    function it_provides_a_final_url_from_payment_with_state_authorized(
+        PaymentInterface $payment,
+        RouteParametersProcessorInterface $routeParametersProcessor,
+    ): void {
+        $payment->getOrder()->willReturn(null);
+        $payment->getState()->willReturn(BasePaymentInterface::STATE_AUTHORIZED);
+
+        $routeParametersProcessor->process('final_route', [], [
+            'payment' => $payment->getWrappedObject(),
+            'order' => null,
+        ])->willReturn('http://localhost/final_route');
+
+        $this->getUrl($payment)->shouldReturn('http://localhost/final_route');
+    }
+
+    function it_provides_a_retry_url_from_payment_with_state_cancelled(
+        PaymentInterface $payment,
+        RouteParametersProcessorInterface $routeParametersProcessor,
+    ): void {
+        $payment->getOrder()->willReturn(null);
+        $payment->getState()->willReturn(BasePaymentInterface::STATE_CANCELLED)->shouldBeCalledTimes(2);
+
+        $routeParametersProcessor->process('retry_route', [], [
+            'payment' => $payment->getWrappedObject(),
+            'order' => null,
+        ])->willReturn('http://localhost/retry_route');
+
+        $this->getUrl($payment)->shouldReturn('http://localhost/retry_route');
+    }
+}

From 4d0be3269f0db481ff84aad04b675380ca523a3b Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:33:11 +0300
Subject: [PATCH 158/200] Allow empty params and context

---
 .../CoreBundle/OrderPay/Processor/RouteParametersProcessor.php  | 2 +-
 .../OrderPay/Processor/RouteParametersProcessorInterface.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessor.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessor.php
index c2e7b396fd..6f9cac4add 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessor.php
@@ -24,7 +24,7 @@ final class RouteParametersProcessor implements RouteParametersProcessorInterfac
     ) {
     }
 
-    public function process(string $route, array $rawParameters, array $context): string
+    public function process(string $route, array $rawParameters = [], array $context = []): string
     {
         $parameters = [];
         foreach ($rawParameters as $key => $rawParameter) {
diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessorInterface.php
index 94b65fe523..a6641710d4 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessorInterface.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Processor/RouteParametersProcessorInterface.php
@@ -19,5 +19,5 @@ interface RouteParametersProcessorInterface
      * @param array<string, string|int|bool> $rawParameters
      * @param array<string, mixed> $context
      */
-    public function process(string $route, array $rawParameters, array $context): string;
+    public function process(string $route, array $rawParameters = [], array $context = []): string;
 }

From ec19c8fd1fd82df21ddbc95701655dd11d869fc9 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:35:11 +0300
Subject: [PATCH 159/200] Fix public exposition

---
 .../config/services/integrations/order_pay/controllers.xml     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/controllers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/controllers.xml
index e9657e2ebd..f9d3c5354b 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/controllers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/controllers.xml
@@ -13,9 +13,8 @@
 
 <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.shop.controller.order_pay" parent="Sylius\Bundle\CoreBundle\OrderPay\Controller\OrderPayController">
+        <service public="true" id="sylius.shop.controller.order_pay" parent="Sylius\Bundle\CoreBundle\OrderPay\Controller\OrderPayController">
             <argument type="tagged" tag="sylius.shop.order_pay.provider.pay_response" />
             <argument type="tagged" tag="sylius.shop.order_pay.provider.after_pay_response" />
         </service>

From 95563f01b6b38537e8f861980511bc1efa01f44d Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:35:50 +0300
Subject: [PATCH 160/200] Fix wrong parameter name

---
 .../ShopBundle/DependencyInjection/SyliusShopExtension.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php b/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
index ea45556132..544d9a55bc 100644
--- a/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
+++ b/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
@@ -108,8 +108,8 @@ final class SyliusShopExtension extends Extension
     {
         $container->setParameter('sylius_shop.order_pay.final_route', $config['final_route']);
         $container->setParameter('sylius_shop.order_pay.final_route_parameters', $config['final_route_parameters']);
-        $container->setParameter('sylius_shop.order_pay.final_route', $config['retry_route']);
-        $container->setParameter('sylius_shop.order_pay.final_route_parameters', $config['retry_route_parameters']);
+        $container->setParameter('sylius_shop.order_pay.retry_route', $config['retry_route']);
+        $container->setParameter('sylius_shop.order_pay.retry_route_parameters', $config['retry_route_parameters']);
     }
 
 }

From acfd3e76334ecb1bddf581d41967d3fce0be8705 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 22:30:50 +0300
Subject: [PATCH 161/200] Fix tag names on services

---
 .../Resources/config/services/order_pay/offline/providers.xml  | 3 ++-
 .../Resources/config/services/order_pay/providers.xml          | 2 ++
 .../Resources/config/services/integrations/order_pay.xml       | 1 +
 .../services/integrations/order_pay/offline/providers.xml      | 2 +-
 .../config/services/integrations/order_pay/providers.xml       | 3 ---
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/offline/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/offline/providers.xml
index abee57b423..6c4443aecc 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/offline/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/offline/providers.xml
@@ -17,8 +17,9 @@
 >
     <services>
 
-        <service id="sylius.shop.provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ActionsHttpResponseProvider">
+        <service id="sylius.payment_request.http_response.provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ActionsHttpResponseProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.http_response.provider.offline" index-by="action" />
+            <tag name="sylius.payment_request.http_response.provider" gateway-factory="offline" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
index 502044031a..db56a515f8 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
@@ -26,6 +26,7 @@
 
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
             <argument type="service" id="sylius.factory.payment_request" />
+            <argument type="service" id="sylius.manager.payment_request" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
             <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
             <argument type="service" id="router" />
@@ -44,6 +45,7 @@
 
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider">
             <argument type="service" id="sylius.factory.payment_request" />
+            <argument type="service" id="sylius.manager.payment_request" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
             <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
             <argument type="service" id="sylius.repository.payment_request" />
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay.xml
index a69327eac6..293af0c8ca 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay.xml
@@ -14,5 +14,6 @@
 <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">
     <imports>
         <import resource="order_pay/*.xml"/>
+        <import resource="order_pay/offline/*.xml"/>
     </imports>
 </container>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
index 49c8e93cab..ec181ae3c2 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
@@ -18,7 +18,7 @@
     <services>
 
         <service id="sylius.payment_request.http_response.provider.offline.capture" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\Offline\StatusHttpResponseProvider">
-            <argument type="service" id="sylius.shop.provider.order_pay_final_url" />
+            <argument type="service" id="sylius.shop.order_pay.provider.order_pay_final_url" />
             <tag name="sylius.payment_request.http_response.provider.offline" action="status" />
         </service>
 
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
index 25d9993748..8be8a7039c 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
@@ -15,9 +15,6 @@
            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"
 >
-    <imports>
-        <import resource="offline/*.xml"/>
-    </imports>
 
     <services>
 

From f1288fb6e6292e3e7c5e57a0a986c2e158a4ac0b Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 22:31:33 +0300
Subject: [PATCH 162/200] Fix empty locator service list throwing exception on
 the first ->get call

---
 .../Provider/PaymentRequestAfterPayResponseProvider.php      | 5 +++++
 .../OrderPay/Provider/PaymentRequestPayResponseProvider.php  | 5 +++++
 .../CommandProvider/AbstractServiceCommandProvider.php       | 4 ++++
 .../PaymentRequest/Provider/AbstractServiceProvider.php      | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
index c309ab31a3..7ddd7f3010 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Sylius\Bundle\CoreBundle\OrderPay\Handler\PaymentStateFlashHandlerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
@@ -34,6 +35,7 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
      */
     public function __construct(
         private PaymentRequestFactoryInterface $paymentRequestFactory,
+        private EntityManagerInterface $paymentRequestManager,
         private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
@@ -55,6 +57,9 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
         $statusPaymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($paymentRequest);
         $statusPaymentRequest->setAction(PaymentRequestInterface::ACTION_STATUS);
 
+        $this->paymentRequestManager->persist($paymentRequest);
+        $this->paymentRequestManager->flush();
+
         $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($statusPaymentRequest);
 
         if ($this->httpResponseProvider->supports($requestConfiguration, $statusPaymentRequest)) {
diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
index d2ef52b8db..8dcf7c7943 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Sylius\Bundle\CoreBundle\OrderPay\Resolver\PaymentToPayResolverInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
@@ -32,6 +33,7 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
      */
     public function __construct(
         private PaymentRequestFactoryInterface $paymentRequestFactory,
+        private EntityManagerInterface $paymentRequestManager,
         private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
         private RouterInterface $router,
@@ -57,6 +59,9 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
         }
         $paymentRequest->setAction($action);
 
+        $this->paymentRequestManager->persist($paymentRequest);
+        $this->paymentRequestManager->flush();
+
         $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
 
         if ($this->httpResponseProvider->supports($requestConfiguration, $paymentRequest)) {
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
index ffe896cd0a..a41909f579 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
@@ -50,6 +50,10 @@ abstract class AbstractServiceCommandProvider implements ServiceProviderAwareCom
 
     public function getCommandProvider(string $index): ?PaymentRequestCommandProviderInterface
     {
+        if (false === $this->locator->has($index)) {
+            return null;
+        }
+
         return $this->locator->get($index);
     }
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php
index fbb215042c..140cd18b5b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php
@@ -61,6 +61,10 @@ abstract class AbstractServiceProvider implements ServiceProviderAwareProviderIn
 
     public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface
     {
+        if (false === $this->locator->has($index)) {
+            return null;
+        }
+
         return $this->locator->get($index);
     }
 

From 94053344e0aa00df354a921cd4f39dec49ca1313 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Thu, 5 Sep 2024 22:53:31 +0300
Subject: [PATCH 163/200] Add missing afterPayUrl provider and the related
 ShopBundle config param

---
 .../OrderPay/Provider/AfterPayUrlProvider.php | 44 +++++++++++++++++++
 .../Provider/AfterPayUrlProviderInterface.php | 21 +++++++++
 .../PaymentRequestPayResponseProvider.php     |  7 +--
 .../config/services/order_pay/providers.xml   |  4 ++
 .../DependencyInjection/Configuration.php     | 11 +++++
 .../SyliusShopExtension.php                   |  2 +
 .../order_pay/offline/providers.xml           |  2 +-
 .../integrations/order_pay/providers.xml      | 12 +++--
 8 files changed, 94 insertions(+), 9 deletions(-)
 create mode 100644 src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayUrlProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayUrlProviderInterface.php

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayUrlProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayUrlProvider.php
new file mode 100644
index 0000000000..90c4ab798b
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayUrlProvider.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
+
+use Sylius\Bundle\CoreBundle\OrderPay\Processor\RouteParametersProcessorInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class AfterPayUrlProvider implements AfterPayUrlProviderInterface
+{
+    /**
+     * @param array<string, string> $afterPayRouteParameters
+     */
+    public function __construct(
+        private RouteParametersProcessorInterface $routeParametersProcessor,
+        private string $afterPayRoute,
+        private array $afterPayRouteParameters,
+    ) {
+    }
+
+    public function getUrl(PaymentRequestInterface $paymentRequest): string {
+        $context = [
+            'paymentRequest' => $paymentRequest,
+            'payment' => $paymentRequest->getPayment(),
+            'method' => $paymentRequest->getMethod(),
+        ];
+
+        return $this->routeParametersProcessor->process(
+            $this->afterPayRoute,
+            $this->afterPayRouteParameters,
+            $context
+        );
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayUrlProviderInterface.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayUrlProviderInterface.php
new file mode 100644
index 0000000000..072a26867e
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/AfterPayUrlProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface AfterPayUrlProviderInterface
+{
+    public function getUrl(PaymentRequestInterface $paymentRequest): string;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
index 8dcf7c7943..fc3bfc5d86 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
@@ -38,6 +38,7 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
         private RouterInterface $router,
         private PaymentToPayResolverInterface $paymentToPayResolver,
+        private AfterPayUrlProvider $afterPayUrlProvider,
     ) {
     }
 
@@ -68,11 +69,7 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
             return $this->httpResponseProvider->getResponse($requestConfiguration, $paymentRequest);
         }
 
-        $url = $this->router->generate('sylius_shop_order_after_pay', [
-            'hash' => $paymentRequest->getId(),
-        ]);
-
-        return new RedirectResponse($url);
+        return new RedirectResponse($this->afterPayUrlProvider->getUrl($paymentRequest));
     }
 
     public function supports(
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
index db56a515f8..08ed7c28c8 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
@@ -14,6 +14,10 @@
 <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>
 
+        <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\AfterPayUrlProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\AfterPayUrlProvider">
+            <argument type="service" id="Sylius\Bundle\CoreBundle\OrderPay\Processor\RouteParametersProcessorInterface" />
+        </service>
+
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\FinalUrlProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\FinalUrlProvider">
             <argument type="service" id="Sylius\Bundle\CoreBundle\OrderPay\Processor\RouteParametersProcessorInterface" />
         </service>
diff --git a/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
index 5e0fbd0965..18a77139a5 100644
--- a/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
@@ -69,6 +69,17 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('order_pay')
                     ->addDefaultsIfNotSet()
                     ->children()
+                        ->scalarNode('after_pay_route')
+                            ->defaultValue('sylius_shop_order_after_pay')
+                        ->end()
+                        ->arrayNode('after_pay_route_parameters')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->scalarNode('hash')
+                                    ->defaultValue('paymentRequest.id')
+                               ->end()
+                            ->end()
+                        ->end()
                         ->scalarNode('final_route')
                             ->defaultValue('sylius_shop_order_thank_you')
                         ->end()
diff --git a/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php b/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
index 544d9a55bc..85b0263438 100644
--- a/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
+++ b/src/Sylius/Bundle/ShopBundle/DependencyInjection/SyliusShopExtension.php
@@ -106,6 +106,8 @@ final class SyliusShopExtension extends Extension
 
     private function configureOrderPay(array $config, ContainerBuilder $container): void
     {
+        $container->setParameter('sylius_shop.order_pay.after_pay_route', $config['after_pay_route']);
+        $container->setParameter('sylius_shop.order_pay.after_pay_route_parameters', $config['after_pay_route_parameters']);
         $container->setParameter('sylius_shop.order_pay.final_route', $config['final_route']);
         $container->setParameter('sylius_shop.order_pay.final_route_parameters', $config['final_route_parameters']);
         $container->setParameter('sylius_shop.order_pay.retry_route', $config['retry_route']);
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
index ec181ae3c2..7694cb1b2e 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/offline/providers.xml
@@ -18,7 +18,7 @@
     <services>
 
         <service id="sylius.payment_request.http_response.provider.offline.capture" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\Offline\StatusHttpResponseProvider">
-            <argument type="service" id="sylius.shop.order_pay.provider.order_pay_final_url" />
+            <argument type="service" id="sylius.shop.order_pay.provider.final_url" />
             <tag name="sylius.payment_request.http_response.provider.offline" action="status" />
         </service>
 
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
index 8be8a7039c..4baa925ce9 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
@@ -18,7 +18,12 @@
 
     <services>
 
-        <service id="sylius.shop.order_pay.provider.order_pay_final_url" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\FinalUrlProvider">
+        <service id="sylius.shop.order_pay.provider.after_pay_url" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\AfterPayUrlProvider">
+            <argument type="string">%sylius_shop.order_pay.after_pay_route%</argument>
+            <argument type="string">%sylius_shop.order_pay.after_pay_route_parameters%</argument>
+        </service>
+
+        <service id="sylius.shop.order_pay.provider.final_url" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\FinalUrlProvider">
             <argument type="string">%sylius_shop.order_pay.final_route%</argument>
             <argument type="string">%sylius_shop.order_pay.final_route_parameters%</argument>
             <argument type="string">%sylius_shop.order_pay.retry_route%</argument>
@@ -34,12 +39,13 @@
 
         <service id="sylius.shop.order_pay.provider.pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
             <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <argument type="service" id="sylius.shop.order_pay.provider.after_pay_url" />
             <tag name="sylius.shop.order_pay.provider.pay_response" priority="-200" />
         </service>
 
         <service id="sylius.shop.order_pay.provider.pay_response.no_payment" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider">
             <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <argument type="service" id="sylius.shop.order_pay.provider.order_pay_final_url" />
+            <argument type="service" id="sylius.shop.order_pay.provider.final_url" />
             <tag name="sylius.shop.order_pay.provider.pay_response" priority="-100" />
         </service>
 
@@ -52,7 +58,7 @@
 
         <service id="sylius.shop.order_pay.provider.after_pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider">
             <argument type="service" id="sylius.shop.order_pay.handler.payment_state_flash" />
-            <argument type="service" id="sylius.shop.order_pay.provider.order_pay_final_url" />
+            <argument type="service" id="sylius.shop.order_pay.provider.final_url" />
             <tag name="sylius.shop.order_pay.provider.after_pay_response" priority="-100" />
         </service>
 

From 42ac644cbc4381f032eb00f0d7b5e24aa5d9b774 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:02:04 +0300
Subject: [PATCH 164/200] Fix full getter

---
 .../Bundle/ShopBundle/DependencyInjection/Configuration.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
index 18a77139a5..4ba46d144a 100644
--- a/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/ShopBundle/DependencyInjection/Configuration.php
@@ -76,7 +76,7 @@ final class Configuration implements ConfigurationInterface
                             ->addDefaultsIfNotSet()
                             ->children()
                                 ->scalarNode('hash')
-                                    ->defaultValue('paymentRequest.id')
+                                    ->defaultValue('paymentRequest.getHash()')
                                ->end()
                             ->end()
                         ->end()
@@ -93,7 +93,7 @@ final class Configuration implements ConfigurationInterface
                             ->addDefaultsIfNotSet()
                             ->children()
                                 ->scalarNode('tokenValue')
-                                    ->defaultValue('order.tokenValue')
+                                    ->defaultValue('order.getTokenValue()')
                                ->end()
                             ->end()
                         ->end()

From d6714a3f62214b280f3db21869e7735229dd5296 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:02:25 +0300
Subject: [PATCH 165/200] Use repository instead of manager

---
 .../PaymentRequestAfterPayResponseProvider.php         |  5 +----
 .../Provider/PaymentRequestPayResponseProvider.php     | 10 ++++------
 .../Resources/config/services/order_pay/providers.xml  |  4 +---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
index 7ddd7f3010..ab133fe45b 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
-use Doctrine\ORM\EntityManagerInterface;
 use Sylius\Bundle\CoreBundle\OrderPay\Handler\PaymentStateFlashHandlerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
@@ -35,7 +34,6 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
      */
     public function __construct(
         private PaymentRequestFactoryInterface $paymentRequestFactory,
-        private EntityManagerInterface $paymentRequestManager,
         private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
@@ -57,8 +55,7 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
         $statusPaymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($paymentRequest);
         $statusPaymentRequest->setAction(PaymentRequestInterface::ACTION_STATUS);
 
-        $this->paymentRequestManager->persist($paymentRequest);
-        $this->paymentRequestManager->flush();
+        $this->paymentRequestRepository->add($paymentRequest);
 
         $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($statusPaymentRequest);
 
diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
index fc3bfc5d86..b8fd4f4c8a 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
-use Doctrine\ORM\EntityManagerInterface;
 use Sylius\Bundle\CoreBundle\OrderPay\Resolver\PaymentToPayResolverInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
@@ -21,22 +20,22 @@ use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\RouterInterface;
 use Webmozart\Assert\Assert;
 
 final class PaymentRequestPayResponseProvider implements PayResponseProviderInterface
 {
     /**
      * @param PaymentRequestFactoryInterface<PaymentRequestInterface> $paymentRequestFactory
+     * @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository
      */
     public function __construct(
         private PaymentRequestFactoryInterface $paymentRequestFactory,
-        private EntityManagerInterface $paymentRequestManager,
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
         private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
-        private RouterInterface $router,
         private PaymentToPayResolverInterface $paymentToPayResolver,
         private AfterPayUrlProvider $afterPayUrlProvider,
     ) {
@@ -60,8 +59,7 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
         }
         $paymentRequest->setAction($action);
 
-        $this->paymentRequestManager->persist($paymentRequest);
-        $this->paymentRequestManager->flush();
+        $this->paymentRequestRepository->add($paymentRequest);
 
         $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
index 08ed7c28c8..a9e195203a 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
@@ -30,10 +30,9 @@
 
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
             <argument type="service" id="sylius.factory.payment_request" />
-            <argument type="service" id="sylius.manager.payment_request" />
+            <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
             <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
-            <argument type="service" id="router" />
         </service>
 
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider" />
@@ -49,7 +48,6 @@
 
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider">
             <argument type="service" id="sylius.factory.payment_request" />
-            <argument type="service" id="sylius.manager.payment_request" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
             <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
             <argument type="service" id="sylius.repository.payment_request" />

From 86c496a3dfa2f83ad1e17b5d35078ec1ccf00b76 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:36:47 +0300
Subject: [PATCH 166/200] Fix wrong returned indexes

---
 .../CommandProvider/AbstractServiceCommandProvider.php          | 2 +-
 .../PaymentRequest/Provider/AbstractServiceProvider.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
index a41909f579..90690a7619 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandProvider/AbstractServiceCommandProvider.php
@@ -59,7 +59,7 @@ abstract class AbstractServiceCommandProvider implements ServiceProviderAwareCom
 
     public function getCommandProviderIndexes(): array
     {
-        return $this->locator->getProvidedServices();
+        return array_keys($this->locator->getProvidedServices());
     }
 
     abstract protected function getCommandProviderIndex(PaymentRequestInterface $paymentRequest): string;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php
index 140cd18b5b..15c966dd87 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/AbstractServiceProvider.php
@@ -56,7 +56,7 @@ abstract class AbstractServiceProvider implements ServiceProviderAwareProviderIn
 
     public function getProviderIndexes(): array
     {
-        return $this->locator->getProvidedServices();
+        return array_keys($this->locator->getProvidedServices());
     }
 
     public function getHttpResponseProvider(string $index): ?HttpResponseProviderInterface

From 250232e532690a16c8d9181f7137e80674799c12 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:39:46 +0300
Subject: [PATCH 167/200] Add alias for the default provider

---
 .../Bundle/ApiBundle/Resources/config/services/validator.xml | 2 +-
 .../Resources/config/services/order_pay/providers.xml        | 5 +++--
 .../Resources/config/services/payment_request/announcer.xml  | 2 +-
 .../config/services/payment_request/command_provider.xml     | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
index 2d923af0cf..005fdf5ce6 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
@@ -195,7 +195,7 @@
 
         <service id="Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentRequestActionEligibilityValidator">
             <argument type="service" id="sylius.repository.payment_method" />
-            <argument type="service" id="sylius.payment_request.command_provider.gateway_factory" />
+            <argument type="service" id="sylius.payment_request.command_provider.default" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProviderInterface" />
             <tag name="validator.constraint_validator" alias="sylius_api_chosen_payment_request_action_eligibility" />
         </service>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
index a9e195203a..d6e5c81d14 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
@@ -32,7 +32,7 @@
             <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
-            <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
+            <argument type="service" id="sylius.payment_request.provider.http_response.default" />
         </service>
 
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider" />
@@ -49,8 +49,9 @@
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider">
             <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
-            <argument type="service" id="sylius.payment_request.provider.http_response.gateway_factory" />
+            <argument type="service" id="sylius.payment_request.provider.http_response.default" />
             <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="sylius.payment_request.command_provider.default" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
index a66e9436a4..a660d2af35 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
@@ -19,7 +19,7 @@
         <defaults public="true" />
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncer">
-            <argument type="service" id="sylius.payment_request.command_provider.gateway_factory" />
+            <argument type="service" id="sylius.payment_request.command_provider.default" />
             <argument type="service" id="sylius.command_bus" />
         </service>
 
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
index d7c85aea13..1b4d531a5b 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/command_provider.xml
@@ -24,5 +24,7 @@
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider" index-by="gateway-factory" />
         </service>
 
+        <service id="sylius.payment_request.command_provider.default" alias="sylius.payment_request.command_provider.gateway_factory" />
+
     </services>
 </container>

From 32eba20ba564f2aad0b94aedb46fb408869ea981 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:40:51 +0300
Subject: [PATCH 168/200] Allow no status command provider

---
 ...PaymentRequestAfterPayResponseProvider.php | 21 +++++++++++--------
 .../Announcer/PaymentRequestAnnouncer.php     |  5 -----
 .../services/payment_request/providers.xml    |  2 ++
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
index ab133fe45b..b9f77ba4ed 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -15,6 +15,7 @@ namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
 use Sylius\Bundle\CoreBundle\OrderPay\Handler\PaymentStateFlashHandlerInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Core\Model\PaymentInterface;
@@ -37,6 +38,7 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
         private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,
         private PaymentStateFlashHandlerInterface $paymentStateFlashHandler,
         private FinalUrlProviderInterface $orderPayFinalUrlProvider,
     ) {
@@ -47,20 +49,21 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
         $hash = $this->getPaymentRequestHash($requestConfiguration);
         Assert::notNull($hash, 'A request attribute "hash" is required to retrieve the related order.');
 
-        $paymentRequest = $this->paymentRequestRepository->find($hash);
-        if (null === $paymentRequest) {
+        $capturePaymentRequest = $this->paymentRequestRepository->find($hash);
+        if (null === $capturePaymentRequest) {
             throw new NotFoundHttpException(sprintf('The Payment Request with hash "%s" does not exist.', $hash));
         }
 
-        $statusPaymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($paymentRequest);
-        $statusPaymentRequest->setAction(PaymentRequestInterface::ACTION_STATUS);
+        $paymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($capturePaymentRequest);
+        $paymentRequest->setAction(PaymentRequestInterface::ACTION_STATUS);
 
-        $this->paymentRequestRepository->add($paymentRequest);
+        if ($this->paymentRequestCommandProvider->supports($paymentRequest)) {
+            $this->paymentRequestRepository->add($paymentRequest);
+            $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($paymentRequest);
+        }
 
-        $this->paymentRequestAnnouncer->dispatchPaymentRequestCommand($statusPaymentRequest);
-
-        if ($this->httpResponseProvider->supports($requestConfiguration, $statusPaymentRequest)) {
-            return $this->httpResponseProvider->getResponse($requestConfiguration, $statusPaymentRequest);
+        if ($this->httpResponseProvider->supports($requestConfiguration, $paymentRequest)) {
+            return $this->httpResponseProvider->getResponse($requestConfiguration, $paymentRequest);
         }
 
         /** @var PaymentInterface $payment */
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
index 87558d0146..a52b60ee8d 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Announcer;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
-use Sylius\Bundle\PaymentBundle\Exception\PaymentRequestNotSupportedException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 
@@ -28,10 +27,6 @@ final class PaymentRequestAnnouncer implements PaymentRequestAnnouncerInterface
 
     public function dispatchPaymentRequestCommand(PaymentRequestInterface $paymentRequest): void
     {
-        if (!$this->paymentRequestCommandProvider->supports($paymentRequest)) {
-            throw new PaymentRequestNotSupportedException();
-        }
-
         $command = $this->paymentRequestCommandProvider->provide($paymentRequest);
 
         $this->commandBus->dispatch($command);
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
index af297aaca5..25bc4a3567 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
@@ -28,5 +28,7 @@
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\GatewayFactoryNameProviderInterface" />
             <argument type="tagged_locator" tag="sylius.payment_request.http_response.provider" index-by="gateway-factory" />
         </service>
+
+        <service id="sylius.payment_request.provider.http_response.default" alias="sylius.payment_request.provider.http_response.gateway_factory" />
     </services>
 </container>

From 3b81554f2a901607f76e0996387188be5881c0f6 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 21:27:45 +0300
Subject: [PATCH 169/200] Missing final keyword on spec class

---
 .../CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php b/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php
index e174d56a3b..8e09b9274a 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/OrderPay/Provider/FinalUrlProviderSpec.php
@@ -18,7 +18,7 @@ use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
 
-class FinalUrlProviderSpec extends ObjectBehavior
+final class FinalUrlProviderSpec extends ObjectBehavior
 {
     function let(
         RouteParametersProcessorInterface $routeParametersProcessor,

From bcd0c07b955bc05222038b28fff1c69ecb9d6363 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 21:45:33 +0300
Subject: [PATCH 170/200] Fix phpstan

---
 .../OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
index b9f77ba4ed..4a616d38ad 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -49,6 +49,7 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
         $hash = $this->getPaymentRequestHash($requestConfiguration);
         Assert::notNull($hash, 'A request attribute "hash" is required to retrieve the related order.');
 
+        /** @var PaymentRequestInterface|null $capturePaymentRequest */
         $capturePaymentRequest = $this->paymentRequestRepository->find($hash);
         if (null === $capturePaymentRequest) {
             throw new NotFoundHttpException(sprintf('The Payment Request with hash "%s" does not exist.', $hash));

From 6002b5454c10180fa057682baf36651265f7646f Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 9 Sep 2024 17:18:52 +0200
Subject: [PATCH 171/200] Change route to put optional param at the end of the
 route

---
 src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
index e9f98eb850..c13fd02d85 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml
@@ -19,7 +19,7 @@ sylius_shop_order_pay:
                 route: sylius_shop_order_after_pay
 
 sylius_shop_order_after_pay:
-    path: /{hash?}/after-pay
+    path: /after-pay/{hash?}
     methods: [GET, POST]
     defaults:
         _controller: sylius.shop.controller.order_pay::afterPayAction

From 91e1c84179e628ef661eb958ff69ac462e8c2db8 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 9 Sep 2024 17:19:20 +0200
Subject: [PATCH 172/200] First check for Payum then check for PaymentRequest

---
 .../services/integrations/order_pay/providers.xml      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
index 4baa925ce9..1fde0738b4 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
@@ -32,14 +32,14 @@
 
         <!-- Pay -->
 
-        <service id="sylius.shop.order_pay.provider.pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider">
-            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-300" />
-        </service>
-
         <service id="sylius.shop.order_pay.provider.pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
             <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
             <argument type="service" id="sylius.shop.order_pay.provider.after_pay_url" />
+            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-300" />
+        </service>
+
+        <service id="sylius.shop.order_pay.provider.pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider">
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
             <tag name="sylius.shop.order_pay.provider.pay_response" priority="-200" />
         </service>
 

From 8c3278936cf732c258268770bb7bdf8cea9e9bcf Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 9 Sep 2024 17:25:48 +0200
Subject: [PATCH 173/200] Switch to the new MetadataInterface namespace

---
 .../CoreBundle/OrderPay/Controller/OrderPayController.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Controller/OrderPayController.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Controller/OrderPayController.php
index fc7d836cda..7a223f55ff 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Controller/OrderPayController.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Controller/OrderPayController.php
@@ -19,7 +19,7 @@ use Sylius\Bundle\CoreBundle\OrderPay\Provider\PayResponseProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Order\Repository\OrderRepositoryInterface;
-use Sylius\Component\Resource\Metadata\MetadataInterface;
+use Sylius\Resource\Metadata\MetadataInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

From 133ea7dce9e7507f46c2f10cf2462b3e5f3730ce Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 16 Sep 2024 19:02:27 +0200
Subject: [PATCH 174/200] Refactor to externalize API PaymentRequest from
 PayPalContext

---
 .../Behat/Context/Api/PaypalContext.php       | 117 ++++--------------
 .../Checkout/CheckoutOrderDetailsContext.php  |   9 ++
 .../Api/Shop/PaymentRequestContext.php        |  85 +++++++++++++
 .../config/services/contexts/api/shop.xml     |  11 +-
 .../suites/api/checkout/paying_for_order.yml  |   1 +
 5 files changed, 127 insertions(+), 96 deletions(-)
 create mode 100644 src/Sylius/Behat/Context/Api/Shop/PaymentRequestContext.php

diff --git a/src/Sylius/Behat/Context/Api/PaypalContext.php b/src/Sylius/Behat/Context/Api/PaypalContext.php
index f64e113c9e..c430521815 100644
--- a/src/Sylius/Behat/Context/Api/PaypalContext.php
+++ b/src/Sylius/Behat/Context/Api/PaypalContext.php
@@ -15,15 +15,11 @@ namespace Sylius\Behat\Context\Api;
 
 use Behat\Behat\Context\Context;
 use Sylius\Behat\Client\ApiClientInterface;
-use Sylius\Behat\Client\RequestFactoryInterface;
 use Sylius\Behat\Client\ResponseCheckerInterface;
+use Sylius\Behat\Context\Api\Shop\Checkout\CheckoutCompleteContext;
+use Sylius\Behat\Context\Api\Shop\PaymentRequestContext;
 use Sylius\Behat\Service\Mocker\PaypalApiMocker;
 use Sylius\Behat\Service\SharedStorageInterface;
-use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Component\HttpFoundation\Request as HTTPRequest;
 use Webmozart\Assert\Assert;
 
 final class PaypalContext implements Context
@@ -31,10 +27,9 @@ final class PaypalContext implements Context
     public function __construct(
         private ApiClientInterface $client,
         private ResponseCheckerInterface $responseChecker,
-        private SharedStorageInterface $sharedStorage,
-        private RequestFactoryInterface $requestFactory,
         private PaypalApiMocker $paypalApiMocker,
-        private PaymentMethodRepositoryInterface $paymentMethodRepository,
+        private CheckoutCompleteContext $checkoutCompleteContext,
+        private PaymentRequestContext $paymentRequestContext,
     ) {
     }
 
@@ -44,14 +39,13 @@ final class PaypalContext implements Context
      */
     public function iConfirmMyOrderWithPaypalPayment(): void
     {
-        $this->completeOrder();
+        $this->checkoutCompleteContext->iConfirmMyOrder();
 
         $this->paypalApiMocker->performActionInApiInitializeScope(function () {
-            $payment = $this->responseChecker->getValue($this->client->getLastResponse(), 'payments')[0];
-            $this->postPaymentRequest($payment);
-
-            $uri = $this->responseChecker->getValue($this->client->getLastResponse(), '@id');
-            $this->sharedStorage->set('payment_request_uri', $uri);
+            $this->paymentRequestContext->iTryToPayForMyOrder([
+                'target_path' => 'https://myshop.tld/target-path',
+                'after_path' => 'https://myshop.tld/after-path',
+            ]);
         });
     }
 
@@ -62,15 +56,16 @@ final class PaypalContext implements Context
     public function iSignInToPaypalAndAuthorizeOrPaySuccessfully(): void
     {
         $this->paypalApiMocker->performActionInApiSuccessfulScope(function () {
-            $this->putPaymentRequest(
-                $this->sharedStorage->get('payment_request_uri'),
-                [
+            $this->paymentRequestContext->iTryToUpdateMyPaymentRequest([
+                'target_path' => 'https://myshop.tld/target-path',
+                'after_path' => 'https://myshop.tld/after-path',
+                'http_request' => [
                     'query' => [
                         'token' => 'EC-2d9EV13959UR209410U',
                         'PayerID' => 'UX8WBNYWGBVMG',
                     ],
                 ],
-            );
+            ]);
         });
     }
 
@@ -80,15 +75,16 @@ final class PaypalContext implements Context
      */
     public function iCancelMyPaypalPayment(): void
     {
-        $this->putPaymentRequest(
-            $this->sharedStorage->get('payment_request_uri'),
-            [
+        $this->paymentRequestContext->iTryToUpdateMyPaymentRequest([
+            'target_path' => 'https://myshop.tld/target-path',
+            'after_path' => 'https://myshop.tld/after-path',
+            'http_request' => [
                 'query' => [
                     'token' => 'EC-2d9EV13959UR209410U',
                     'cancelled' => 1,
                 ],
             ],
-        );
+        ]);
     }
 
     /**
@@ -96,15 +92,11 @@ final class PaypalContext implements Context
      */
     public function iTryToPayAgain(): void
     {
-        $this->client->show(Resources::ORDERS, $this->sharedStorage->get('cart_token'));
-
         $this->paypalApiMocker->performActionInApiInitializeScope(function () {
-            $payments = $this->responseChecker->getValue($this->client->getLastResponse(), 'payments');
-            $payment = end($payments);
-            $this->postPaymentRequest($payment);
-
-            $uri = $this->responseChecker->getValue($this->client->getLastResponse(), '@id');
-            $this->sharedStorage->set('payment_request_uri', $uri);
+            $this->paymentRequestContext->iTryToPayForMyOrder([
+                'target_path' => 'https://myshop.tld/target-path',
+                'after_path' => 'https://myshop.tld/after-path',
+            ]);
         });
     }
 
@@ -135,67 +127,4 @@ final class PaypalContext implements Context
             ),
         );
     }
-
-    private function completeOrder(): void
-    {
-        $request = $this->requestFactory->customItemAction(
-            'shop',
-            Resources::ORDERS,
-            $this->sharedStorage->get('cart_token'),
-            HTTPRequest::METHOD_PATCH,
-            'complete',
-        );
-
-        $this->client->executeCustomRequest($request);
-    }
-
-    private function postPaymentRequest(array $payment): void
-    {
-        $request = $this->requestFactory->create(
-            'shop',
-            Resources::PAYMENT_REQUESTS,
-            'Authorization',
-            $this->client->getToken(),
-        );
-
-        /** @var PaymentMethodInterface $paymentMethod */
-        $paymentMethod = $this->paymentMethodRepository->findOneBy([]);
-        /** @var GatewayConfigInterface $gatewayConfig */
-        $gatewayConfig = $paymentMethod->getGatewayConfig();
-        $authorize = $gatewayConfig->getConfig()['use_authorize'] ?? false;
-
-        $request->setContent([
-            'paymentId' => $payment['id'],
-            'paymentMethodCode' => $payment['method'],
-            'action' => $authorize
-                ? PaymentRequestInterface::ACTION_AUTHORIZE
-                : PaymentRequestInterface::ACTION_CAPTURE,
-            'payload' => [
-                'target_path' => 'https://myshop.tld/target-path',
-                'after_path' => 'https://myshop.tld/after-path',
-            ],
-        ]);
-
-        $this->client->executeCustomRequest($request);
-    }
-
-    public function putPaymentRequest(string $paymentRequestUri, array $httpRequest = []): void
-    {
-        $request = $this->requestFactory->custom(
-            $paymentRequestUri,
-            HttpRequest::METHOD_PUT,
-            [],
-            $this->client->getToken(),
-        );
-
-        $request->setContent([
-            'payload' => [
-                'target_path' => 'https://myshop.tld/target-path',
-                'after_path' => 'https://myshop.tld/after-path',
-                'http_request' => $httpRequest,
-            ],
-        ]);
-
-        $this->client->executeCustomRequest($request);
-    }
 }
diff --git a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
index 5af02a958d..2c775ab287 100644
--- a/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
+++ b/src/Sylius/Behat/Context/Api/Shop/Checkout/CheckoutOrderDetailsContext.php
@@ -59,6 +59,15 @@ final class CheckoutOrderDetailsContext implements Context
         Assert::notEq($state, PaymentInterface::STATE_NEW);
     }
 
+    /**
+     * @When I want to pay for my order
+     * @When I go to the change payment method page
+     */
+    public function iWantToPayForMyOrder(): void
+    {
+        $this->client->show(Resources::ORDERS, $this->sharedStorage->get('cart_token'));
+    }
+
     private function getLatestPaymentState(): ?string
     {
         $response = $this->client->show(Resources::ORDERS, $this->sharedStorage->get('cart_token'));
diff --git a/src/Sylius/Behat/Context/Api/Shop/PaymentRequestContext.php b/src/Sylius/Behat/Context/Api/Shop/PaymentRequestContext.php
new file mode 100644
index 0000000000..2b42fc164e
--- /dev/null
+++ b/src/Sylius/Behat/Context/Api/Shop/PaymentRequestContext.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Context\Api\Shop;
+
+use Behat\Behat\Context\Context;
+use Sylius\Behat\Client\ApiClientInterface;
+use Sylius\Behat\Client\RequestFactoryInterface;
+use Sylius\Behat\Client\ResponseCheckerInterface;
+use Sylius\Behat\Context\Api\Resources;
+use Sylius\Behat\Service\SharedStorageInterface;
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
+use Symfony\Component\HttpFoundation\Request as HTTPRequest;
+
+final class PaymentRequestContext implements Context
+{
+    public function __construct(
+        private SharedStorageInterface $sharedStorage,
+        private ApiClientInterface $client,
+        private ResponseCheckerInterface $responseChecker,
+        private RequestFactoryInterface $requestFactory,
+        private PaymentMethodRepositoryInterface $paymentMethodRepository,
+    ) {
+    }
+
+    /**
+     * @When I try to pay for my order
+     */
+    public function iTryToPayForMyOrder(array $payload = []): void
+    {
+        $this->client->show(Resources::ORDERS, $this->sharedStorage->get('cart_token'));
+
+        $payments = $this->responseChecker->getValue($this->client->getLastResponse(), 'payments');
+        $payment = end($payments);
+        $this->postPaymentRequest($payment, $payload);
+
+        $uri = $this->responseChecker->getValue($this->client->getLastResponse(), '@id');
+        $this->sharedStorage->set('payment_request_uri', $uri);
+    }
+
+    /**
+     * @When I try to update my payment request
+     */
+    public function iTryToUpdateMyPaymentRequest(array $payload = []): void
+    {
+        $this->putPaymentRequest($this->sharedStorage->get('payment_request_uri'), $payload);
+    }
+
+    private function postPaymentRequest(array $payment, array $payload): void
+    {
+        $request = $this->requestFactory->create(
+            'shop',
+            Resources::PAYMENT_REQUESTS,
+            'Authorization',
+            $this->client->getToken(),
+        );
+
+        $request->setContent([
+            'paymentId' => $payment['id'],
+            'paymentMethodCode' => $payment['method'],
+            'payload' => $payload,
+        ]);
+
+        $this->client->executeCustomRequest($request);
+    }
+
+    public function putPaymentRequest(string $paymentRequestUri, array $payload = []): void
+    {
+        $request = $this->requestFactory->custom(
+            $paymentRequestUri,
+            HttpRequest::METHOD_PUT,
+            [],
+            $this->client->getToken(),
+        );
+
+        $request->setContent([
+            'payload' => $payload,
+        ]);
+
+        $this->client->executeCustomRequest($request);
+    }
+}
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
index 4a3d6a98cd..a13f0655ff 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
@@ -163,9 +163,16 @@
         <service id="sylius.behat.context.api.paypal" class="Sylius\Behat\Context\Api\PaypalContext">
             <argument type="service" id="sylius.behat.api_platform_client.shop" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
-            <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="sylius.behat.request_factory" />
             <argument type="service" id="sylius.behat.paypal_api_mocker" />
+            <argument type="service" id="sylius.behat.context.api.shop.checkout.complete" />
+            <argument type="service" id="sylius.behat.context.api.shop.payment_request" />
+        </service>
+
+        <service id="sylius.behat.context.api.shop.payment_request" class="Sylius\Behat\Context\Api\Shop\PaymentRequestContext">
+            <argument type="service" id="sylius.behat.shared_storage" />
+            <argument type="service" id="sylius.behat.api_platform_client.shop" />
+            <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
+            <argument type="service" id="sylius.behat.request_factory" />
             <argument type="service" id="sylius.repository.payment_method" />
         </service>
 
diff --git a/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml b/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
index 816b8fa9f9..30d491d781 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml
@@ -47,6 +47,7 @@ default:
                 - sylius.behat.context.api.shop.checkout.complete
                 - sylius.behat.context.api.shop.checkout.order_details
                 - sylius.behat.context.api.shop.order
+                - sylius.behat.context.api.shop.payment_request
                 - sylius.behat.context.api.shop.response
 
             filters:

From 4f8eaf1da7ab2f0d991e57953bb2853ed2bee90b Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 16 Sep 2024 19:03:28 +0200
Subject: [PATCH 175/200] Introduce default action & payload providers when no
 action or payload are given

---
 .../Command/Payment/AddPaymentRequest.php     |  2 +-
 .../Payment/AddPaymentRequestHandler.php      |  9 ++++--
 .../config/services/command_handlers.xml      |  2 ++
 .../config/validation/AddPaymentRequest.xml   |  7 -----
 .../PaymentRequestPayResponseProvider.php     | 11 ++++---
 .../Provider/DefaultActionProvider.php        | 31 +++++++++++++++++++
 .../DefaultActionProviderInterface.php        | 21 +++++++++++++
 .../Provider/DefaultPayloadProvider.php       | 24 ++++++++++++++
 .../DefaultPayloadProviderInterface.php       | 21 +++++++++++++
 .../config/services/order_pay/providers.xml   |  2 ++
 .../services/payment_request/providers.xml    |  6 ++++
 11 files changed, 121 insertions(+), 15 deletions(-)
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultActionProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultActionProviderInterface.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultPayloadProvider.php
 create mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultPayloadProviderInterface.php

diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index 8e42e31da8..dd26d165a4 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -21,7 +21,7 @@ class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
     public function __construct(
         public readonly int|string $paymentId,
         public readonly string $paymentMethodCode,
-        public readonly string $action,
+        public readonly ?string $action = null,
         public readonly mixed $payload = null,
     ) {
     }
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 5ed88739b1..1498550d1c 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -16,6 +16,8 @@ namespace Sylius\Bundle\ApiBundle\CommandHandler\Payment;
 use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
 use Sylius\Bundle\ApiBundle\Exception\PaymentMethodNotFoundException;
 use Sylius\Bundle\ApiBundle\Exception\PaymentNotFoundException;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\DefaultActionProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\DefaultPayloadProviderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
@@ -28,6 +30,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 /** @experimental */
 final class AddPaymentRequestHandler implements MessageHandlerInterface
 {
+
     /**
      * @param PaymentMethodRepositoryInterface<PaymentMethodInterface> $paymentMethodRepository
      * @param PaymentRepositoryInterface<PaymentInterface> $paymentRepository
@@ -39,6 +42,8 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         private PaymentRepositoryInterface $paymentRepository,
         private PaymentRequestFactoryInterface $paymentRequestFactory,
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
+        private DefaultActionProviderInterface $defaultActionProvider,
+        private DefaultPayloadProviderInterface $defaultPayloadProvider,
     ) {
     }
 
@@ -70,8 +75,8 @@ final class AddPaymentRequestHandler implements MessageHandlerInterface
         }
 
         $paymentRequest = $this->paymentRequestFactory->create($payment, $paymentMethod);
-        $paymentRequest->setAction($addPaymentRequest->action);
-        $paymentRequest->setPayload($addPaymentRequest->payload);
+        $paymentRequest->setAction($addPaymentRequest->action ?? $this->defaultActionProvider->getAction($paymentRequest));
+        $paymentRequest->setPayload($addPaymentRequest->payload ?? $this->defaultPayloadProvider->getPayload($paymentRequest));
 
         return $paymentRequest;
     }
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index b2f2b9fb8e..f3dd220f88 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -217,6 +217,8 @@
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="sylius.factory.payment_request" />
             <argument type="service" id="sylius.repository.payment_request" />
+            <argument type="service" id="sylius.payment_request.provider.default_action" />
+            <argument type="service" id="sylius.payment_request.provider.default_payload" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
         </service>
 
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
index 0d3b8a2a18..9486f588a3 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/validation/AddPaymentRequest.xml
@@ -32,12 +32,5 @@
                 </option>
             </constraint>
         </property>
-        <property name="action">
-            <constraint name="NotBlank">
-                <option name="groups">
-                    <value>sylius</value>
-                </option>
-            </constraint>
-        </property>
     </class>
 </constraint-mapping>
diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
index b8fd4f4c8a..d6d248e980 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestPayResponseProvider.php
@@ -15,6 +15,8 @@ namespace Sylius\Bundle\CoreBundle\OrderPay\Provider;
 
 use Sylius\Bundle\CoreBundle\OrderPay\Resolver\PaymentToPayResolverInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\DefaultActionProviderInterface;
+use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\DefaultPayloadProviderInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\ServiceProviderAwareProviderInterface;
 use Sylius\Bundle\ResourceBundle\Controller\RequestConfiguration;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -36,6 +38,8 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
         private PaymentRequestRepositoryInterface $paymentRequestRepository,
         private PaymentRequestAnnouncerInterface $paymentRequestAnnouncer,
         private ServiceProviderAwareProviderInterface $httpResponseProvider,
+        private DefaultActionProviderInterface $defaultActionProvider,
+        private DefaultPayloadProviderInterface $defaultPayloadProvider,
         private PaymentToPayResolverInterface $paymentToPayResolver,
         private AfterPayUrlProvider $afterPayUrlProvider,
     ) {
@@ -53,11 +57,8 @@ final class PaymentRequestPayResponseProvider implements PayResponseProviderInte
 
         $paymentRequest = $this->paymentRequestFactory->create($payment, $paymentMethod);
 
-        $action = $paymentRequest->getAction();
-        if ($paymentMethod->getGatewayConfig()?->getConfig()['use_authorize'] ?? false) {
-            $action = PaymentRequestInterface::ACTION_AUTHORIZE;
-        }
-        $paymentRequest->setAction($action);
+        $paymentRequest->setAction($this->defaultActionProvider->getAction($paymentRequest));
+        $paymentRequest->setPayload($this->defaultPayloadProvider->getPayload($paymentRequest));
 
         $this->paymentRequestRepository->add($paymentRequest);
 
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultActionProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultActionProvider.php
new file mode 100644
index 0000000000..8e22a7f756
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultActionProvider.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class DefaultActionProvider implements DefaultActionProviderInterface
+{
+    public function getAction(PaymentRequestInterface $paymentRequest): string
+    {
+        $paymentMethod = $paymentRequest->getMethod();
+        /** @var GatewayConfigInterface $gatewayConfig */
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        $authorize = $gatewayConfig->getConfig()['use_authorize'] ?? false;
+
+        return $authorize ? PaymentRequestInterface::ACTION_AUTHORIZE : $paymentRequest->getAction();
+
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultActionProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultActionProviderInterface.php
new file mode 100644
index 0000000000..0dce2e1ab4
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultActionProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface DefaultActionProviderInterface
+{
+    public function getAction(PaymentRequestInterface $paymentRequest): string;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultPayloadProvider.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultPayloadProvider.php
new file mode 100644
index 0000000000..bf38f220bc
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultPayloadProvider.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+final class DefaultPayloadProvider implements DefaultPayloadProviderInterface
+{
+    public function getPayload(PaymentRequestInterface $paymentRequest): mixed
+    {
+        return null;
+    }
+}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultPayloadProviderInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultPayloadProviderInterface.php
new file mode 100644
index 0000000000..15220175fc
--- /dev/null
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Provider/DefaultPayloadProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\PaymentRequest\Provider;
+
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
+
+interface DefaultPayloadProviderInterface
+{
+    public function getPayload(PaymentRequestInterface $paymentRequest): mixed;
+}
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
index d6e5c81d14..b109a98ae5 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay/providers.xml
@@ -33,6 +33,8 @@
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" />
             <argument type="service" id="sylius.payment_request.provider.http_response.default" />
+            <argument type="service" id="sylius.payment_request.provider.default_action" />
+            <argument type="service" id="sylius.payment_request.provider.default_payload" />
         </service>
 
         <service abstract="true" id="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider" class="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider" />
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
index 25bc4a3567..2058af76cc 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/providers.xml
@@ -30,5 +30,11 @@
         </service>
 
         <service id="sylius.payment_request.provider.http_response.default" alias="sylius.payment_request.provider.http_response.gateway_factory" />
+
+        <service id="sylius.payment_request.provider.default_action" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\DefaultActionProvider" />
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\DefaultActionProviderInterface" alias="sylius.payment_request.provider.default_action" />
+
+        <service id="sylius.payment_request.provider.default_payload" class="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\DefaultPayloadProvider" />
+        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\DefaultPayloadProviderInterface" alias="sylius.payment_request.provider.default_payload" />
     </services>
 </container>

From 9b3a842094c99887cc77edc3235812a54467a2da Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 16 Sep 2024 19:04:07 +0200
Subject: [PATCH 176/200] re-Enable some scenarios

---
 ...ffline_payment_method_after_order_confirmation.feature | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature b/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
index 0312aaded3..cc207873f9 100644
--- a/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
+++ b/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
@@ -21,7 +21,7 @@ Feature: Changing the offline payment method after order confirmation
         And I retry the payment with "Offline" payment method
         Then I should have chosen "Offline" payment method
 
-    @no-api @ui
+    @api @ui
     Scenario: Retrying the payment with different Offline payment works correctly together with inventory
         Given there is 1 unit of product "PHP T-Shirt" available in the inventory
         And this product is tracked by the inventory
@@ -33,7 +33,7 @@ Feature: Changing the offline payment method after order confirmation
         And I retry the payment with "Offline" payment method
         Then I should have chosen "Offline" payment method
 
-    @no-api @ui
+    @todo-api @ui
     Scenario: Being unable to pay for my order if my chosen payment method gets disabled
         Given I added product "PHP T-Shirt" to the cart
         When I complete addressing step with email "john@example.com" and "United States" based billing address
@@ -44,7 +44,7 @@ Feature: Changing the offline payment method after order confirmation
         And I try to pay for my order
         Then I should be notified to choose a payment method
 
-    @no-api @ui
+    @api @ui
     Scenario: Retrying the payment with different payment method after order confirmation when the original is disabled
         Given I added product "PHP T-Shirt" to the cart
         When I complete addressing step with email "john@example.com" and "United States" based billing address
@@ -55,7 +55,7 @@ Feature: Changing the offline payment method after order confirmation
         And I retry the payment with "Offline" payment method
         Then I should have chosen "Offline" payment method
 
-    @no-api @ui
+    @todo-api @ui
     Scenario: Being unable to pay for my order if no methods are available
         Given I added product "PHP T-Shirt" to the cart
         When I complete addressing step with email "john@example.com" and "United States" based billing address

From f9c4ad20a7b5f3898b97b97c4461b5d376dc8bfa Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 16 Sep 2024 20:05:36 +0200
Subject: [PATCH 177/200] Fix too many required arguments

---
 .../post_payment_request_without_required_data.json             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json b/tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json
index 2375544bfe..40acb75331 100644
--- a/tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json
+++ b/tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json
@@ -1,4 +1,4 @@
 {
     "code": 400,
-    "message": "Request does not have the following required fields specified: paymentId, paymentMethodCode, action."
+    "message": "Request does not have the following required fields specified: paymentId, paymentMethodCode."
 }

From 2dd6cf5035fc754e373cbf1e84b42e38dacfe29d Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 16 Sep 2024 21:04:07 +0200
Subject: [PATCH 178/200] Fix PHPUnit env test_cached_payum

---
 config/services_test_cached_payum.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/services_test_cached_payum.yaml b/config/services_test_cached_payum.yaml
index 26988e7f44..1a0c660f47 100644
--- a/config/services_test_cached_payum.yaml
+++ b/config/services_test_cached_payum.yaml
@@ -5,6 +5,6 @@ services:
     'sylius.payment_request.command_provider.payum.offline':
         class: Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider
         arguments:
-            - !tagged_locator { tag: 'sylius.payment_request.command_provider.payum.offline', index_by: 'type' }
+            - !tagged_locator { tag: 'sylius.payment_request.command_provider.payum.offline', index_by: 'action' }
         tags:
             - { name: 'sylius.payment_request.command_provider', gateway-factory: 'offline', priority: -200 }

From dbdd2264196e2a700da956c3c578f93e664fd448 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:27:17 +0200
Subject: [PATCH 179/200] Prioritize PaymentRequest

---
 config/services_test_cached_payum.yaml        | 20 ++++++++++-
 .../services/integrations/payum/offline.xml   |  2 +-
 .../offline/command_handlers.xml              |  2 ++
 .../offline/command_providers.xml             |  4 ++-
 .../integrations/order_pay/providers.xml      | 33 ++++++++++---------
 5 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/config/services_test_cached_payum.yaml b/config/services_test_cached_payum.yaml
index 1a0c660f47..a4eff75f60 100644
--- a/config/services_test_cached_payum.yaml
+++ b/config/services_test_cached_payum.yaml
@@ -2,9 +2,27 @@ imports:
     - { resource: "services_test_cached.yaml" }
 
 services:
+    ##
+    # Prioritize Payum by tagging services with a higher priority (or lower for tagged_iterator).
+    ##
+    
     'sylius.payment_request.command_provider.payum.offline':
         class: Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider
         arguments:
             - !tagged_locator { tag: 'sylius.payment_request.command_provider.payum.offline', index_by: 'action' }
         tags:
-            - { name: 'sylius.payment_request.command_provider', gateway-factory: 'offline', priority: -200 }
+            - { name: 'sylius.payment_request.command_provider', gateway-factory: 'offline', priority: -100 }
+
+    'sylius.shop.order_pay.provider.pay_response.payum':
+        parent: Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider
+        arguments:
+            - '@sylius.shop.resolver.payment_to_pay'
+        tags:
+            - { name: 'sylius.shop.order_pay.provider.pay_response', priority: -150 }
+                
+    'sylius.shop.order_pay.provider.after_pay_response.payum':
+        parent: Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumAfterPayResponseProvider
+        arguments:
+            - '@sylius.shop.order_pay.handler.payment_state_flash'
+        tags:
+            - { name: 'sylius.shop.order_pay.provider.after_pay_response', priority: -50 }
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
index d6454020af..70a31852ca 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/offline.xml
@@ -20,7 +20,7 @@
 
         <service id="sylius.payment_request.command_provider.payum.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.offline" index-by="action" />
-            <tag name="sylius.payment_request.command_provider" gateway-factory="offline" />
+            <tag name="sylius.payment_request.command_provider" gateway-factory="offline" priority="100" />
         </service>
 
         <service id="sylius.payment_request.command_provider.payum.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
index 6678f28e62..1d449b1255 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
@@ -16,6 +16,8 @@
            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.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface" />
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
index 512b7b513b..1980809280 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_providers.xml
@@ -16,9 +16,11 @@
            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.command_provider.offline" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
             <argument type="tagged_locator" tag="sylius.payment_request.command_provider.offline" index-by="action" />
-            <tag name="sylius.payment_request.command_provider" gateway-factory="offline" priority="-100" />
+            <tag name="sylius.payment_request.command_provider" gateway-factory="offline" />
         </service>
 
         <service id="sylius.payment_request.command_provider.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Offline\CapturePaymentRequestCommandProvider">
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
index 1fde0738b4..0189bc86e3 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
@@ -17,6 +17,7 @@
 >
 
     <services>
+        <defaults public="true" />
 
         <service id="sylius.shop.order_pay.provider.after_pay_url" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\AfterPayUrlProvider">
             <argument type="string">%sylius_shop.order_pay.after_pay_route%</argument>
@@ -32,35 +33,35 @@
 
         <!-- Pay -->
 
-        <service id="sylius.shop.order_pay.provider.pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
-            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <argument type="service" id="sylius.shop.order_pay.provider.after_pay_url" />
-            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-300" />
-        </service>
-
-        <service id="sylius.shop.order_pay.provider.pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider">
-            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-200" />
-        </service>
-
         <service id="sylius.shop.order_pay.provider.pay_response.no_payment" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\NoPaymentPayResponseProvider">
             <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
             <argument type="service" id="sylius.shop.order_pay.provider.final_url" />
             <tag name="sylius.shop.order_pay.provider.pay_response" priority="-100" />
         </service>
 
-        <!-- After pay -->
-
-        <service id="sylius.shop.order_pay.provider.after_pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumAfterPayResponseProvider">
-            <argument type="service" id="sylius.shop.order_pay.handler.payment_state_flash" />
-            <tag name="sylius.shop.order_pay.provider.after_pay_response" priority="-100" />
+        <service id="sylius.shop.order_pay.provider.pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <argument type="service" id="sylius.shop.order_pay.provider.after_pay_url" />
+            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-200" />
         </service>
 
+        <service id="sylius.shop.order_pay.provider.pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider">
+            <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <tag name="sylius.shop.order_pay.provider.pay_response" priority="-300" />
+        </service>
+
+        <!-- After pay -->
+
         <service id="sylius.shop.order_pay.provider.after_pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestAfterPayResponseProvider">
             <argument type="service" id="sylius.shop.order_pay.handler.payment_state_flash" />
             <argument type="service" id="sylius.shop.order_pay.provider.final_url" />
             <tag name="sylius.shop.order_pay.provider.after_pay_response" priority="-100" />
         </service>
 
+        <service id="sylius.shop.order_pay.provider.after_pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumAfterPayResponseProvider">
+            <argument type="service" id="sylius.shop.order_pay.handler.payment_state_flash" />
+            <tag name="sylius.shop.order_pay.provider.after_pay_response" priority="-200" />
+        </service>
+
     </services>
 </container>

From 52188d7963b9c31768fade38696ae10e6ef9d686 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 17 Sep 2024 00:34:13 +0200
Subject: [PATCH 180/200] Simplify offline to the strict minimum

---
 .../Offline/CapturePaymentRequestHandler.php  |  4 +-
 .../Payum/Factory/PayumTokenFactory.php       |  4 +-
 .../Processor/Offline/CaptureProcessor.php    | 36 ------------
 .../Offline/CaptureProcessorInterface.php     | 21 -------
 .../offline/command_handlers.xml              |  1 -
 .../payment_request/offline/processors.xml    | 23 --------
 .../CapturePaymentRequestHandlerSpec.php      | 10 ++--
 .../Offline/CaptureProcessorSpec.php          | 57 -------------------
 .../Resources/config/services/factory.xml     |  3 -
 9 files changed, 9 insertions(+), 150 deletions(-)
 delete mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
 delete mode 100644 src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessorInterface.php
 delete mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
 delete mode 100644 src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/Processor/Offline/CaptureProcessorSpec.php

diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index ca928a6715..ff1f0086d9 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -16,6 +16,7 @@ namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
 /** @experimental */
@@ -23,7 +24,6 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
 {
     public function __construct(
         private readonly PaymentRequestProviderInterface $paymentRequestProvider,
-        private readonly CaptureProcessorInterface $offlineCaptureProcessor,
     ) {
     }
 
@@ -31,6 +31,6 @@ final class CapturePaymentRequestHandler implements MessageHandlerInterface
     {
         $paymentRequest = $this->paymentRequestProvider->provide($capturePaymentRequest);
 
-        $this->offlineCaptureProcessor->process($paymentRequest);
+        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
index 52f7441d97..3a30a35b58 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Payum/Factory/PayumTokenFactory.php
@@ -18,6 +18,7 @@ use Payum\Core\Security\TokenInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Exception\InvalidPaymentRequestPayloadException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
+use Webmozart\Assert\Assert;
 
 final class PayumTokenFactory implements PayumTokenFactoryInterface
 {
@@ -33,6 +34,7 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
         $paymentMethod = $paymentRequest->getMethod();
 
         $gatewayConfig = $paymentMethod->getGatewayConfig();
+        Assert::notNull($gatewayConfig, sprintf('Gateway config of the payment method (code %s) cannot be null.', $paymentMethod->getCode()));
         $gatewayName = $gatewayConfig->getGatewayName();
 
         /** @var array{
@@ -44,7 +46,7 @@ final class PayumTokenFactory implements PayumTokenFactoryInterface
          */
         $payload = $paymentRequest->getPayload();
         if (null === $payload) {
-            throw new InvalidPaymentRequestPayloadException('Payload of the payment request cannot be null');
+            throw new InvalidPaymentRequestPayloadException('Payload of the payment request cannot be null.');
         }
 
         $targetPath = $payload['target_path'] ?? null;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
deleted file mode 100644
index 91269e08ab..0000000000
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessor.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
-
-use Sylius\Abstraction\StateMachine\StateMachineInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\PaymentTransitions;
-
-final class CaptureProcessor implements CaptureProcessorInterface
-{
-    public function __construct(private readonly StateMachineInterface $stateMachine)
-    {
-    }
-
-    public function process(PaymentRequestInterface $paymentRequest): void
-    {
-        $payment = $paymentRequest->getPayment();
-
-        if ($this->stateMachine->can($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)) {
-            $this->stateMachine->apply($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS);
-        }
-
-        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED);
-    }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessorInterface.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessorInterface.php
deleted file mode 100644
index e645bb7892..0000000000
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Processor/Offline/CaptureProcessorInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
-
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-
-interface CaptureProcessorInterface
-{
-    public function process(PaymentRequestInterface $paymentRequest): void;
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
index 1d449b1255..de5e05014c 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
@@ -20,7 +20,6 @@
 
         <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
-            <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
         </service>
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
deleted file mode 100644
index ac0645be05..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/processors.xml
+++ /dev/null
@@ -1,23 +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>
-        <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessor">
-            <argument type="service" id="sylius_abstraction.state_machine" />
-        </service>
-    </services>
-</container>
diff --git a/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
index 7b9d4fc3c6..99ce9c5799 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandlerSpec.php
@@ -17,27 +17,25 @@ use PhpSpec\ObjectBehavior;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
+use Sylius\Component\Payment\Model\PaymentRequest;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 final class CapturePaymentRequestHandlerSpec extends ObjectBehavior
 {
     function let(
-        PaymentRequestProviderInterface $paymentRequestProvider,
-        CaptureProcessorInterface $offlineCaptureProcessor
+        PaymentRequestProviderInterface $paymentRequestProvider
     ): void {
-        $this->beConstructedWith($paymentRequestProvider, $offlineCaptureProcessor);
+        $this->beConstructedWith($paymentRequestProvider);
     }
 
     function it_processes_offline_capture(
         PaymentRequestProviderInterface $paymentRequestProvider,
-        CaptureProcessorInterface $offlineCaptureProcessor,
         PaymentRequestInterface $paymentRequest
     ): void {
         $capturePaymentRequest = new CapturePaymentRequest('hash');
         $paymentRequestProvider->provide($capturePaymentRequest)->willReturn($paymentRequest);
+        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED)->shouldBeCalled();
 
         $this->__invoke($capturePaymentRequest);
-
-        $offlineCaptureProcessor->process($paymentRequest)->shouldHaveBeenCalled();
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/Processor/Offline/CaptureProcessorSpec.php b/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/Processor/Offline/CaptureProcessorSpec.php
deleted file mode 100644
index f00210696b..0000000000
--- a/src/Sylius/Bundle/CoreBundle/spec/PaymentRequest/Processor/Offline/CaptureProcessorSpec.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-declare(strict_types=1);
-
-namespace spec\Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline;
-
-use PhpSpec\ObjectBehavior;
-use Sylius\Abstraction\StateMachine\StateMachineInterface;
-use Sylius\Component\Core\Model\PaymentInterface;
-use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Sylius\Component\Payment\PaymentTransitions;
-
-final class CaptureProcessorSpec extends ObjectBehavior
-{
-    function let(
-        StateMachineInterface $stateMachine
-    ): void {
-        $this->beConstructedWith($stateMachine);
-    }
-
-    function it_processes_offline_capture(
-        StateMachineInterface $stateMachine,
-        PaymentRequestInterface $paymentRequest,
-        PaymentInterface $payment
-    ): void {
-        $paymentRequest->getPayment()->willReturn($payment);
-        $stateMachine->can($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)->willReturn(true);
-
-        $this->process($paymentRequest);
-
-        $stateMachine->apply($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)->shouldHaveBeenCalledOnce();
-        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED)->shouldHaveBeenCalledOnce();
-    }
-
-    function it_processes_offline_capture_if_payment_cannot_be_processed(
-        StateMachineInterface $stateMachine,
-        PaymentRequestInterface $paymentRequest,
-        PaymentInterface $payment
-    ): void {
-        $paymentRequest->getPayment()->willReturn($payment);
-        $stateMachine->can($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)->willReturn(false);
-
-        $this->process($paymentRequest);
-
-        $stateMachine->apply($payment, PaymentTransitions::GRAPH, PaymentTransitions::TRANSITION_PROCESS)->shouldNotHaveBeenCalled();
-        $paymentRequest->setState(PaymentRequestInterface::STATE_COMPLETED)->shouldHaveBeenCalledOnce();
-    }
-}
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
index 62ee359335..595cb5ecdb 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml
@@ -14,9 +14,6 @@
         <service id="Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactoryInterface" alias="sylius.factory.payum_resolve_next_route" />
 
         <service id="sylius.factory.payum_capture" class="Sylius\Bundle\PayumBundle\Factory\CaptureFactory" />
-        <service id="TokenAggregateRequestFactoryInterface" alias="sylius.factory.payum_capture" />
-
         <service id="sylius.factory.payum_authorize" class="Sylius\Bundle\PayumBundle\Factory\AuthorizeFactory" />
-        <service id="Sylius\Bundle\PayumBundle\Factory\AuthorizeRequestFactoryInterface" alias="sylius.factory.payum_authorize" />
     </services>
 </container>

From 3f387ca80842e06bc297b3897ddc24cda6bd57ef Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:47:27 +0200
Subject: [PATCH 181/200] Rename var

---
 .../Provider/PaymentRequestAfterPayResponseProvider.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
index 4a616d38ad..be91209c1c 100644
--- a/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
+++ b/src/Sylius/Bundle/CoreBundle/OrderPay/Provider/PaymentRequestAfterPayResponseProvider.php
@@ -49,13 +49,13 @@ final class PaymentRequestAfterPayResponseProvider implements AfterPayResponsePr
         $hash = $this->getPaymentRequestHash($requestConfiguration);
         Assert::notNull($hash, 'A request attribute "hash" is required to retrieve the related order.');
 
-        /** @var PaymentRequestInterface|null $capturePaymentRequest */
-        $capturePaymentRequest = $this->paymentRequestRepository->find($hash);
-        if (null === $capturePaymentRequest) {
+        /** @var PaymentRequestInterface|null $previousPaymentRequest */
+        $previousPaymentRequest = $this->paymentRequestRepository->find($hash);
+        if (null === $previousPaymentRequest) {
             throw new NotFoundHttpException(sprintf('The Payment Request with hash "%s" does not exist.', $hash));
         }
 
-        $paymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($capturePaymentRequest);
+        $paymentRequest = $this->paymentRequestFactory->createFromPaymentRequest($previousPaymentRequest);
         $paymentRequest->setAction(PaymentRequestInterface::ACTION_STATUS);
 
         if ($this->paymentRequestCommandProvider->supports($paymentRequest)) {

From ac94a1912cb1070b8e6d3924e0b94154a65164db Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:48:24 +0200
Subject: [PATCH 182/200] Lets Payum first check if it's a Payum gateway for UI

---
 config/services_test_cached_payum.yaml             | 14 --------------
 .../services/integrations/order_pay/providers.xml  |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/config/services_test_cached_payum.yaml b/config/services_test_cached_payum.yaml
index a4eff75f60..f37f730666 100644
--- a/config/services_test_cached_payum.yaml
+++ b/config/services_test_cached_payum.yaml
@@ -12,17 +12,3 @@ services:
             - !tagged_locator { tag: 'sylius.payment_request.command_provider.payum.offline', index_by: 'action' }
         tags:
             - { name: 'sylius.payment_request.command_provider', gateway-factory: 'offline', priority: -100 }
-
-    'sylius.shop.order_pay.provider.pay_response.payum':
-        parent: Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider
-        arguments:
-            - '@sylius.shop.resolver.payment_to_pay'
-        tags:
-            - { name: 'sylius.shop.order_pay.provider.pay_response', priority: -150 }
-                
-    'sylius.shop.order_pay.provider.after_pay_response.payum':
-        parent: Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumAfterPayResponseProvider
-        arguments:
-            - '@sylius.shop.order_pay.handler.payment_state_flash'
-        tags:
-            - { name: 'sylius.shop.order_pay.provider.after_pay_response', priority: -50 }
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
index 0189bc86e3..7c6a181353 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/order_pay/providers.xml
@@ -39,14 +39,14 @@
             <tag name="sylius.shop.order_pay.provider.pay_response" priority="-100" />
         </service>
 
-        <service id="sylius.shop.order_pay.provider.pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
+        <service id="sylius.shop.order_pay.provider.pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider">
             <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
-            <argument type="service" id="sylius.shop.order_pay.provider.after_pay_url" />
             <tag name="sylius.shop.order_pay.provider.pay_response" priority="-200" />
         </service>
 
-        <service id="sylius.shop.order_pay.provider.pay_response.payum" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PayumPayResponseProvider">
+        <service id="sylius.shop.order_pay.provider.pay_response.payment_request" parent="Sylius\Bundle\CoreBundle\OrderPay\Provider\PaymentRequestPayResponseProvider">
             <argument type="service" id="sylius.shop.resolver.payment_to_pay" />
+            <argument type="service" id="sylius.shop.order_pay.provider.after_pay_url" />
             <tag name="sylius.shop.order_pay.provider.pay_response" priority="-300" />
         </service>
 

From 100dad472a527ec7e177acf9eb034050f490ed10 Mon Sep 17 00:00:00 2001
From: Francis Hilaire <Prometee@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:04:47 +0200
Subject: [PATCH 183/200] One line import

Co-authored-by: Karol <33687392+Wojdylak@users.noreply.github.com>
---
 .../Bundle/CoreBundle/Resources/config/services/order_pay.xml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay.xml
index 9799504e9c..af3d9185e8 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_pay.xml
@@ -13,7 +13,6 @@
 
 <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">
     <imports>
-        <import resource="order_pay/*.xml" />
-        <import resource="order_pay/offline/*.xml"/>
+        <import resource="order_pay/**/*.xml" />
     </imports>
 </container>

From 206a8e682377bfb26cbb58e670320eb30a4655de Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Tue, 24 Sep 2024 09:37:52 +0200
Subject: [PATCH 184/200] Remove paypal integration

---
 .../payum/paypal_express_checkout.xml         | 39 -------------------
 .../config/integrations/payum/paypal.xml      | 32 ---------------
 2 files changed, 71 deletions(-)
 delete mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/paypal.xml

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
deleted file mode 100644
index 379645a71e..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/paypal_express_checkout.xml
+++ /dev/null
@@ -1,39 +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.command_provider.payum.paypal_express_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.paypal_express_checkout" index-by="action" />
-            <tag name="sylius.payment_request.command_provider" gateway-factory="paypal_express_checkout" />
-        </service>
-
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" action="capture" />
-        </service>
-
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" action="authorize" />
-        </service>
-
-        <service id="sylius.payment_request.command_provider.payum.paypal_express_checkout_nvp.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\StatusCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.paypal_express_checkout" action="status" />
-        </service>
-
-    </services>
-</container>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/paypal.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/paypal.xml
deleted file mode 100644
index 3bc5725d4a..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/paypal.xml
+++ /dev/null
@@ -1,32 +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.form.type.gateway_configuration.paypal" class="Sylius\Bundle\PayumBundle\Form\Type\PaypalGatewayConfigurationType">
-            <tag name="sylius.gateway_configuration_type" type="paypal_express_checkout" label="sylius.payum_gateway_factory.paypal_express_checkout" priority="100" />
-            <tag name="form.type" />
-        </service>
-
-        <service id="sylius.payum_action.paypal_express_checkout.convert_payment" class="Sylius\Bundle\PayumBundle\Action\Paypal\ExpressCheckout\ConvertPaymentAction">
-            <argument type="service" id="sylius.invoice_number_generator" />
-            <tag name="payum.action" factory="paypal_express_checkout" alias="sylius.paypal_express_checkout.convert_payment" />
-        </service>
-    </services>
-</container>

From fd0bf81fb5d0392c2856891d6ad9d874b0026da4 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Tue, 24 Sep 2024 09:38:07 +0200
Subject: [PATCH 185/200] Remove stripe integration

---
 .../SyliusCoreExtension.php                   | 10 -----
 .../services/integrations/payum/stripe.xml    | 39 -------------------
 .../SyliusPayumExtension.php                  | 10 -----
 .../Resources/config/app/config.yaml          |  9 -----
 .../config/integrations/payum/stripe.xml      | 27 -------------
 5 files changed, 95 deletions(-)
 delete mode 100644 src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
 delete mode 100644 src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/stripe.xml

diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
index c1c499e664..1f2c20b820 100644
--- a/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
+++ b/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
@@ -14,8 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\DependencyInjection;
 
 use Payum\Offline\OfflineGatewayFactory;
-use Payum\Paypal\ExpressCheckout\Nvp\PaypalExpressCheckoutGatewayFactory;
-use Payum\Stripe\StripeCheckoutGatewayFactory;
 use Sylius\Bundle\CoreBundle\Attribute\AsCatalogPromotionApplicatorCriteria;
 use Sylius\Bundle\CoreBundle\Attribute\AsCatalogPromotionPriceCalculator;
 use Sylius\Bundle\CoreBundle\Attribute\AsEntityObserver;
@@ -195,14 +193,6 @@ final class SyliusCoreExtension extends AbstractResourceExtension implements Pre
         if (class_exists(OfflineGatewayFactory::class)) {
             $loader->load('services/integrations/payum/offline.xml');
         }
-
-        if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) {
-            $loader->load('services/integrations/payum/paypal_express_checkout.xml');
-        }
-
-        if (class_exists(StripeCheckoutGatewayFactory::class)) {
-            $loader->load('services/integrations/payum/stripe.xml');
-        }
     }
 
     private function registerAutoconfiguration(ContainerBuilder $container): void
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
deleted file mode 100644
index 5e741b35d0..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/integrations/payum/stripe.xml
+++ /dev/null
@@ -1,39 +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.command_provider.payum.stripe_checkout" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\ActionsCommandProvider">
-            <argument type="tagged_locator" tag="sylius.payment_request.command_provider.payum.stripe_checkout" index-by="action" />
-            <tag name="sylius.payment_request.command_provider" gateway-factory="stripe_checkout" />
-        </service>
-
-        <service id="sylius.payment_request.command_provider.payum.stripe_checkout.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\CaptureCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" action="capture" />
-        </service>
-
-        <service id="sylius.payment_request.command_provider.payum.stripe_checkout.authorize" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\AuthorizeCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" action="authorize" />
-        </service>
-
-        <service id="sylius.payment_request.command_provider.payum.stripe_checkout.status" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\Payum\StatusCommandProvider">
-            <tag name="sylius.payment_request.command_provider.payum.stripe_checkout" action="status" />
-        </service>
-
-    </services>
-</container>
diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
index a89871ede9..021fd73f01 100644
--- a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
+++ b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -13,8 +13,6 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PayumBundle\DependencyInjection;
 
-use Payum\Paypal\ExpressCheckout\Nvp\PaypalExpressCheckoutGatewayFactory;
-use Payum\Stripe\StripeCheckoutGatewayFactory;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -31,14 +29,6 @@ final class SyliusPayumExtension extends AbstractResourceExtension implements Pr
 
         $loader->load('services.xml');
 
-        if (class_exists(PaypalExpressCheckoutGatewayFactory::class)) {
-            $loader->load('integrations/payum/paypal.xml');
-        }
-
-        if (class_exists(StripeCheckoutGatewayFactory::class)) {
-            $loader->load('integrations/payum/stripe.xml');
-        }
-
         $container->setParameter('payum.template.layout', $config['template']['layout']);
         $container->setParameter('payum.template.obtain_credit_card', $config['template']['obtain_credit_card']);
     }
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
index 3a92582d9b..4805c1af32 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/app/config.yaml
@@ -24,12 +24,3 @@ sylius_payment:
             classes:
                 model: Sylius\Bundle\PayumBundle\Model\GatewayConfig
                 interface: Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface
-
-    gateway_config:
-        validation_groups:
-            paypal_express_checkout:
-                - 'sylius'
-                - 'sylius_paypal_express_checkout'
-            stripe_checkout:
-                - 'sylius'
-                - 'sylius_stripe_checkout'
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/stripe.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/stripe.xml
deleted file mode 100644
index 4cc237ab63..0000000000
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/integrations/payum/stripe.xml
+++ /dev/null
@@ -1,27 +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.form.type.gateway_configuration.stripe" class="Sylius\Bundle\PayumBundle\Form\Type\StripeGatewayConfigurationType">
-            <tag name="sylius.gateway_configuration_type" type="stripe_checkout" label="sylius.payum_gateway_factory.stripe_checkout" priority="50" />
-            <tag name="form.type" />
-        </service>
-    </services>
-</container>

From 94930b8d2082281ee9d3ebd7dabad046918d50cb Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Wed, 25 Sep 2024 07:44:46 +0200
Subject: [PATCH 186/200] Remove usage of deprecated MessageHandlerInterface

---
 .../CommandHandler/Cart/RemoveItemFromCartHandler.php       | 1 -
 .../CommandHandler/Payment/AddPaymentRequestHandler.php     | 5 +++--
 .../CommandHandler/Payment/UpdatePaymentRequestHandler.php  | 5 +++--
 .../Tests/Application/src/CommandHandler/FooHandler.php     | 1 -
 .../Admin/Account/RequestResetPasswordEmailHandler.php      | 1 -
 .../Admin/Account/SendResetPasswordEmailHandler.php         | 1 -
 .../CommandHandler/Offline/CapturePaymentRequestHandler.php | 6 +++---
 .../CommandHandler/Payum/ModelPaymentRequestHandler.php     | 5 +++--
 .../CommandHandler/Payum/TokenPaymentRequestHandler.php     | 5 +++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/RemoveItemFromCartHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/RemoveItemFromCartHandler.php
index fba955dc49..f81385391b 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/RemoveItemFromCartHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/RemoveItemFromCartHandler.php
@@ -19,7 +19,6 @@ use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Order\Modifier\OrderModifierInterface;
 use Sylius\Component\Order\Repository\OrderItemRepositoryInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
 #[AsMessageHandler]
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index 1498550d1c..b3d5707568 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -25,10 +25,11 @@ use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
 use Sylius\Component\Payment\Factory\PaymentRequestFactoryInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 /** @experimental */
-final class AddPaymentRequestHandler implements MessageHandlerInterface
+#[AsMessageHandler]
+final class AddPaymentRequestHandler
 {
 
     /**
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 554aca864c..26496baa19 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -17,10 +17,11 @@ use Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest;
 use Sylius\Component\Payment\Exception\PaymentRequestNotFoundException;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 /** @experimental */
-final class UpdatePaymentRequestHandler implements MessageHandlerInterface
+#[AsMessageHandler]
+final class UpdatePaymentRequestHandler
 {
     /**
      * @param PaymentRequestRepositoryInterface<PaymentRequestInterface> $paymentRequestRepository
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/src/CommandHandler/FooHandler.php b/src/Sylius/Bundle/ApiBundle/Tests/Application/src/CommandHandler/FooHandler.php
index fc7cc37ebd..12a30e0ec7 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/Application/src/CommandHandler/FooHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/Tests/Application/src/CommandHandler/FooHandler.php
@@ -15,7 +15,6 @@ namespace Sylius\Bundle\ApiBundle\Application\CommandHandler;
 
 use Sylius\Bundle\ApiBundle\Application\Command\FooCommand;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
 #[AsMessageHandler]
 final class FooHandler
diff --git a/src/Sylius/Bundle/CoreBundle/CommandHandler/Admin/Account/RequestResetPasswordEmailHandler.php b/src/Sylius/Bundle/CoreBundle/CommandHandler/Admin/Account/RequestResetPasswordEmailHandler.php
index b5081e3526..638ca63817 100644
--- a/src/Sylius/Bundle/CoreBundle/CommandHandler/Admin/Account/RequestResetPasswordEmailHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/CommandHandler/Admin/Account/RequestResetPasswordEmailHandler.php
@@ -20,7 +20,6 @@ use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
 
diff --git a/src/Sylius/Bundle/CoreBundle/CommandHandler/Admin/Account/SendResetPasswordEmailHandler.php b/src/Sylius/Bundle/CoreBundle/CommandHandler/Admin/Account/SendResetPasswordEmailHandler.php
index e17ad3cb5f..a57557a597 100644
--- a/src/Sylius/Bundle/CoreBundle/CommandHandler/Admin/Account/SendResetPasswordEmailHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/CommandHandler/Admin/Account/SendResetPasswordEmailHandler.php
@@ -18,7 +18,6 @@ use Sylius\Bundle\CoreBundle\Mailer\ResetPasswordEmailManagerInterface;
 use Sylius\Component\Core\Model\AdminUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Webmozart\Assert\Assert;
 
 #[AsMessageHandler]
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index ff1f0086d9..5e9a006228 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -14,13 +14,13 @@ declare(strict_types=1);
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline;
 
 use Sylius\Bundle\CoreBundle\PaymentRequest\Command\Offline\CapturePaymentRequest;
-use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Offline\CaptureProcessorInterface;
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 /** @experimental */
-final class CapturePaymentRequestHandler implements MessageHandlerInterface
+#[AsMessageHandler]
+final class CapturePaymentRequestHandler
 {
     public function __construct(
         private readonly PaymentRequestProviderInterface $paymentRequestProvider,
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
index 132e27bed0..61f7de446e 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/ModelPaymentRequestHandler.php
@@ -20,9 +20,10 @@ use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInter
 use Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface;
 use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-final class ModelPaymentRequestHandler implements MessageHandlerInterface
+#[AsMessageHandler]
+final class ModelPaymentRequestHandler
 {
     public function __construct(
         private PaymentRequestProviderInterface $paymentRequestProvider,
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
index 402227d8cd..fe62eb77d3 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Payum/TokenPaymentRequestHandler.php
@@ -21,9 +21,10 @@ use Sylius\Bundle\CoreBundle\PaymentRequest\Processor\Payum\RequestProcessorInte
 use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface;
 use Sylius\Bundle\PayumBundle\Factory\TokenAggregateRequestFactoryInterface;
 use Sylius\Component\Payment\Exception\NonExistingPayumTokenException;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-final class TokenPaymentRequestHandler implements MessageHandlerInterface
+#[AsMessageHandler]
+final class TokenPaymentRequestHandler
 {
     public function __construct(
         private PaymentRequestProviderInterface $paymentRequestProvider,

From d0deea8120e51a4e1193f0f05b543ac108555afd Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Wed, 25 Sep 2024 08:40:48 +0200
Subject: [PATCH 187/200] [CI] Fix matrix

---
 .github/workflows/matrix.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
index d6793322a4..f43e863230 100644
--- a/.github/workflows/matrix.json
+++ b/.github/workflows/matrix.json
@@ -39,7 +39,8 @@
           "symfony": "^6.4",
           "api-platform": "^3.3",
           "mysql": "8.0",
-          "twig": "^3.3"
+          "twig": "^3.3",
+          "env": "test_cached"
         },
         {
           "php": "8.3",
@@ -52,7 +53,7 @@
         {
           "php": "8.3",
           "symfony": "^6.4",
-          "api-platform": "^2.7.10",
+          "api-platform": "^3.3",
           "mysql": "8.4",
           "twig": "^3.3",
           "env": "test_cached_payum"

From 2872d794f3f817a0efece01222ef261940babc09 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Wed, 25 Sep 2024 08:57:03 +0200
Subject: [PATCH 188/200] [Payum] Remove empty test suite config

---
 src/Sylius/Bundle/PayumBundle/phpunit.xml.dist | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Sylius/Bundle/PayumBundle/phpunit.xml.dist b/src/Sylius/Bundle/PayumBundle/phpunit.xml.dist
index 20f2829b34..8efd23600b 100644
--- a/src/Sylius/Bundle/PayumBundle/phpunit.xml.dist
+++ b/src/Sylius/Bundle/PayumBundle/phpunit.xml.dist
@@ -7,10 +7,4 @@
     <php>
         <server name="KERNEL_CLASS" value="AppKernel" />
     </php>
-
-    <testsuites>
-        <testsuite name="SyliusPayumBundle Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
 </phpunit>

From ac0844a41e91ba1868446a7c6bac592d1479fa37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pysiak?= <mpysiak@gmail.com>
Date: Wed, 25 Sep 2024 08:19:51 +0200
Subject: [PATCH 189/200] Add command bus for payment request

---
 .../Bundle/CoreBundle/Resources/config/app/messenger.yaml   | 4 ++++
 .../Resources/config/services/payment_request/announcer.xml | 2 +-
 .../services/payment_request/offline/command_handlers.xml   | 2 +-
 .../services/payment_request/payum/command_handlers.xml     | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
index a6f1b02f76..3aa19039e6 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
@@ -51,3 +51,7 @@ framework:
                     - validation
             sylius.event_bus:
                 default_middleware: allow_no_handlers
+            sylius.payment_request.command_bus:
+                middleware:
+                    - 'validation'
+                    - 'doctrine_transaction'
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
index a660d2af35..3f1081adb7 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/announcer.xml
@@ -20,7 +20,7 @@
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncerInterface" class="Sylius\Bundle\CoreBundle\PaymentRequest\Announcer\PaymentRequestAnnouncer">
             <argument type="service" id="sylius.payment_request.command_provider.default" />
-            <argument type="service" id="sylius.command_bus" />
+            <argument type="service" id="sylius.payment_request.command_bus" />
         </service>
 
     </services>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
index de5e05014c..8b15f878bf 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/offline/command_handlers.xml
@@ -20,7 +20,7 @@
 
         <service id="sylius.payment_request.offline.capture" class="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Offline\CapturePaymentRequestHandler">
             <argument type="service" id="Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInterface" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" />
+            <tag name="messenger.message_handler" bus="sylius.payment_request.command_bus" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
index 7b97de204a..07ba477212 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/payment_request/payum/command_handlers.xml
@@ -28,12 +28,12 @@
 
         <service id="sylius.payment_request.payum.capture" parent="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler">
             <argument type="service" id="sylius.factory.payum_capture" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\CapturePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius.payment_request.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\CapturePaymentRequest" />
         </service>
 
         <service id="sylius.payment_request.payum.authorize" parent="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\TokenPaymentRequestHandler">
             <argument type="service" id="sylius.factory.payum_authorize" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\AuthorizePaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius.payment_request.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\AuthorizePaymentRequest" />
         </service>
 
         <service id="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler" abstract="true">
@@ -44,7 +44,7 @@
 
         <service id="sylius.payment_request.payum.status" parent="Sylius\Bundle\CoreBundle\PaymentRequest\CommandHandler\Payum\ModelPaymentRequestHandler">
             <argument type="service" id="sylius.factory.payum_get_status_action" />
-            <tag name="messenger.message_handler" bus="sylius.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\StatusPaymentRequest" />
+            <tag name="messenger.message_handler" bus="sylius.payment_request.command_bus" handles="Sylius\Bundle\CoreBundle\PaymentRequest\Command\Payum\StatusPaymentRequest" />
         </service>
 
     </services>

From 5ec2ac0c7ae0626dbdc7f0cc720af62df8dd9450 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Thu, 26 Sep 2024 14:36:44 +0200
Subject: [PATCH 190/200] [API] Remove legacy ApiResources

---
 .../config/legacy_api_resources/Order.xml     | 529 ------------------
 .../legacy_api_resources/PaymentRequest.xml   |  88 ---
 2 files changed, 617 deletions(-)
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/Order.xml
 delete mode 100644 src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/PaymentRequest.xml

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/Order.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/Order.xml
deleted file mode 100644
index 817a8e4565..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/Order.xml
+++ /dev/null
@@ -1,529 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
-
- 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.
-
--->
-
-<resources xmlns="https://api-platform.com/schema/metadata"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
->
-    <resource class="%sylius.model.order.class%" shortName="Order">
-        <attribute name="validation_groups">sylius</attribute>
-
-        <collectionOperations>
-            <collectionOperation name="admin_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/orders</attribute>
-                <attribute name="filters">
-                    <attribute>sylius.api.order_channel_filter</attribute>
-                    <attribute>sylius.api.order_currency_filter</attribute>
-                    <attribute>sylius.api.order_customer_filter</attribute>
-                    <attribute>sylius.api.order_date_filter</attribute>
-                    <attribute>sylius.api.order_number_filter</attribute>
-                    <attribute>sylius.api.order_product_filter</attribute>
-                    <attribute>sylius.api.order_shipping_method_filter</attribute>
-                    <attribute>sylius.api.order_total_filter</attribute>
-                    <attribute>sylius.api.order_variants_filter</attribute>
-                </attribute>
-                <attribute name="order">
-                    <attribute name="number">DESC</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:order:index</attribute>
-                        <attribute>sylius:admin:order:index</attribute>
-                    </attribute>
-                </attribute>
-            </collectionOperation>
-
-            <collectionOperation name="shop_post">
-                <attribute name="method">POST</attribute>
-                <attribute name="path">/shop/orders</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Cart\PickupCart</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:create</attribute>
-                        <attribute>sylius:shop:order:create</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:show</attribute>
-                        <attribute>sylius:shop:order:show</attribute>
-                        <attribute>shop:cart:show</attribute>
-                        <attribute>sylius:shop:cart:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Pickups a new cart.</attribute>
-                </attribute>
-            </collectionOperation>
-
-            <collectionOperation name="shop_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/orders</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:index</attribute>
-                        <attribute>sylius:shop:order:index</attribute>
-                    </attribute>
-                </attribute>
-            </collectionOperation>
-        </collectionOperations>
-
-        <itemOperations>
-            <itemOperation name="admin_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/orders/{tokenValue}</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:order:show</attribute>
-                        <attribute>sylius:admin:order:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="admin_adjustments">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/orders/{tokenValue}/adjustments</attribute>
-                <attribute name="controller">Sylius\Bundle\ApiBundle\Controller\GetOrderAdjustmentsAction</attribute>
-                <attribute name="write">false</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:adjustment:show</attribute>
-                        <attribute>sylius:admin:adjustment:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:show</attribute>
-                        <attribute>sylius:shop:cart:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_delete">
-                <attribute name="method">DELETE</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}</attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Deletes cart.</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:show</attribute>
-                        <attribute>sylius:shop:order:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="admin_cancel">
-                <attribute name="method">PATCH</attribute>
-                <attribute name="path">/admin/orders/{tokenValue}/cancel</attribute>
-                <attribute name="input">false</attribute>
-                <attribute name="controller">Sylius\Bundle\ApiBundle\Applicator\OrderStateMachineTransitionApplicatorInterface::cancel</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:order:update</attribute>
-                        <attribute>sylius:admin:order:update</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>admin:order:show</attribute>
-                        <attribute>sylius:admin:order:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Cancels Order.</attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_add_item">
-                <attribute name="method">POST</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/items</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Cart\AddItemToCart</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:show</attribute>
-                        <attribute>sylius:shop:cart:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:add_item</attribute>
-                        <attribute>sylius:shop:cart:add_item</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Adds Item to cart.</attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_select_shipping_method">
-                <attribute name="method">PATCH</attribute>
-                <attribute name="validation_groups">
-                    <attribute>sylius</attribute>
-                </attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/shipments/{shipmentId}</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Checkout\ChooseShippingMethod</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:select_shipping_method</attribute>
-                        <attribute>sylius:shop:cart:select_shipping_method</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:show</attribute>
-                        <attribute>sylius:shop:order:show</attribute>
-                        <attribute>shop:cart:show</attribute>
-                        <attribute>sylius:shop:cart:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Selects shipping methods for particular shipment.</attribute>
-                    <attribute name="parameters">
-                        <attribute>
-                            <attribute name="name">tokenValue</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                        <attribute>
-                            <attribute name="name">shipmentId</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_select_payment_method">
-                <attribute name="method">PATCH</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/payments/{paymentId}</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Checkout\ChoosePaymentMethod</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:select_payment_method</attribute>
-                        <attribute>sylius:shop:cart:select_payment_method</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:show</attribute>
-                        <attribute>sylius:shop:order:show</attribute>
-                        <attribute>shop:cart:show</attribute>
-                        <attribute>sylius:shop:cart:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Selects payment methods for particular payment.</attribute>
-                    <attribute name="parameters">
-                        <attribute>
-                            <attribute name="name">tokenValue</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                        <attribute>
-                            <attribute name="name">paymentId</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_account_change_payment_method">
-                <attribute name="method">PATCH</attribute>
-                <attribute name="path">/shop/account/orders/{tokenValue}/payments/{paymentId}</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Account\ChangePaymentMethod</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:account:change_payment_method</attribute>
-                        <attribute>sylius:shop:order:account:change_payment_method</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:account:show</attribute>
-                        <attribute>sylius:shop:order:account:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Change the payment method as logged shop user.</attribute>
-                    <attribute name="parameters">
-                        <attribute>
-                            <attribute name="name">tokenValue</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                        <attribute>
-                            <attribute name="name">paymentId</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="get_configuration">
-                <attribute name="method">GET</attribute>
-                <attribute name="controller">Sylius\Bundle\ApiBundle\Controller\Payment\GetPaymentConfiguration</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/payments/{paymentId}/configuration</attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Retrieve payment method configuration.</attribute>
-                    <attribute name="parameters">
-                        <attribute>
-                            <attribute name="name">tokenValue</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                        <attribute>
-                            <attribute name="name">paymentId</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_complete">
-                <attribute name="method">PATCH</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/complete</attribute>
-                <attribute name="validation_groups">
-                    <attribute>sylius</attribute>
-                    <attribute>sylius_checkout_complete</attribute>
-                </attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Checkout\CompleteOrder</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:complete</attribute>
-                        <attribute>sylius:shop:cart:complete</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:show</attribute>
-                        <attribute>sylius:shop:order:show</attribute>
-                        <attribute>shop:cart:show</attribute>
-                        <attribute>sylius:shop:cart:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Completes checkout.</attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_remove_item">
-                <attribute name="method">DELETE</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/items/{itemId}</attribute>
-                <attribute name="controller">Sylius\Bundle\ApiBundle\Controller\DeleteOrderItemAction</attribute>
-                <attribute name="write">false</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:remove_item</attribute>
-                        <attribute>sylius:shop:cart:remove_item</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="parameters">
-                        <attribute>
-                            <attribute name="name">tokenValue</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                        <attribute>
-                            <attribute name="name">itemId</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_change_quantity">
-                <attribute name="method">PATCH</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/items/{orderItemId}</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Cart\ChangeItemQuantityInCart</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:change_quantity</attribute>
-                        <attribute>sylius:shop:cart:change_quantity</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:show</attribute>
-                        <attribute>sylius:shop:cart:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Changes quantity of order item.</attribute>
-                    <attribute name="parameters">
-                        <attribute>
-                            <attribute name="name">tokenValue</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                        <attribute>
-                            <attribute name="name">orderItemId</attribute>
-                            <attribute name="in">path</attribute>
-                            <attribute name="required">true</attribute>
-                            <attribute name="schema">
-                                <attribute name="type">string</attribute>
-                            </attribute>
-                        </attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_put">
-                <attribute name="method">PUT</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Checkout\UpdateCart</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:cart:update</attribute>
-                        <attribute>sylius:shop:cart:update</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>shop:order:show</attribute>
-                        <attribute>sylius:shop:order:show</attribute>
-                        <attribute>shop:cart:show</attribute>
-                        <attribute>sylius:shop:cart:show</attribute>
-                    </attribute>
-                </attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Addresses cart to given location, logged in Customer does not have to provide an email. Applies coupon to cart.</attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="admin_resend_confirmation">
-                <attribute name="method">POST</attribute>
-                <attribute name="path">/admin/orders/{tokenValue}/resend-confirmation-email</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\ResendOrderConfirmationEmail</attribute>
-                <attribute name="output">false</attribute>
-                <attribute name="status">202</attribute>
-                <attribute name="openapi_context">
-                    <attribute name="summary">Resends order confirmation email.</attribute>
-                </attribute>
-            </itemOperation>
-        </itemOperations>
-
-        <subresourceOperations>
-            <subresourceOperation name="items_get_subresource">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/items</attribute>
-            </subresourceOperation>
-
-            <subresourceOperation name="shipments_get_subresource">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/orders/{tokenValue}/shipments</attribute>
-            </subresourceOperation>
-
-            <subresourceOperation name="payments_get_subresource">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/orders/{tokenValue}/payments</attribute>
-            </subresourceOperation>
-
-            <subresourceOperation name="adjustments_get_subresource">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/adjustments</attribute>
-            </subresourceOperation>
-
-            <subresourceOperation name="items_adjustments_get_subresource">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/orders/{tokenValue}/items/{items}/adjustments</attribute>
-            </subresourceOperation>
-        </subresourceOperations>
-
-        <property name="id" identifier="false" writable="false" />
-        <property name="number" identifier="false" writable="false" />
-        <property name="tokenValue" identifier="true" writable="false" />
-        <property name="channel" writable="false" />
-        <property name="customer" writable="false" />
-        <property name="shipments" writable="false">
-            <subresource resourceClass="%sylius.model.shipment.class%" />
-        </property>
-        <property name="payments" writable="false">
-            <subresource resourceClass="%sylius.model.payment.class%" maxDepth="1"/>
-        </property>
-        <property name="state" writable="false" />
-        <property name="paymentState" writable="false" />
-        <property name="shippingState" writable="false" />
-        <property name="total" writable="false" />
-        <property name="orderPromotionTotal" writable="false" />
-        <property name="shippingPromotionTotal" writable="false" />
-        <property name="items" readable="true" writable="true">
-            <subresource resourceClass="%sylius.model.order_item.class%" />
-        </property>
-        <property name="notes" writable="true" />
-        <property name="itemsTotal" readable="true" />
-        <property name="taxTotal" readable="true"/>
-        <property name="shippingTaxTotal" readable="true"/>
-        <property name="taxExcludedTotal" readable="true"/>
-        <property name="taxIncludedTotal" readable="true"/>
-        <property name="adjustments" writable="false">
-            <subresource resourceClass="%sylius.model.adjustment.class%" />
-        </property>
-        <property name="billingAddress" writable="false" />
-        <property name="shippingAddress" writable="false" />
-        <property name="localeCode" writable="true" />
-    </resource>
-</resources>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/PaymentRequest.xml
deleted file mode 100644
index 51cc46e6f4..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/legacy_api_resources/PaymentRequest.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
-
- 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.
-
--->
-
-<resources xmlns="https://api-platform.com/schema/metadata"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd"
->
-    <resource class="%sylius.model.payment_request.class%" shortName="PaymentRequest">
-        <attribute name="validation_groups">sylius</attribute>
-
-        <attribute name="order">
-            <attribute name="createdAt">DESC</attribute>
-        </attribute>
-
-        <collectionOperations>
-            <collectionOperation name="shop_post">
-                <attribute name="method">POST</attribute>
-                <attribute name="path">/shop/payment-requests</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">sylius:shop:payment_request:create</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">sylius:shop:payment_request:show</attribute>
-                </attribute>
-            </collectionOperation>
-        </collectionOperations>
-
-        <itemOperations>
-            <itemOperation name="admin_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/admin/payment-requests/{hash}</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">sylius:admin:payment_request:show</attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_get">
-                <attribute name="method">GET</attribute>
-                <attribute name="path">/shop/payment-requests/{hash}</attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">sylius:shop:payment_request:show</attribute>
-                </attribute>
-            </itemOperation>
-
-            <itemOperation name="shop_put">
-                <attribute name="method">PUT</attribute>
-                <attribute name="path">/shop/payment-requests/{hash}</attribute>
-                <attribute name="messenger">input</attribute>
-                <attribute name="input">Sylius\Bundle\ApiBundle\Command\Payment\UpdatePaymentRequest</attribute>
-                <attribute name="denormalization_context">
-                    <attribute name="groups">sylius:shop:payment_request:update</attribute>
-                </attribute>
-                <attribute name="normalization_context">
-                    <attribute name="groups">
-                        <attribute>sylius:shop:payment_request:show</attribute>
-                    </attribute>
-                </attribute>
-            </itemOperation>
-        </itemOperations>
-
-        <subresourceOperations>
-            <subresourceOperation name="api_payments_payment_requests_get_subresource">
-                <attribute name="normalization_context">
-                    <attribute name="groups">sylius:admin:payment_request:index</attribute>
-                </attribute>
-            </subresourceOperation>
-        </subresourceOperations>
-
-        <property name="hash" identifier="true" writable="false" />
-        <property name="state" writable="false" />
-        <property name="payload" writable="true" />
-        <property name="responseData" writable="false" />
-        <property name="createdAt" writable="false" />
-        <property name="updatedAt" writable="false" />
-    </resource>
-</resources>

From 2d65680fb0618e7c245b223e9989fef2f0689f1e Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Wed, 25 Sep 2024 13:42:27 +0200
Subject: [PATCH 191/200] [Admin] Add payment request index and show pages

---
 .../config/app/twig_hooks/order/show.yaml     |  2 +
 .../payment/payment_request/index.yaml        |  5 +
 .../payment/payment_request/show.yaml         | 38 ++++++++
 .../Resources/config/grids/payment.yml        |  9 ++
 .../config/grids/payment_request_payment.yml  | 93 +++++++++++++++++++
 .../Resources/config/routing/payment.yml      | 26 ++++++
 .../sections/payments/item/actions.html.twig  |  2 +-
 .../actions/list_payment_requests.html.twig   |  7 ++
 .../common/label/state/cancelled.html.twig    |  3 +
 .../common/label/state/completed.html.twig    |  3 +
 .../common/label/state/failed.html.twig       |  3 +
 .../common/label/state/new.html.twig          |  3 +
 .../common/label/state/processing.html.twig   |  3 +
 .../grid/field/action.html.twig               |  1 +
 .../grid/field/method.html.twig               |  1 +
 .../grid/field/state.html.twig                |  1 +
 .../payment/payment_request/index.html.twig   |  3 +
 .../content/header/breadcrumbs.html.twig      | 10 ++
 .../payment/payment_request/show.html.twig    |  3 +
 .../show/content/header/breadcrumbs.html.twig | 12 +++
 .../show/content/sections.html.twig           | 13 +++
 .../show/content/sections/general.html.twig   | 12 +++
 .../content/sections/general/action.html.twig |  6 ++
 .../sections/general/created_at.html.twig     |  8 ++
 .../content/sections/general/hash.html.twig   |  4 +
 .../content/sections/general/method.html.twig |  8 ++
 .../content/sections/general/state.html.twig  |  6 ++
 .../sections/general/updated_at.html.twig     |  8 ++
 .../show/content/sections/payload.html.twig   | 10 ++
 .../content/sections/response_data.html.twig  | 10 ++
 .../Command/Payment/AddPaymentRequest.php     |  3 +-
 .../Payment/AddPaymentRequestHandler.php      |  1 -
 .../Payment/UpdatePaymentRequestHandler.php   |  1 -
 .../properties/PaymentRequest.xml             |  2 +-
 .../resources/admin/PaymentRequest.xml        |  9 +-
 .../resources/shop/PaymentRequest.xml         |  2 +-
 .../Resources/config/services/filters.xml     |  9 ++
 .../Announcer/PaymentRequestAnnouncer.php     |  2 +
 .../Offline/CapturePaymentRequestHandler.php  |  1 -
 .../Doctrine/ORM/PaymentRequestRepository.php | 27 ++++++
 .../doctrine/model/PaymentRequest.orm.xml     |  2 +-
 .../Resources/translations/messages.en.yml    | 11 +++
 .../PaymentRequestRepositoryInterface.php     |  5 +
 43 files changed, 376 insertions(+), 12 deletions(-)
 create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/index.yaml
 create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/show.yaml
 create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request_payment.yml
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/cancelled.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/completed.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/failed.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/new.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/processing.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/action.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/method.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/state.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index/content/header/breadcrumbs.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/action.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/created_at.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/hash.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/method.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/state.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/updated_at.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/payload.html.twig
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/response_data.html.twig

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/order/show.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/order/show.yaml
index 8be199f635..8e0be838cb 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/order/show.yaml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/order/show.yaml
@@ -124,6 +124,8 @@ twig_hooks:
                 template: '@SyliusAdmin/order/show/content/sections/payments/item/actions.html.twig'
 
         'sylius_admin.order.show.content.sections.payments.item.actions':
+            list_payment_requests:
+                template: '@SyliusAdmin/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig'
             complete:
                 template: '@SyliusAdmin/order/show/content/sections/payments/item/actions/complete.html.twig'
             refund:
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/index.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/index.yaml
new file mode 100644
index 0000000000..65a77dcde3
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/index.yaml
@@ -0,0 +1,5 @@
+twig_hooks:
+    hooks:
+        'sylius_admin.payment.payment_request.index.content.header':
+            breadcrumbs:
+                template: '@SyliusAdmin/payment/payment_request/index/content/header/breadcrumbs.html.twig'
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/show.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/show.yaml
new file mode 100644
index 0000000000..0300d97740
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/show.yaml
@@ -0,0 +1,38 @@
+twig_hooks:
+    hooks:
+        'sylius_admin.payment.payment_request.show.content':
+            sections:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections.html.twig'
+        
+        'sylius_admin.payment.payment_request.show.content.header':
+            breadcrumbs:
+                template: '@SyliusAdmin/payment/payment_request/show/content/header/breadcrumbs.html.twig'
+
+        'sylius_admin.payment.payment_request.show.content.sections':
+            general:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general.html.twig'
+
+        'sylius_admin.payment.payment_request.show.content.sections#left':
+            payload:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/payload.html.twig'
+
+        'sylius_admin.payment.payment_request.show.content.sections#right':
+            response_data:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/response_data.html.twig'
+
+        'sylius_admin.payment.payment_request.show.content.sections.general':
+            hash:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/hash.html.twig'
+            method:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/method.html.twig'
+            action:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/action.html.twig'
+            state:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/state.html.twig'
+            created_at:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/created_at.html.twig'
+            updated_at:
+                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/updated_at.html.twig'
+            
+                
+            
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
index 9e68b20060..da8938a081 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
@@ -69,6 +69,15 @@ sylius_grid:
                         class: "%sylius.model.channel.class%"
             actions:
                 item:
+                    show_payment_requests:
+                        type: show
+                        icon: list_letters
+                        label: sylius.ui.list_payment_requests
+                        options:
+                            link:
+                                route: sylius_admin_payment_payment_request_index
+                                parameters:
+                                    id: resource.id
                     complete:
                         type: apply_transition
                         label: sylius.ui.complete
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request_payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request_payment.yml
new file mode 100644
index 0000000000..0193850f42
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request_payment.yml
@@ -0,0 +1,93 @@
+sylius_grid:
+    grids:
+        sylius_admin_payment_payment_request:
+            driver:
+                name: doctrine/orm
+                options:
+                    class: "%sylius.model.payment_request.class%"
+                    repository:
+                        method: createForPaymentQueryBuilder
+                        arguments:
+                            paymentId: $id
+            sorting:
+                createdAt: desc
+            fields:
+                hash:
+                    type: string
+                    label: sylius.ui.hash
+                    sortable: ~
+                method:
+                    type: twig
+                    label: sylius.ui.payment_method
+                    path: .
+                    options:
+                        template: "@SyliusAdmin/payment/payment_request/grid/field/method.html.twig"
+                action:
+                    type: twig
+                    label: sylius.ui.action
+                    options:
+                        template: "@SyliusAdmin/payment/payment_request/grid/field/action.html.twig"
+                state:
+                    type: twig
+                    label: sylius.ui.state
+                    options:
+                        template: "@SyliusAdmin/payment/payment_request/grid/field/state.html.twig"
+                createdAt:
+                    type: twig
+                    label: sylius.ui.creation_date
+                    sortable: ~
+                    options:
+                        template: "@SyliusAdmin/shared/grid/field/date.html.twig"
+                        vars:
+                            th_class: "w-1 text-center"
+                updatedAt:
+                    type: twig
+                    label: sylius.ui.updating_date
+                    sortable: ~
+                    options:
+                        template: "@SyliusAdmin/shared/grid/field/date.html.twig"
+                        vars:
+                            th_class: "w-1 text-center"
+            filters:
+                payment_method:
+                    type: ux_translatable_autocomplete
+                    label: sylius.ui.payment_method
+                    form_options:
+                        extra_options:
+                            class: "%sylius.model.payment_method.class%"
+                            translation_fields: [ name ]
+                            choice_label: name
+                    options:
+                        fields: [ method.id ]
+                action:
+                    type: select
+                    label: sylius.ui.action
+                    form_options:
+                        choices:
+                            sylius.ui.authorize: authorize
+                            sylius.ui.cancel: cancel
+                            sylius.ui.capture: capture
+                            sylius.ui.payout: payout
+                            sylius.ui.refund: refund
+                            sylius.ui.status: status
+                            sylius.ui.sync: sync
+                state:
+                    type: select
+                    label: sylius.ui.state
+                    form_options:
+                        choices:
+                            sylius.ui.cancelled: cancelled
+                            sylius.ui.completed: completed
+                            sylius.ui.failed: failed
+                            sylius.ui.new: new
+                            sylius.ui.processing: processing
+            actions:
+                item:
+                    show:
+                        type: show
+                        options:
+                            link:
+                                route: sylius_admin_payment_payment_request_show
+                                parameters:
+                                    hash: resource.hash
+                                    paymentId: resource.payment.id
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml
index 7836913aa2..1cf8a99c7d 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml
@@ -27,3 +27,29 @@ sylius_admin_payment_complete:
                 transition: complete
             redirect: sylius_admin_payment_index
             flash: sylius.payment.completed
+
+sylius_admin_payment_payment_request_index:
+    path: /payments/{id}/payment_requests
+    methods: [GET]
+    defaults:
+        _controller: sylius.controller.payment_request::indexAction
+        _sylius:
+            section: admin
+            permission: true
+            template: "@SyliusAdmin/payment/payment_request/index.html.twig"
+            grid: sylius_admin_payment_payment_request
+            
+sylius_admin_payment_payment_request_show:
+    path: /payments/{paymentId}/payment_requests/{hash}
+    methods: [GET]
+    defaults:
+        _controller: sylius.controller.payment_request::showAction
+        _sylius:
+            section: admin
+            permission: true
+            template: "@SyliusAdmin/payment/payment_request/show.html.twig"
+            repository:
+                method: findOneByPaymentId
+                arguments:
+                    hash: $hash
+                    paymentId: $paymentId
diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions.html.twig
index adda10e322..bd819d830f 100644
--- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions.html.twig
@@ -1,5 +1,5 @@
 <td>
-    <div class="d-flex justify-content-end">
+    <div class="d-flex gap-1 justify-content-end">
         {% hook 'actions' %}
     </div>
 </td>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
new file mode 100644
index 0000000000..35b236f598
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
@@ -0,0 +1,7 @@
+{% from '@SyliusAdmin/shared/helper/icon.html.twig' import icon %}
+
+{% set payment = hookable_metadata.context.payment %}
+
+<a title="details" href="{{ path('sylius_admin_payment_payment_request_index', {'id': payment.id}) }}" class="btn btn-icon" data-bs-toggle="tooltip" data-bs-title="{{ 'sylius.ui.list_payment_requests'|trans }}" {{ sylius_test_html_attribute('list_payment_requests') }}>
+    {{ icon({ icon: 'list_letters', class: 'icon icon-tabler' }) }}
+</a>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/cancelled.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/cancelled.html.twig
new file mode 100644
index 0000000000..32ccce80d9
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/cancelled.html.twig
@@ -0,0 +1,3 @@
+<span class="badge bg-red-lt">
+    {{ 'sylius.ui.cancelled'|trans }}
+</span>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/completed.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/completed.html.twig
new file mode 100644
index 0000000000..a5905f47ca
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/completed.html.twig
@@ -0,0 +1,3 @@
+<span class="badge bg-green-lt">
+    {{ 'sylius.ui.completed'|trans }}
+</span>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/failed.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/failed.html.twig
new file mode 100644
index 0000000000..fe3f039a82
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/failed.html.twig
@@ -0,0 +1,3 @@
+<span class="badge bg-red-lt">
+    {{ 'sylius.ui.failed'|trans }}
+</span>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/new.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/new.html.twig
new file mode 100644
index 0000000000..a4d06f6191
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/new.html.twig
@@ -0,0 +1,3 @@
+<span class="badge">
+    {{ 'sylius.ui.new'|trans }}
+</span>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/processing.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/processing.html.twig
new file mode 100644
index 0000000000..73cc86d08f
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/processing.html.twig
@@ -0,0 +1,3 @@
+<span class="badge bg-blue-lt">
+    {{ 'sylius.ui.processing'|trans }}
+</span>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/action.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/action.html.twig
new file mode 100644
index 0000000000..fdd927ad81
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/action.html.twig
@@ -0,0 +1 @@
+{{ ('sylius.ui.' ~ data)|trans }}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/method.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/method.html.twig
new file mode 100644
index 0000000000..27de352225
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/method.html.twig
@@ -0,0 +1 @@
+<a class="fw-medium" href="{{ path('sylius_admin_payment_method_update', {'id' : data.method.id }) }}">{{ data.method.name }}</a>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/state.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/state.html.twig
new file mode 100644
index 0000000000..f4e5ed460d
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/state.html.twig
@@ -0,0 +1 @@
+{{ include('@SyliusAdmin/payment/payment_request/common/label/state/' ~ data ~ '.html.twig') }}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index.html.twig
new file mode 100644
index 0000000000..0173df70ac
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index.html.twig
@@ -0,0 +1,3 @@
+{% extends '@SyliusAdmin/shared/crud/index.html.twig' %}
+
+{% set resource_name = 'payment.payment_request' %}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index/content/header/breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index/content/header/breadcrumbs.html.twig
new file mode 100644
index 0000000000..6bb28bc2b8
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index/content/header/breadcrumbs.html.twig
@@ -0,0 +1,10 @@
+{% from '@SyliusAdmin/shared/helper/breadcrumbs.html.twig' import breadcrumbs %}
+
+{% set configuration = hookable_metadata.context.resources.requestConfiguration %}
+
+{{ breadcrumbs([
+    { name: 'sylius.ui.dashboard', url: path('sylius_admin_dashboard'), active: false },
+    { name: 'sylius.ui.payments'|trans, url: path('sylius_admin_payment_index'), active: false },
+    { name: configuration.request.get('id'), active: false },
+    { name: 'sylius.ui.payment_requests'|trans, active: true },
+]) }}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show.html.twig
new file mode 100644
index 0000000000..b7fccd3b30
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show.html.twig
@@ -0,0 +1,3 @@
+{% extends '@SyliusAdmin/shared/crud/show.html.twig' %}
+
+{% set resource_name = 'payment.payment_request' %}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig
new file mode 100644
index 0000000000..4dfdab9d99
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig
@@ -0,0 +1,12 @@
+{% from '@SyliusAdmin/shared/helper/breadcrumbs.html.twig' import breadcrumbs %}
+
+{% set payment_request = hookable_metadata.context.resource %}
+{% set payment_id = payment_request.payment.id %}
+
+{{ breadcrumbs([
+    { name: 'sylius.ui.dashboard', url: path('sylius_admin_dashboard'), active: false },
+    { name: 'sylius.ui.payments'|trans, url: path('sylius_admin_payment_index'), active: false },
+    { name: payment_id, active: false },
+    { name: 'sylius.ui.payment_requests'|trans, url: path('sylius_admin_payment_payment_request_index', {'id': payment_id}), active: false },
+    { name: payment_request.hash, active: true },
+]) }}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections.html.twig
new file mode 100644
index 0000000000..5c8568ec9d
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections.html.twig
@@ -0,0 +1,13 @@
+<div class="page-body">
+    <div class="container-xl">
+        {% hook 'sections' %}
+        <div class="row">
+            <div class="col-12 col-lg-6">
+                {% hook 'sections#left' %}
+            </div>
+            <div class="col-12 col-lg-6">
+                {% hook 'sections#right' %}
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general.html.twig
new file mode 100644
index 0000000000..ef8fb0c36a
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general.html.twig
@@ -0,0 +1,12 @@
+<div class="card mb-3">
+    <div class="card-header">
+        <div class="card-title">
+            {{ 'sylius.ui.general'|trans }}
+        </div>
+    </div>
+    <div class="card-body">
+        <div class="divide-y">
+            {% hook 'general' %}
+        </div>
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/action.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/action.html.twig
new file mode 100644
index 0000000000..1ac90f6367
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/action.html.twig
@@ -0,0 +1,6 @@
+<div class="row">
+    <div class="col-12 col-md-4 fw-bold">{{ 'sylius.ui.action'|trans }}</div>
+    <div class="col-12 col-md-8" {{ sylius_test_html_attribute('action') }}>
+        {{ ('sylius.ui.' ~ hookable_metadata.context.resource.action)|trans }}
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/created_at.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/created_at.html.twig
new file mode 100644
index 0000000000..b0d951d92f
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/created_at.html.twig
@@ -0,0 +1,8 @@
+{% set date_format = hookable_metadata.configuration.date_format|default('YYYY-MM-dd HH:mm:ss') %}
+
+<div class="row">
+    <div class="col-12 col-md-4 fw-bold">{{ 'sylius.ui.created_at'|trans }}</div>
+    <div class="col-12 col-md-8" {{ sylius_test_html_attribute('created-at') }}>
+        {{ hookable_metadata.context.resource.createdAt|format_datetime(pattern=date_format) }}
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/hash.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/hash.html.twig
new file mode 100644
index 0000000000..ebd52237b9
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/hash.html.twig
@@ -0,0 +1,4 @@
+<div class="row">
+    <div class="col-12 col-md-4 fw-bold">{{ 'sylius.ui.hash'|trans }}</div>
+    <div class="col-12 col-md-8" {{ sylius_test_html_attribute('hash') }}>{{ hookable_metadata.context.resource.hash }}</div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/method.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/method.html.twig
new file mode 100644
index 0000000000..bc03040d24
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/method.html.twig
@@ -0,0 +1,8 @@
+{% set payment_method = hookable_metadata.context.resource.method %}
+
+<div class="row">
+    <div class="col-12 col-md-4 fw-bold">{{ 'sylius.ui.payment_method'|trans }}</div>
+    <div class="col-12 col-md-8" {{ sylius_test_html_attribute('method') }}>
+        <a href="{{ path('sylius_admin_payment_method_update', {'id' : payment_method.id }) }}">{{ payment_method.name }}</a>
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/state.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/state.html.twig
new file mode 100644
index 0000000000..a541449a76
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/state.html.twig
@@ -0,0 +1,6 @@
+<div class="row">
+    <div class="col-12 col-md-4 fw-bold">{{ 'sylius.ui.state'|trans }}</div>
+    <div class="col-12 col-md-8" {{ sylius_test_html_attribute('state') }}>
+        {{ include('@SyliusAdmin/payment/payment_request/common/label/state/' ~ hookable_metadata.context.resource.state ~ '.html.twig') }}
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/updated_at.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/updated_at.html.twig
new file mode 100644
index 0000000000..b2118eff8c
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/updated_at.html.twig
@@ -0,0 +1,8 @@
+{% set date_format = hookable_metadata.configuration.date_format|default('YYYY-MM-dd HH:mm:ss') %}
+
+<div class="row">
+    <div class="col-12 col-md-4 fw-bold">{{ 'sylius.ui.updated_at'|trans }}</div>
+    <div class="col-12 col-md-8" {{ sylius_test_html_attribute('updated-at') }}>
+        {{ hookable_metadata.context.resource.updatedAt|format_datetime(pattern=date_format) }}
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/payload.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/payload.html.twig
new file mode 100644
index 0000000000..d84ed901b7
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/payload.html.twig
@@ -0,0 +1,10 @@
+<div class="card mb-3">
+    <div class="card-header">
+        <div class="card-title">
+            {{ 'sylius.ui.payload'|trans }}
+        </div>
+    </div>
+    <div class="card-body">
+        <pre {{ sylius_test_html_attribute('payload') }}>{{ hookable_metadata.context.resource.payload|json_encode(constant('JSON_PRETTY_PRINT')) }}</pre>
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/response_data.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/response_data.html.twig
new file mode 100644
index 0000000000..4b0f4776c7
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/response_data.html.twig
@@ -0,0 +1,10 @@
+<div class="card mb-3">
+    <div class="card-header">
+        <div class="card-title">
+            {{ 'sylius.ui.response_data'|trans }}
+        </div>
+    </div>
+    <div class="card-body">
+        <pre {{ sylius_test_html_attribute('response-data') }}>{{ hookable_metadata.context.resource.responseData|json_encode(constant('JSON_PRETTY_PRINT')) }}</pre>
+    </div>
+</div>
diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index dd26d165a4..42a6a16d87 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -15,11 +15,10 @@ namespace Sylius\Bundle\ApiBundle\Command\Payment;
 
 use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
 
-/** @experimental */
 class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
 {
     public function __construct(
-        public readonly int|string $paymentId,
+        public readonly mixed $paymentId,
         public readonly string $paymentMethodCode,
         public readonly ?string $action = null,
         public readonly mixed $payload = null,
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
index b3d5707568..44e7ce8755 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/AddPaymentRequestHandler.php
@@ -27,7 +27,6 @@ use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-/** @experimental */
 #[AsMessageHandler]
 final class AddPaymentRequestHandler
 {
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
index 26496baa19..c2ad290a3c 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Payment/UpdatePaymentRequestHandler.php
@@ -19,7 +19,6 @@ use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-/** @experimental */
 #[AsMessageHandler]
 final class UpdatePaymentRequestHandler
 {
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/properties/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/properties/PaymentRequest.xml
index 37dc151843..9377f9aea0 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/properties/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/properties/PaymentRequest.xml
@@ -15,5 +15,5 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="https://api-platform.com/schema/metadata/properties-3.0 https://api-platform.com/schema/metadata/properties-3.0.xsd"
 >
-    <property resource="Sylius\Component\Payment\Model\PaymentRequest" name="hash" identifier="true" />
+    <property resource="%sylius.model.payment_request.class%" name="hash" identifier="true" />
 </properties>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentRequest.xml
index 1354ca0dea..5d77f2b6f9 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentRequest.xml
@@ -16,7 +16,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://api-platform.com/schema/metadata/resources-3.0 https://api-platform.com/schema/metadata/resources-3.0.xsd"
 >
-    <resource class="Sylius\Component\Payment\Model\PaymentRequest">
+    <resource class="%sylius.model.payment_request.class%">
         <operations>
             <operation
                 name="sylius_api_admin_payment_request_get"
@@ -32,9 +32,9 @@
         </operations>
     </resource>
 
-    <resource class="Sylius\Component\Payment\Model\PaymentRequest" uriTemplate="/admin/payments/{paymentId}/payment-requests">
+    <resource class="%sylius.model.payment_request.class%" uriTemplate="/admin/payments/{paymentId}/payment-requests">
         <uriVariables>
-            <uriVariable parameterName="paymentId" fromClass="Sylius\Component\Core\Model\Payment" fromProperty="id" toClass="Sylius\Component\Payment\Model\PaymentRequest" toProperty="payment"/>
+            <uriVariable parameterName="paymentId" fromClass="%sylius.model.payment.class%" fromProperty="paymentRequests"/>
         </uriVariables>
         <operations>
             <operation name="sylius_api_admin_payment_payment_request_get_collection" class="ApiPlatform\Metadata\GetCollection">
@@ -47,6 +47,9 @@
                         </value>
                     </values>
                 </normalizationContext>
+                <filters>
+                    <filter>sylius_api.search_filter.admin.payment_request</filter>
+                </filters>
             </operation>
         </operations>
     </resource>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/shop/PaymentRequest.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/shop/PaymentRequest.xml
index d504ba2edb..2c0c96dc6b 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/shop/PaymentRequest.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/shop/PaymentRequest.xml
@@ -16,7 +16,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://api-platform.com/schema/metadata/resources-3.0 https://api-platform.com/schema/metadata/resources-3.0.xsd"
 >
-    <resource class="Sylius\Component\Payment\Model\PaymentRequest">
+    <resource class="%sylius.model.payment_request.class%">
         <operations>
             <operation
                 name="sylius_api_show_payment_request_get"
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
index ee57f66735..b15271be1f 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
@@ -35,6 +35,15 @@
             <tag name="api_platform.filter" />
         </service>
 
+        <service id="sylius_api.search_filter.admin.payment_request" parent="api_platform.doctrine.orm.search_filter" public="true">
+            <argument type="collection">
+                <argument key="action">exact</argument>
+                <argument key="method.code">exact</argument>
+                <argument key="state">exact</argument>
+            </argument>
+            <tag name="api_platform.filter" />
+        </service>
+
         <service id="sylius_api.search_filter.product_attribute" parent="api_platform.doctrine.orm.search_filter" public="true">
             <argument type="collection">
                 <argument key="code">partial</argument>
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
index a52b60ee8d..e54a7aa93b 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
@@ -13,6 +13,8 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Announcer;
 
+use Sylius\Bundle\CoreBundle\Command\Admin\Account\RequestResetPasswordEmail;
+use Sylius\Bundle\CoreBundle\Command\CapturePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
index 5e9a006228..a4fe9fdb42 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/CommandHandler/Offline/CapturePaymentRequestHandler.php
@@ -18,7 +18,6 @@ use Sylius\Bundle\CoreBundle\PaymentRequest\Provider\PaymentRequestProviderInter
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-/** @experimental */
 #[AsMessageHandler]
 final class CapturePaymentRequestHandler
 {
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index 8fffe03f0f..58e0c255d4 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -13,9 +13,11 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\PaymentBundle\Doctrine\ORM;
 
+use Doctrine\ORM\QueryBuilder;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Bridge\Doctrine\Types\UuidType;
 
 /**
  * @template T of PaymentRequestInterface
@@ -24,6 +26,31 @@ use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
  */
 class PaymentRequestRepository extends EntityRepository implements PaymentRequestRepositoryInterface
 {
+    public function findOneByPaymentId(mixed $hash, mixed $paymentId): ?PaymentRequestInterface
+    {
+        $queryBuilder = $this->createQueryBuilder('o');
+
+        return $queryBuilder
+            ->andWhere($queryBuilder->expr()->eq('o.hash', ':hash'))
+            ->andWhere($queryBuilder->expr()->eq('o.payment', ':paymentId'))
+            ->setParameter('hash', $hash, UuidType::NAME)
+            ->setParameter('paymentId', $paymentId)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+
+    public function createForPaymentQueryBuilder(string $paymentId): QueryBuilder
+    {
+        $queryBuilder = $this->createQueryBuilder('o');
+        $queryBuilder
+            ->andWhere($queryBuilder->expr()->eq('o.payment', ':paymentId'))
+            ->setParameter('paymentId', $paymentId)
+        ;
+
+        return $queryBuilder;
+    }
+
     public function duplicateExists(PaymentRequestInterface $paymentRequest): bool
     {
         /** @var PaymentRequestInterface[] $paymentRequests */
diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
index 476b0bf906..b63f9e74a0 100644
--- a/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
+++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/doctrine/model/PaymentRequest.orm.xml
@@ -24,7 +24,7 @@
             <join-column name="method_id" referenced-column-name="id" nullable="false" on-delete="CASCADE" />
         </many-to-one>
 
-        <many-to-one field="payment" target-entity="Sylius\Component\Payment\Model\PaymentInterface">
+        <many-to-one field="payment" target-entity="Sylius\Component\Payment\Model\PaymentInterface" inversed-by="paymentRequests">
             <join-column name="payment_id" referenced-column-name="id" nullable="false" />
         </many-to-one>
 
diff --git a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml
index 5a195f699b..c4e695c119 100644
--- a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml
+++ b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml
@@ -75,6 +75,7 @@ sylius:
         assortment: 'Assortment'
         attributes: 'Attributes'
         author: 'Author'
+        authorize: 'Authorize'
         authorized: 'Authorized'
         authorized_payment: 'Authorized payment'
         availability: 'Availability'
@@ -110,6 +111,7 @@ sylius:
         call_us: 'Call us!'
         cancel: 'Cancel'
         cancelled: 'Cancelled'
+        capture: 'Capture'
         cart: 'Cart'
         cart_locked: 'Cart locked'
         cart_summary: 'Cart summary'
@@ -397,6 +399,7 @@ sylius:
         guest: 'Guest'
         guest_customer: 'Guest customer'
         have_an_account_already: 'Have an account already?'
+        hash: 'Hash'
         height: 'Height'
         hello: 'Hello'
         hello_name: 'Hello <b>%name%</b>'
@@ -448,6 +451,7 @@ sylius:
         license: 'License'
         links: 'Links'
         list_coupons: 'List coupons'
+        list_payment_requests: 'List payment requests'
         list_variants: 'List variants'
         loading: 'Loading'
         locale: 'Locale'
@@ -646,14 +650,18 @@ sylius:
         password: 'Password'
         pay: 'Pay'
         pay_again: 'Click pay to try again'
+        payload: 'Payload'
         payment: 'Payment'
         payment_details: 'Payment details'
         payment_method: 'Payment method'
         payment_methods: 'Payment methods'
         payment_mode: 'Payment mode'
         payment_ready_to_pay: 'You can now make your payment'
+        payment_request: 'Payment request'
+        payment_requests: 'Payment requests'
         payment_state: 'Payment state'
         payments: 'Payments'
+        payout: 'Payout'
         pending: 'Pending'
         per_customer_usage_limit: 'Per customer usage limit'
         percent: 'Percent'
@@ -751,6 +759,7 @@ sylius:
         reset: 'Reset'
         reset_button: 'Reset'
         reset_password: 'Reset password'
+        response_data: 'Response data'
         restore: 'Restore'
         retail_price: 'Retail price'
         return: 'Return'
@@ -852,6 +861,7 @@ sylius:
         summary_of_your_order: 'Summary of your order'
         support: 'Support'
         sylius_logo: 'Sylius'
+        sync: 'Sync'
         target_currency: 'Target currency'
         tax: 'Tax'
         tax_categories: 'Tax Categories'
@@ -951,6 +961,7 @@ sylius:
         update_cart: 'Update cart'
         update_product_association_type: 'Update product association type'
         updated: 'Updated'
+        updated_at: 'Updated at'
         updating_date: 'Updating date'
         updating_tax_rate: 'Updating tax rate'
         usage: 'Usage'
diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
index 2eaca0a92d..a3f7887948 100644
--- a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 
 namespace Sylius\Component\Payment\Repository;
 
+use Doctrine\ORM\QueryBuilder;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
 
@@ -23,5 +24,9 @@ use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
  */
 interface PaymentRequestRepositoryInterface extends RepositoryInterface
 {
+    public function findOneByPaymentId(mixed $hash, mixed $paymentId): ?PaymentRequestInterface;
+
+    public function createForPaymentQueryBuilder(string $paymentId): QueryBuilder;
+
     public function duplicateExists(PaymentRequestInterface $paymentRequest): bool;
 }

From e4cbd6b46ad01c457eae49df461c2654709c36d1 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Wed, 25 Sep 2024 13:42:48 +0200
Subject: [PATCH 192/200] [Admin][PaymentRequest] Add behat tests

---
 .../browsing_payment_requests.feature         |  25 +++
 .../filtering_payment_requests.feature        |  46 ++++++
 .../seeing_payment_request_details.feature    |  23 +++
 ...nt_method_after_order_confirmation.feature |   2 +-
 src/Sylius/Behat/Client/ApiPlatformClient.php |   6 +-
 .../Admin/ManagingPaymentRequestsContext.php  | 156 ++++++++++++++++++
 .../Api/Admin/ManagingPaymentsContext.php     |  14 ++
 .../Api/Shop/PaymentRequestContext.php        |   3 +-
 .../Behat/Context/Setup/PaymentContext.php    |  24 +--
 .../Context/Setup/PaymentRequestContext.php   |  45 +++++
 .../Admin/ManagingPaymentRequestsContext.php  | 132 +++++++++++++++
 .../Ui/Admin/ManagingPaymentsContext.php      |   8 +
 .../Behat/Page/Admin/Payment/IndexPage.php    |  11 ++
 .../Page/Admin/Payment/IndexPageInterface.php |   2 +
 .../Payment/PaymentRequest/IndexPage.php      |  74 +++++++++
 .../PaymentRequest/IndexPageInterface.php     |  26 +++
 .../Admin/Payment/PaymentRequest/ShowPage.php |  40 +++++
 .../PaymentRequest/ShowPageInterface.php      |  21 +++
 .../config/services/contexts/api/admin.xml    |   7 +
 .../config/services/contexts/api/shop.xml     |   1 -
 .../config/services/contexts/setup.xml        |   5 +-
 .../Resources/config/services/contexts/ui.xml |   6 +
 .../config/services/pages/admin/payment.xml   |  18 ++
 .../suites/api/payment/managing_payments.yml  |   3 +
 .../suites/ui/payment/managing_payments.yml   |   2 +
 .../get_payment_requests_for_payment.json     |  45 ++++-
 26 files changed, 718 insertions(+), 27 deletions(-)
 create mode 100644 features/admin/payment/managing_payments/payment_request/browsing_payment_requests.feature
 create mode 100644 features/admin/payment/managing_payments/payment_request/filtering_payment_requests.feature
 create mode 100644 features/admin/payment/managing_payments/payment_request/seeing_payment_request_details.feature
 create mode 100644 src/Sylius/Behat/Context/Api/Admin/ManagingPaymentRequestsContext.php
 create mode 100644 src/Sylius/Behat/Context/Setup/PaymentRequestContext.php
 create mode 100644 src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
 create mode 100644 src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPage.php
 create mode 100644 src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPageInterface.php
 create mode 100644 src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPage.php
 create mode 100644 src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPageInterface.php

diff --git a/features/admin/payment/managing_payments/payment_request/browsing_payment_requests.feature b/features/admin/payment/managing_payments/payment_request/browsing_payment_requests.feature
new file mode 100644
index 0000000000..3b53205378
--- /dev/null
+++ b/features/admin/payment/managing_payments/payment_request/browsing_payment_requests.feature
@@ -0,0 +1,25 @@
+@managing_payments
+Feature: Browsing payment requests
+    In order to have an overview of all payment requests of a specific payment
+    As an Administrator
+    I want to browse all payment requests of a payment
+
+    Background:
+        Given the store operates on a single channel in "United States"
+        And the store has a product "PHP T-Shirt"
+        And the store ships everywhere for Free
+        And the store allows paying with "Cash on Delivery"
+        And there is an "#00000001" order with "PHP T-Shirt" product
+        And the payment request action "authorize" has been executed for order "#00000001" with the payment method "Cash on Delivery"
+        And the payment request action "capture" has been executed for order "#00000001" with the payment method "Cash on Delivery"
+        And the payment request action "sync" has been executed for order "#00000001" with the payment method "Cash on Delivery"
+        And I am logged in as an administrator
+
+    @api @ui
+    Scenario: Browsing payment requests of a payment
+        When I browse payments
+        And I want to view the payment request of the first payment
+        Then there should be 3 payment requests on the list
+        And it should be the payment request with action "authorize"
+        And it should be the payment request with action "capture"
+        And it should be the payment request with action "sync"
diff --git a/features/admin/payment/managing_payments/payment_request/filtering_payment_requests.feature b/features/admin/payment/managing_payments/payment_request/filtering_payment_requests.feature
new file mode 100644
index 0000000000..444c4d18d0
--- /dev/null
+++ b/features/admin/payment/managing_payments/payment_request/filtering_payment_requests.feature
@@ -0,0 +1,46 @@
+@managing_payments
+Feature: Filtering payment requests
+    In order to see specific payment requests
+    As an Administrator
+    I want to be able to filter payment requests on the list
+
+    Background:
+        Given the store operates on a single channel in "United States"
+        And the store has a product "PHP T-Shirt"
+        And the store ships everywhere for Free
+        And the store allows paying with "Cash on Delivery"
+        And the store allows paying with "Credit Card"
+        And there is an "#00000001" order with "PHP T-Shirt" product
+        And there is an "#00000002" order with "PHP T-Shirt" product
+        And the payment request action "authorize" has been executed for order "#00000001" with the payment method "Credit Card"
+        And the payment request action "authorize" has been executed for order "#00000001" with the payment method "Cash on Delivery"
+        And the payment request action "capture" has been executed for order "#00000001" with the payment method "Cash on Delivery"
+        And the payment request action "sync" has been executed for order "#00000001" with the payment method "Cash on Delivery"
+        And the payment request action "capture" has been executed for order "#00000002" with the payment method "Cash on Delivery"
+        And I am logged in as an administrator
+
+    @api @ui
+    Scenario: Filtering payment requests by action
+        When I browse payment requests of an order "#00000001"
+        And I filter by the "capture" action
+        Then there should be 1 payment request on the list
+        And it should be the payment request with action "capture"
+
+    @api @ui @mink:chromedriver
+    Scenario: Filtering payment requests by payment method
+        When I browse payment requests of an order "#00000001"
+        And I filter by the "Credit Card" payment method
+        Then there should be 1 payment request on the list
+        And it should be the payment request with payment method "Credit Card"
+
+    @api @ui
+    Scenario: Filtering payment requests by state "New"
+        When I browse payment requests of an order "#00000001"
+        And I filter by the "new" state
+        Then there should be 4 payment requests on the list
+
+    @api @ui
+    Scenario: Filtering payment requests by state "Completed"
+        When I browse payment requests of an order "#00000001"
+        And I filter by the "completed" state
+        Then there should be 0 payment request on the list
diff --git a/features/admin/payment/managing_payments/payment_request/seeing_payment_request_details.feature b/features/admin/payment/managing_payments/payment_request/seeing_payment_request_details.feature
new file mode 100644
index 0000000000..f51af8331a
--- /dev/null
+++ b/features/admin/payment/managing_payments/payment_request/seeing_payment_request_details.feature
@@ -0,0 +1,23 @@
+@managing_payments
+Feature: Seeing payment request details
+    In order to have an overview of one of payment requests
+    As an Administrator
+    I want to be able to see its details
+
+    Background:
+        Given the store operates on a single channel in "United States"
+        And the store has a product "PHP T-Shirt"
+        And the store ships everywhere for Free
+        And the store allows paying with "Cash on Delivery"
+        And there is an "#00000001" order with "PHP T-Shirt" product
+        And the payment request action "authorize" has been executed for order "#00000001" with the payment method "Cash on Delivery"
+        And I am logged in as an administrator
+
+    @api @ui
+    Scenario: Seeing payment request's details
+        When I view details of the payment request for the "#00000001" order
+        Then its method should be "Cash on Delivery"
+        And its action should be "Authorize"
+        And its state should be "New"
+        And its payload should has empty value
+        And its response data should has empty value
diff --git a/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature b/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
index e27714f35c..1c5517809d 100644
--- a/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
+++ b/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
@@ -21,7 +21,7 @@ Feature: Changing the offline payment method after order confirmation
         And I retry the payment with "Offline" payment method
         Then I should have chosen "Offline" payment method
 
-    @api @ui @javascript
+    @api
     Scenario: Retrying the payment with different Offline payment works correctly together with inventory
         Given there is 1 unit of product "PHP T-Shirt" available in the inventory
         And this product is tracked by the inventory
diff --git a/src/Sylius/Behat/Client/ApiPlatformClient.php b/src/Sylius/Behat/Client/ApiPlatformClient.php
index a93447efe2..32833811e2 100644
--- a/src/Sylius/Behat/Client/ApiPlatformClient.php
+++ b/src/Sylius/Behat/Client/ApiPlatformClient.php
@@ -55,10 +55,10 @@ final class ApiPlatformClient implements ApiClientInterface
     /** @param array<string, string> $queryParameters */
     public function subResourceIndex(string $resource, string $subResource, string $id, array $queryParameters = [], bool $forgetResponse = false): Response
     {
-        $request = $this->requestFactory->subResourceIndex($this->section, $resource, $id, $subResource, $queryParameters);
-        $request->authorize($this->getToken(), $this->authorizationHeader);
+        $this->request = $this->requestFactory->subResourceIndex($this->section, $resource, $id, $subResource, $queryParameters);
+        $this->request->authorize($this->getToken(), $this->authorizationHeader);
 
-        return $this->request($request, $forgetResponse);
+        return $this->request($this->request, $forgetResponse);
     }
 
     public function show(string $resource, string $id, bool $forgetResponse = false): Response
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentRequestsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentRequestsContext.php
new file mode 100644
index 0000000000..7fcded27b0
--- /dev/null
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentRequestsContext.php
@@ -0,0 +1,156 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Context\Api\Admin;
+
+use Behat\Behat\Context\Context;
+use Sylius\Behat\Client\ApiClientInterface;
+use Sylius\Behat\Client\ResponseCheckerInterface;
+use Sylius\Behat\Context\Api\Resources;
+use Sylius\Behat\Service\Converter\IriConverterInterface;
+use Sylius\Component\Core\Formatter\StringInflector;
+use Sylius\Component\Core\Model\ChannelInterface;
+use Sylius\Component\Core\Model\CustomerInterface;
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\PaymentTransitions;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Symfony\Component\HttpFoundation\Request as HttpRequest;
+use Webmozart\Assert\Assert;
+
+final readonly class ManagingPaymentRequestsContext implements Context
+{
+    public function __construct(
+        private ApiClientInterface $client,
+        private ResponseCheckerInterface $responseChecker,
+        private IriConverterInterface $iriConverter,
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+    ) {
+    }
+
+    /**
+     * @When I browse payment requests of an order :order
+     */
+    public function iBrowseOrdersOfACustomer(OrderInterface $order): void
+    {
+        $this->client->subResourceIndex(
+            Resources::PAYMENTS,
+            Resources::PAYMENT_REQUESTS,
+            (string) $order->getLastPayment()->getId()
+        );
+    }
+
+    /**
+     * @When I view details of the payment request for the :order order
+     */
+    public function iViewDetailsOfThePaymentRequestForTheOrder(OrderInterface $order): void
+    {
+        $paymentRequest = $this->paymentRequestRepository->findOneBy(['payment' => $order->getLastPayment()]);
+
+        $this->client->show(Resources::PAYMENT_REQUESTS, (string) $paymentRequest->getHash());
+    }
+
+    /**
+     * @When I filter by the :action action
+     */
+    public function iFilterByTheAction(string $action): void
+    {
+        $this->client->addFilter('action', $action);
+        $this->client->filter();
+    }
+
+    /**
+     * @When I filter by the :paymentMethod payment method
+     */
+    public function iFilterByThePaymentMethod(PaymentMethodInterface $paymentMethod): void
+    {
+        $this->client->addFilter('method.code', $paymentMethod->getCode());
+        $this->client->filter();
+    }
+
+    /**
+     * @When I filter by the :state state
+     */
+    public function iFilterByTheState(string $state): void
+    {
+        $this->client->addFilter('state', $state);
+        $this->client->filter();
+    }
+
+    /**
+     * @Then /^there should be (\d+) payment requests? on the list$/
+     */
+    public function thereShouldBeProductVariantsOnTheList(int $count): void
+    {
+        Assert::same($this->responseChecker->countCollectionItems($this->client->getLastResponse()), $count);
+    }
+
+    /**
+     * @Then it should be the payment request with action :action
+     */
+    public function itShouldBeThePaymentRequestWithAction(string $action): void
+    {
+        Assert::true($this->responseChecker->hasItemWithValue($this->client->getLastResponse(), 'action', $action));
+    }
+
+    /**
+     * @Then it should be the payment request with payment method :paymentMethod
+     */
+    public function itShouldBeThePaymentRequestWithPaymentMethod(PaymentMethodInterface $paymentMethod): void
+    {
+        Assert::true(
+            $this->responseChecker->hasItemWithValue(
+                $this->client->getLastResponse(),
+                'method',
+                $this->iriConverter->getIriFromResourceInSection($paymentMethod, 'admin'),
+            ),
+        );
+    }
+
+    /**
+     * @Then its method should be :paymentMethod
+     */
+    public function itsMethodShouldBe(PaymentMethodInterface $paymentMethod): void
+    {
+        Assert::true($this->responseChecker->hasValue(
+            $this->client->getLastResponse(),
+            'method',
+            $this->iriConverter->getIriFromResourceInSection($paymentMethod, 'admin'))
+        );
+    }
+
+    /**
+     * @Then /^its (action|state) should be "([^"]+)"$/
+     */
+    public function itsActionStateShouldBe(string $field, string $value): void
+    {
+        Assert::true($this->responseChecker->hasValue($this->client->getLastResponse(), $field, strtolower($value)));
+    }
+
+    /**
+     * @Then its payload should has empty value
+     */
+    public function itsPayloadShouldHasEmptyValue(): void
+    {
+        Assert::isEmpty($this->responseChecker->getValue($this->client->getLastResponse(), 'payload'));
+    }
+
+    /**
+     * @Then its response data should has empty value
+     */
+    public function itsResponseDataShouldHasEmptyValue(): void
+    {
+        Assert::isEmpty($this->responseChecker->getValue($this->client->getLastResponse(), 'responseData'));
+    }
+
+}
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentsContext.php
index d79eb9302a..8175dde7a4 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentsContext.php
@@ -58,6 +58,20 @@ final readonly class ManagingPaymentsContext implements Context
         $this->client->customItemAction(Resources::ORDERS, $order->getTokenValue(), HttpRequest::METHOD_GET, 'payments');
     }
 
+    /**
+     * @When I want to view the payment request of the first payment
+     */
+    public function iWantToViewThePaymentRequestOfTheFirstPayment(): void
+    {
+        $response = $this->client->getLastResponse();
+
+        $this->client->subResourceIndex(
+            Resources::PAYMENTS,
+            Resources::PAYMENT_REQUESTS,
+            (string) $this->responseChecker->getCollection($response)[0]['id']
+        );
+    }
+
     /**
      * @Then I should see the details of order :order
      */
diff --git a/src/Sylius/Behat/Context/Api/Shop/PaymentRequestContext.php b/src/Sylius/Behat/Context/Api/Shop/PaymentRequestContext.php
index 2b42fc164e..e8cae881e5 100644
--- a/src/Sylius/Behat/Context/Api/Shop/PaymentRequestContext.php
+++ b/src/Sylius/Behat/Context/Api/Shop/PaymentRequestContext.php
@@ -15,14 +15,13 @@ use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request as HTTPRequest;
 
-final class PaymentRequestContext implements Context
+final readonly class PaymentRequestContext implements Context
 {
     public function __construct(
         private SharedStorageInterface $sharedStorage,
         private ApiClientInterface $client,
         private ResponseCheckerInterface $responseChecker,
         private RequestFactoryInterface $requestFactory,
-        private PaymentMethodRepositoryInterface $paymentMethodRepository,
     ) {
     }
 
diff --git a/src/Sylius/Behat/Context/Setup/PaymentContext.php b/src/Sylius/Behat/Context/Setup/PaymentContext.php
index 9a7fe0dd2e..2de4188c42 100644
--- a/src/Sylius/Behat/Context/Setup/PaymentContext.php
+++ b/src/Sylius/Behat/Context/Setup/PaymentContext.php
@@ -20,12 +20,10 @@ use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Component\Core\Formatter\StringInflector;
 use Sylius\Component\Core\Model\ChannelInterface;
-use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentMethodTranslationInterface;
 use Sylius\Component\Payment\Repository\PaymentMethodRepositoryInterface;
 use Sylius\Resource\Factory\FactoryInterface;
-use Webmozart\Assert\Assert;
 
 final readonly class PaymentContext implements Context
 {
@@ -72,7 +70,7 @@ final readonly class PaymentContext implements Context
     /**
      * @Given /^the store allows paying (\w+) for (all channels)$/
      */
-    public function storeAllowsPayingForAllChannels($paymentMethodName, array $channels)
+    public function storeAllowsPayingForAllChannels($paymentMethodName, array $channels): void
     {
         $paymentMethod = $this->createPaymentMethod($paymentMethodName, StringInflector::nameToUppercaseCode($paymentMethodName), 'Offline', 'Payment method', false);
 
@@ -92,7 +90,7 @@ final readonly class PaymentContext implements Context
     /**
      * @Given /^(this payment method) is named "([^"]+)" in the "([^"]+)" locale$/
      */
-    public function thisPaymentMethodIsNamedIn(PaymentMethodInterface $paymentMethod, $name, $locale)
+    public function thisPaymentMethodIsNamedIn(PaymentMethodInterface $paymentMethod, $name, $locale): void
     {
         /** @var PaymentMethodTranslationInterface $translation */
         $translation = $this->paymentMethodTranslationFactory->createNew();
@@ -109,7 +107,7 @@ final readonly class PaymentContext implements Context
      * @Given /^(this payment method) (?:has been|is) disabled$/
      * @When the payment method :paymentMethod gets disabled
      */
-    public function theStoreHasAPaymentMethodDisabled(PaymentMethodInterface $paymentMethod)
+    public function theStoreHasAPaymentMethodDisabled(PaymentMethodInterface $paymentMethod): void
     {
         $paymentMethod->disable();
 
@@ -119,7 +117,7 @@ final readonly class PaymentContext implements Context
     /**
      * @Given /^(it) has instructions "([^"]+)"$/
      */
-    public function itHasInstructions(PaymentMethodInterface $paymentMethod, $instructions)
+    public function itHasInstructions(PaymentMethodInterface $paymentMethod, $instructions): void
     {
         $paymentMethod->setInstructions($instructions);
 
@@ -129,7 +127,7 @@ final readonly class PaymentContext implements Context
     /**
      * @Given the store has :paymentMethodName payment method not assigned to any channel
      */
-    public function theStoreHasPaymentMethodNotAssignedToAnyChannel($paymentMethodName)
+    public function theStoreHasPaymentMethodNotAssignedToAnyChannel($paymentMethodName): void
     {
         $this->createPaymentMethod($paymentMethodName, 'PM_' . $paymentMethodName, 'Offline', 'Payment method', false);
     }
@@ -137,7 +135,7 @@ final readonly class PaymentContext implements Context
     /**
      * @Given the payment method :paymentMethod requires authorization before capturing
      */
-    public function thePaymentMethodRequiresAuthorizationBeforeCapturing(PaymentMethodInterface $paymentMethod)
+    public function thePaymentMethodRequiresAuthorizationBeforeCapturing(PaymentMethodInterface $paymentMethod): void
     {
         /** @var GatewayConfigInterface $config */
         $config = $paymentMethod->getGatewayConfig();
@@ -163,16 +161,6 @@ final readonly class PaymentContext implements Context
         $paymentMethod->addChannel($channel);
     }
 
-    /**
-     * @Then /^the (latest order) should have a payment with state "([^"]+)"$/
-     */
-    public function theLatestOrderHasAuthorizedPayment(OrderInterface $order, string $state)
-    {
-        $payment = $order->getLastPayment();
-
-        Assert::eq($payment->getState(), $state);
-    }
-
     private function createPaymentMethod(
         string $name,
         string $code,
diff --git a/src/Sylius/Behat/Context/Setup/PaymentRequestContext.php b/src/Sylius/Behat/Context/Setup/PaymentRequestContext.php
new file mode 100644
index 0000000000..652a7becd0
--- /dev/null
+++ b/src/Sylius/Behat/Context/Setup/PaymentRequestContext.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Context\Setup;
+
+use Behat\Behat\Context\Context;
+use Sylius\Bundle\ApiBundle\Command\Payment\AddPaymentRequest;
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+final readonly class PaymentRequestContext implements Context
+{
+    public function __construct(
+        private MessageBusInterface $commandBus,
+    ) {
+    }
+
+    /**
+     * @Given the payment request action :action has been executed for order :order with the payment method :paymentMethod
+     */
+    public function thePaymentRequestActionHasBeenExecutedForOrderWithThePaymentMethod(
+        string $action,
+        OrderInterface $order,
+        PaymentMethodInterface $paymentMethod
+    ): void {
+        $addPaymentRequest = new AddPaymentRequest(
+            paymentId: $order->getLastPayment()->getId(),
+            paymentMethodCode: $paymentMethod->getCode(),
+            action: $action,
+        );
+
+        $this->commandBus->dispatch($addPaymentRequest);
+    }
+}
diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
new file mode 100644
index 0000000000..95aec44a99
--- /dev/null
+++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
@@ -0,0 +1,132 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Context\Ui\Admin;
+
+use Behat\Behat\Context\Context;
+use Sylius\Behat\Page\Admin\Payment\PaymentRequest\IndexPageInterface;
+use Sylius\Behat\Page\Admin\Payment\PaymentRequest\ShowPageInterface;
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
+use Sylius\Component\Payment\Repository\PaymentRequestRepositoryInterface;
+use Webmozart\Assert\Assert;
+
+final readonly class ManagingPaymentRequestsContext implements Context
+{
+    public function __construct(
+        private IndexPageInterface $indexPage,
+        private ShowPageInterface $showPage,
+        private PaymentRequestRepositoryInterface $paymentRequestRepository,
+    ) {
+    }
+
+    /**
+     * @When I browse payment requests of an order :order
+     */
+    public function iBrowseOrdersOfACustomer(OrderInterface $order): void
+    {
+        $this->indexPage->open(['id' => $order->getLastPayment()->getId()]);
+    }
+
+    /**
+     * @When I view details of the payment request for the :order order
+     */
+    public function iViewDetailsOfThePaymentRequestForTheOrder(OrderInterface $order): void
+    {
+        $payment = $order->getLastPayment();
+        $paymentRequest = $this->paymentRequestRepository->findOneBy(['payment' => $payment]);
+
+        $this->showPage->open([
+            'hash' => $paymentRequest->getHash(),
+            'paymentId' => $payment->getId()
+        ]);
+    }
+
+    /**
+     * @When I filter by the :action action
+     */
+    public function iFilterByTheAction(string $action): void
+    {
+        $this->indexPage->chooseActionToFilter($action);
+        $this->indexPage->filter();
+    }
+
+    /**
+     * @When I filter by the :paymentMethod payment method
+     */
+    public function iFilterByThePaymentMethod(PaymentMethodInterface $paymentMethod): void
+    {
+        $this->indexPage->choosePaymentMethodToFilter($paymentMethod->getName());
+        $this->indexPage->filter();
+    }
+
+    /**
+     * @When I filter by the :state state
+     */
+    public function iFilterByTheState(string $state): void
+    {
+        $this->indexPage->chooseStateToFilter($state);
+        $this->indexPage->filter();
+    }
+
+    /**
+     * @Then /^there should be (\d+) payment requests? on the list$/
+     */
+    public function thereShouldBeProductVariantsOnTheList(int $count): void
+    {
+        Assert::same(
+            $this->indexPage->countItems(),
+            $count,
+        );
+    }
+
+    /**
+     * @Then it should be the payment request with action :action
+     */
+    public function itShouldBeThePaymentRequestWithAction(string $action): void
+    {
+        Assert::true($this->indexPage->isSingleResourceOnPage(['action' => $action]));
+    }
+
+    /**
+     * @Then it should be the payment request with payment method :paymentMethod
+     */
+    public function itShouldBeThePaymentRequestWithPaymentMethod(PaymentMethodInterface $paymentMethod): void
+    {
+        Assert::true($this->indexPage->isSingleResourceOnPage(['method' => $paymentMethod->getName()]));
+    }
+
+    /**
+     * @Then its :field should be :value
+     */
+    public function itsFieldShouldBe(string $field, string $value): void
+    {
+        Assert::same($this->showPage->getFieldText($field), $value);
+    }
+
+    /**
+     * @Then its payload should has empty value
+     */
+    public function itsPayloadShouldHasEmptyValue(): void
+    {
+        Assert::same($this->showPage->getFieldText('payload'), 'null');
+    }
+
+    /**
+     * @Then its response data should has empty value
+     */
+    public function itsResponseDataShouldBe(): void
+    {
+        Assert::same($this->showPage->getFieldText('response_data'), json_encode([]));
+    }
+}
diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php
index 3effca2332..e9cf67042b 100644
--- a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php
+++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php
@@ -80,6 +80,14 @@ final class ManagingPaymentsContext implements Context
         $this->indexPage->chooseChannelFilter($channelName);
     }
 
+    /**
+     * @When I want to view the payment request of the first payment
+     */
+    public function iWantToViewThePaymentRequestOfTheFirstPayment(): void
+    {
+        $this->indexPage->showPaymentRequestOfNthPayment(1);
+    }
+
     /**
      * @Then I should see :count payments in the list
      * @Then I should see a single payment in the list
diff --git a/src/Sylius/Behat/Page/Admin/Payment/IndexPage.php b/src/Sylius/Behat/Page/Admin/Payment/IndexPage.php
index 0a2d7bef50..a62f87753a 100644
--- a/src/Sylius/Behat/Page/Admin/Payment/IndexPage.php
+++ b/src/Sylius/Behat/Page/Admin/Payment/IndexPage.php
@@ -48,6 +48,17 @@ class IndexPage extends BaseIndexPage implements IndexPageInterface
         $this->getOrderLinkForRow($position)->clickLink('#');
     }
 
+    public function showPaymentRequestOfNthPayment(int $position): void
+    {
+        $tableAccessor = $this->getTableAccessor();
+        $table = $this->getElement('table');
+
+        $row = $tableAccessor->getRowsWithFields($table, [])[$position];
+        $field = $tableAccessor->getFieldFromRow($table, $row, 'actions');
+
+        $field->find('css', '[data-test-show-action="List payment requests"]')->click();
+    }
+
     public function chooseChannelFilter(string $channelName): void
     {
         $this->getElement('filter_channel')->selectOption($channelName);
diff --git a/src/Sylius/Behat/Page/Admin/Payment/IndexPageInterface.php b/src/Sylius/Behat/Page/Admin/Payment/IndexPageInterface.php
index d02b24a266..e7f3ec27c0 100644
--- a/src/Sylius/Behat/Page/Admin/Payment/IndexPageInterface.php
+++ b/src/Sylius/Behat/Page/Admin/Payment/IndexPageInterface.php
@@ -27,5 +27,7 @@ interface IndexPageInterface extends BaseIndexPageInterface
 
     public function showOrderPageForNthPayment(int $position): void;
 
+    public function showPaymentRequestOfNthPayment(int $position): void;
+
     public function chooseChannelFilter(string $channelName): void;
 }
diff --git a/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPage.php b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPage.php
new file mode 100644
index 0000000000..3ac6d0a016
--- /dev/null
+++ b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPage.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Page\Admin\Payment\PaymentRequest;
+
+use Behat\Mink\Element\NodeElement;
+use Behat\Mink\Session;
+use Sylius\Behat\Page\Admin\Crud\IndexPage as BaseIndexPage;
+use Sylius\Behat\Service\Accessor\TableAccessorInterface;
+use Sylius\Behat\Service\Helper\AutocompleteHelperInterface;
+use Symfony\Component\Routing\RouterInterface;
+
+class IndexPage extends BaseIndexPage implements IndexPageInterface
+{
+    public function __construct(
+        Session $session,
+        $minkParameters,
+        RouterInterface $router,
+        TableAccessorInterface $tableAccessor,
+        string $routeName,
+        private readonly AutocompleteHelperInterface $autocompleteHelper,
+    ) {
+        parent::__construct($session, $minkParameters, $router, $tableAccessor, $routeName);
+    }
+
+    public function choosePaymentMethodToFilter(string $paymentMethodName): void
+    {
+        $this->specifyAutocompleteFilter($this->getElement('filter_payment_method'), $paymentMethodName);
+    }
+
+    public function chooseActionToFilter(string $action): void
+    {
+        $this->getElement('filter_action')->selectOption($action);
+    }
+
+    public function chooseStateToFilter(string $state): void
+    {
+        $this->getElement('filter_state')->selectOption($state);
+    }
+
+    protected function getDefinedElements(): array
+    {
+        return array_merge(parent::getDefinedElements(), [
+            'filter_action' => '#criteria_action',
+            'filter_payment_method' => '#criteria_payment_method',
+            'filter_state' => '#criteria_state',
+        ]);
+    }
+
+    private function specifyAutocompleteFilter(NodeElement $autocomplete, string $value): void
+    {
+        if (!$this->areFiltersVisible()) {
+            $this->toggleFilters();
+        }
+
+        $this->autocompleteHelper->selectByName(
+            $this->getDriver(),
+            $autocomplete->getXpath(),
+            $value,
+        );
+
+        $this->waitForFormUpdate();
+    }
+}
diff --git a/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPageInterface.php b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPageInterface.php
new file mode 100644
index 0000000000..348607d720
--- /dev/null
+++ b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPageInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Page\Admin\Payment\PaymentRequest;
+
+use Sylius\Behat\Page\Admin\Crud\IndexPageInterface as BaseIndexPageInterface;
+
+interface IndexPageInterface extends BaseIndexPageInterface
+{
+    public function choosePaymentMethodToFilter(string $paymentMethodName): void;
+
+    public function chooseActionToFilter(string $action): void;
+
+    public function chooseStateToFilter(string $state): void;
+
+}
diff --git a/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPage.php b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPage.php
new file mode 100644
index 0000000000..5e8ced226f
--- /dev/null
+++ b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPage.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Page\Admin\Payment\PaymentRequest;
+
+use FriendsOfBehat\PageObjectExtension\Page\SymfonyPage;
+
+class ShowPage extends SymfonyPage implements ShowPageInterface
+{
+    public function getRouteName(): string
+    {
+        return 'sylius_admin_payment_payment_request_show';
+    }
+
+    public function getFieldText(string $fieldName): string
+    {
+        return $this->getElement($fieldName)->getText();
+    }
+
+    protected function getDefinedElements(): array
+    {
+        return array_merge(parent::getDefinedElements(), [
+            'action' => '[data-test-action]',
+            'method' => '[data-test-method]',
+            'payload' => '[data-test-payload]',
+            'response_data' => '[data-test-response-data]',
+            'state' => '[data-test-state]',
+        ]);
+    }
+}
diff --git a/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPageInterface.php b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPageInterface.php
new file mode 100644
index 0000000000..61e2309546
--- /dev/null
+++ b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPageInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Page\Admin\Payment\PaymentRequest;
+
+use FriendsOfBehat\PageObjectExtension\Page\SymfonyPageInterface;
+
+interface ShowPageInterface extends SymfonyPageInterface
+{
+    public function getFieldText(string $fieldName): string;
+}
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml
index 1b4faf97b6..7280bde570 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml
@@ -302,5 +302,12 @@
             <argument type="service" id="api_platform.symfony.iri_converter" />
             <argument type="service" id="sylius.behat.shared_storage" />
         </service>
+
+        <service id="sylius.behat.context.api.admin.managing_payment_requests" class="Sylius\Behat\Context\Api\Admin\ManagingPaymentRequestsContext">
+            <argument type="service" id="sylius.behat.api_platform_client.admin" />
+            <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
+            <argument type="service" id="api_platform.symfony.iri_converter" />
+            <argument type="service" id="sylius.repository.payment_request" />
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
index 6fe24f8604..8591a4a31d 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
@@ -166,7 +166,6 @@
             <argument type="service" id="sylius.behat.api_platform_client.shop" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="sylius.behat.request_factory" />
-            <argument type="service" id="sylius.repository.payment_method" />
         </service>
 
         <service id="sylius.behat.context.api.shop.payment" class="Sylius\Behat\Context\Api\Shop\PaymentContext">
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
index 4738917e42..6827a6e528 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
@@ -142,7 +142,6 @@
             <argument type="collection">
                 <argument key="offline">Offline</argument>
             </argument>
-
         </service>
 
         <service id="Sylius\Behat\Context\Setup\PriceHistoryContext">
@@ -320,5 +319,9 @@
             <argument type="service" id="sylius.event_bus" />
             <argument type="service" id="sylius.behat.shared_storage" />
         </service>
+
+        <service id="sylius.behat.context.setup.payment_request" class="Sylius\Behat\Context\Setup\PaymentRequestContext">
+            <argument type="service" id="sylius.command_bus" />
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/ui.xml b/src/Sylius/Behat/Resources/config/services/contexts/ui.xml
index 29ad8a5557..9d737355d2 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/ui.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/ui.xml
@@ -613,5 +613,11 @@
         <service id="sylius.behat.context.ui.admin.search_filter" class="Sylius\Behat\Context\Ui\Admin\SearchFilterContext">
             <argument type="service" id="sylius.behat.element.admin.crud.index.search_filter" />
         </service>
+
+        <service id="sylius.behat.context.ui.admin.managing_payment_requests" class="Sylius\Behat\Context\Ui\Admin\ManagingPaymentRequestsContext">
+            <argument type="service" id="sylius.behat.page.admin.payment.payment_request.index" />
+            <argument type="service" id="sylius.behat.page.admin.payment.payment_request.show"/>
+            <argument type="service" id="sylius.repository.payment_request"/>
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/services/pages/admin/payment.xml b/src/Sylius/Behat/Resources/config/services/pages/admin/payment.xml
index 6aa10f4483..415f7382a4 100644
--- a/src/Sylius/Behat/Resources/config/services/pages/admin/payment.xml
+++ b/src/Sylius/Behat/Resources/config/services/pages/admin/payment.xml
@@ -14,6 +14,8 @@
 <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">
     <parameters>
         <parameter key="sylius.behat.page.admin.payment.index.class">Sylius\Behat\Page\Admin\Payment\IndexPage</parameter>
+        <parameter key="sylius.behat.page.admin.payment.payment_request.index.class">Sylius\Behat\Page\Admin\Payment\PaymentRequest\IndexPage</parameter>
+        <parameter key="sylius.behat.page.admin.payment.payment_request.show.class">Sylius\Behat\Page\Admin\Payment\PaymentRequest\ShowPage</parameter>
     </parameters>
 
     <services>
@@ -22,5 +24,21 @@
         <service id="sylius.behat.page.admin.payment.index" class="%sylius.behat.page.admin.payment.index.class%" parent="sylius.behat.page.admin.crud.index" public="false">
             <argument type="string">sylius_admin_payment_index</argument>
         </service>
+
+        <service
+            id="sylius.behat.page.admin.payment.payment_request.index"
+            class="%sylius.behat.page.admin.payment.payment_request.index.class%"
+            parent="sylius.behat.page.admin.crud.index"
+        >
+            <argument type="string">sylius_admin_payment_payment_request_index</argument>
+            <argument type="service" id="Sylius\Behat\Service\Helper\AutocompleteHelperInterface" />
+        </service>
+
+        <service
+            id="sylius.behat.page.admin.payment.payment_request.show"
+            class="%sylius.behat.page.admin.payment.payment_request.show.class%"
+            parent="sylius.behat.symfony_page"
+        >
+        </service>
     </services>
 </container>
diff --git a/src/Sylius/Behat/Resources/config/suites/api/payment/managing_payments.yml b/src/Sylius/Behat/Resources/config/suites/api/payment/managing_payments.yml
index 0df135235c..38f71963a6 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/payment/managing_payments.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/payment/managing_payments.yml
@@ -11,6 +11,7 @@ default:
                 - sylius.behat.context.transform.customer
                 - sylius.behat.context.transform.lexical
                 - sylius.behat.context.transform.order
+                - sylius.behat.context.transform.payment
                 - sylius.behat.context.transform.product
                 - sylius.behat.context.transform.shared_storage
 
@@ -18,10 +19,12 @@ default:
                 - sylius.behat.context.setup.channel
                 - sylius.behat.context.setup.order
                 - sylius.behat.context.setup.payment
+                - sylius.behat.context.setup.payment_request
                 - sylius.behat.context.setup.product
                 - sylius.behat.context.setup.shipping
 
                 - sylius.behat.context.api.admin.managing_payments
+                - sylius.behat.context.api.admin.managing_payment_requests
 
             filters:
                 tags: "@managing_payments&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/payment/managing_payments.yml b/src/Sylius/Behat/Resources/config/suites/ui/payment/managing_payments.yml
index 20797a92d1..b8bd2d9a81 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/payment/managing_payments.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/payment/managing_payments.yml
@@ -23,6 +23,7 @@ default:
                 - sylius.behat.context.setup.geographical
                 - sylius.behat.context.setup.order
                 - sylius.behat.context.setup.payment
+                - sylius.behat.context.setup.payment_request
                 - sylius.behat.context.setup.product
                 - sylius.behat.context.setup.shipping
                 - sylius.behat.context.setup.zone
@@ -30,6 +31,7 @@ default:
                 - sylius.behat.context.ui.email
 
                 - sylius.behat.context.ui.admin.managing_payments
+                - sylius.behat.context.ui.admin.managing_payment_requests
                 - sylius.behat.context.ui.shop.cart
             filters:
                 tags: "@managing_payments&&@ui"
diff --git a/tests/Api/Responses/admin/payment_request/get_payment_requests_for_payment.json b/tests/Api/Responses/admin/payment_request/get_payment_requests_for_payment.json
index 3f3ebee59c..a242e65a17 100644
--- a/tests/Api/Responses/admin/payment_request/get_payment_requests_for_payment.json
+++ b/tests/Api/Responses/admin/payment_request/get_payment_requests_for_payment.json
@@ -2,6 +2,7 @@
     "@context": "\/api\/v2\/contexts\/PaymentRequest",
     "@id": "\/api\/v2\/admin\/payments\/@integer@\/payment-requests",
     "@type": "hydra:Collection",
+    "hydra:totalItems": 3,
     "hydra:member": [
         {
             "@id": "\/api\/v2\/admin\/payment-requests\/@string@",
@@ -31,5 +32,47 @@
             "method": "\/api\/v2\/admin\/payment-methods\/CASH_ON_DELIVERY"
         }
     ],
-    "hydra:totalItems": 3
+    "hydra:search": {
+        "@type": "hydra:IriTemplate",
+        "hydra:template": "\/api\/v2\/admin\/payments\/@integer@\/payment-requests{?action,action[],method.code,method.code[],state,state[]}",
+        "hydra:variableRepresentation": "BasicRepresentation",
+        "hydra:mapping": [
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "action",
+                "property": "action",
+                "required": false
+            },
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "action[]",
+                "property": "action",
+                "required": false
+            },
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "method.code",
+                "property": "method.code",
+                "required": false
+            },
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "method.code[]",
+                "property": "method.code",
+                "required": false
+            },
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "state",
+                "property": "state",
+                "required": false
+            },
+            {
+                "@type": "IriTemplateMapping",
+                "variable": "state[]",
+                "property": "state",
+                "required": false
+            }
+        ]
+    }
 }

From 6ea219dd8eddec902a4835f416eb96879d3d8bdf Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Wed, 25 Sep 2024 13:45:17 +0200
Subject: [PATCH 193/200] Mirror improvement

---
 ...ging_offline_payment_method_after_order_confirmation.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature b/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
index 1c5517809d..e27714f35c 100644
--- a/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
+++ b/features/shop/checkout/paying_for_order/changing_offline_payment_method_after_order_confirmation.feature
@@ -21,7 +21,7 @@ Feature: Changing the offline payment method after order confirmation
         And I retry the payment with "Offline" payment method
         Then I should have chosen "Offline" payment method
 
-    @api
+    @api @ui @javascript
     Scenario: Retrying the payment with different Offline payment works correctly together with inventory
         Given there is 1 unit of product "PHP T-Shirt" available in the inventory
         And this product is tracked by the inventory

From 619bb4cfa69911ee52cb0ecea6021b86f3f4394b Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Wed, 25 Sep 2024 13:57:11 +0200
Subject: [PATCH 194/200] Fix AddPaymentRequest

---
 .../Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
index 42a6a16d87..fce0e32116 100644
--- a/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
+++ b/src/Sylius/Bundle/ApiBundle/Command/Payment/AddPaymentRequest.php
@@ -18,7 +18,7 @@ use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
 class AddPaymentRequest implements IriToIdentifierConversionAwareInterface
 {
     public function __construct(
-        public readonly mixed $paymentId,
+        public readonly int|string $paymentId,
         public readonly string $paymentMethodCode,
         public readonly ?string $action = null,
         public readonly mixed $payload = null,

From 01fa7911090eec843ae0a62a12f4655971ec3347 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 26 Sep 2024 08:31:12 +0200
Subject: [PATCH 195/200] Move payment request routes to separate file

---
 .../Resources/config/grids/payment.yml        |  2 +-
 .../AdminBundle/Resources/config/routing.yml  |  4 +++
 .../Resources/config/routing/payment.yml      | 26 -------------------
 .../config/routing/payment_request.yaml       | 25 ++++++++++++++++++
 .../actions/list_payment_requests.html.twig   |  2 +-
 .../show/content/header/breadcrumbs.html.twig |  2 +-
 .../Announcer/PaymentRequestAnnouncer.php     |  4 +--
 7 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_request.yaml

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
index da8938a081..d154262af3 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
@@ -77,7 +77,7 @@ sylius_grid:
                             link:
                                 route: sylius_admin_payment_payment_request_index
                                 parameters:
-                                    id: resource.id
+                                    paymentId: resource.id
                     complete:
                         type: apply_transition
                         label: sylius.ui.complete
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing.yml
index 63c11f29fc..f6d439d180 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing.yml
@@ -53,6 +53,10 @@ sylius_admin_payment:
 sylius_admin_payment_method:
     resource: "@SyliusAdminBundle/Resources/config/routing/payment_method.yml"
 
+sylius_admin_payment_request:
+    resource: "@SyliusAdminBundle/Resources/config/routing/payment_request.yaml"
+    prefix: /payments/{paymentId}/payment-requests/
+
 sylius_admin_product:
     resource: "@SyliusAdminBundle/Resources/config/routing/product.yml"
 
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml
index 1cf8a99c7d..7836913aa2 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml
@@ -27,29 +27,3 @@ sylius_admin_payment_complete:
                 transition: complete
             redirect: sylius_admin_payment_index
             flash: sylius.payment.completed
-
-sylius_admin_payment_payment_request_index:
-    path: /payments/{id}/payment_requests
-    methods: [GET]
-    defaults:
-        _controller: sylius.controller.payment_request::indexAction
-        _sylius:
-            section: admin
-            permission: true
-            template: "@SyliusAdmin/payment/payment_request/index.html.twig"
-            grid: sylius_admin_payment_payment_request
-            
-sylius_admin_payment_payment_request_show:
-    path: /payments/{paymentId}/payment_requests/{hash}
-    methods: [GET]
-    defaults:
-        _controller: sylius.controller.payment_request::showAction
-        _sylius:
-            section: admin
-            permission: true
-            template: "@SyliusAdmin/payment/payment_request/show.html.twig"
-            repository:
-                method: findOneByPaymentId
-                arguments:
-                    hash: $hash
-                    paymentId: $paymentId
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_request.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_request.yaml
new file mode 100644
index 0000000000..d627e4e3f4
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_request.yaml
@@ -0,0 +1,25 @@
+sylius_admin_payment_payment_request_index:
+    path: /
+    methods: [GET]
+    defaults:
+        _controller: sylius.controller.payment_request::indexAction
+        _sylius:
+            section: admin
+            permission: true
+            template: "@SyliusAdmin/payment/payment_request/index.html.twig"
+            grid: sylius_admin_payment_payment_request
+            
+sylius_admin_payment_payment_request_show:
+    path: /{hash}
+    methods: [GET]
+    defaults:
+        _controller: sylius.controller.payment_request::showAction
+        _sylius:
+            section: admin
+            permission: true
+            template: "@SyliusAdmin/payment/payment_request/show.html.twig"
+            repository:
+                method: findOneByPaymentId
+                arguments:
+                    hash: $hash
+                    paymentId: $paymentId
diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
index 35b236f598..1ef5f85c2e 100644
--- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
@@ -2,6 +2,6 @@
 
 {% set payment = hookable_metadata.context.payment %}
 
-<a title="details" href="{{ path('sylius_admin_payment_payment_request_index', {'id': payment.id}) }}" class="btn btn-icon" data-bs-toggle="tooltip" data-bs-title="{{ 'sylius.ui.list_payment_requests'|trans }}" {{ sylius_test_html_attribute('list_payment_requests') }}>
+<a title="details" href="{{ path('sylius_admin_payment_payment_request_index', {'paymentId': payment.id}) }}" class="btn btn-icon" data-bs-toggle="tooltip" data-bs-title="{{ 'sylius.ui.list_payment_requests'|trans }}" {{ sylius_test_html_attribute('list_payment_requests') }}>
     {{ icon({ icon: 'list_letters', class: 'icon icon-tabler' }) }}
 </a>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig
index 4dfdab9d99..48ecd8d00c 100644
--- a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig
@@ -7,6 +7,6 @@
     { name: 'sylius.ui.dashboard', url: path('sylius_admin_dashboard'), active: false },
     { name: 'sylius.ui.payments'|trans, url: path('sylius_admin_payment_index'), active: false },
     { name: payment_id, active: false },
-    { name: 'sylius.ui.payment_requests'|trans, url: path('sylius_admin_payment_payment_request_index', {'id': payment_id}), active: false },
+    { name: 'sylius.ui.payment_requests'|trans, url: path('sylius_admin_payment_payment_request_index', {'paymentId': payment_id}), active: false },
     { name: payment_request.hash, active: true },
 ]) }}
diff --git a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
index e54a7aa93b..8b68a35743 100644
--- a/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
+++ b/src/Sylius/Bundle/CoreBundle/PaymentRequest/Announcer/PaymentRequestAnnouncer.php
@@ -13,13 +13,11 @@ declare(strict_types=1);
 
 namespace Sylius\Bundle\CoreBundle\PaymentRequest\Announcer;
 
-use Sylius\Bundle\CoreBundle\Command\Admin\Account\RequestResetPasswordEmail;
-use Sylius\Bundle\CoreBundle\Command\CapturePaymentRequest;
 use Sylius\Bundle\CoreBundle\PaymentRequest\CommandProvider\PaymentRequestCommandProviderInterface;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 
-final class PaymentRequestAnnouncer implements PaymentRequestAnnouncerInterface
+final readonly class PaymentRequestAnnouncer implements PaymentRequestAnnouncerInterface
 {
     public function __construct(
         private PaymentRequestCommandProviderInterface $paymentRequestCommandProvider,

From 43e935ee8257a63b27891e64729bdfe7e343d9c6 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 26 Sep 2024 08:31:49 +0200
Subject: [PATCH 196/200] [PaymentRequest] Use constants in grid

---
 ...ayment.yml => payment_payment_request.yml} | 30 +++++++++----------
 .../Doctrine/ORM/PaymentRequestRepository.php |  2 +-
 .../PaymentRequestRepositoryInterface.php     |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)
 rename src/Sylius/Bundle/AdminBundle/Resources/config/grids/{payment_request_payment.yml => payment_payment_request.yml} (64%)

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request_payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_payment_request.yml
similarity index 64%
rename from src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request_payment.yml
rename to src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_payment_request.yml
index 0193850f42..26ca780b22 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request_payment.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_payment_request.yml
@@ -6,9 +6,9 @@ sylius_grid:
                 options:
                     class: "%sylius.model.payment_request.class%"
                     repository:
-                        method: createForPaymentQueryBuilder
+                        method: createQueryBuilderForPayment
                         arguments:
-                            paymentId: $id
+                            paymentId: $paymentId
             sorting:
                 createdAt: desc
             fields:
@@ -63,24 +63,24 @@ sylius_grid:
                     type: select
                     label: sylius.ui.action
                     form_options:
-                        choices:
-                            sylius.ui.authorize: authorize
-                            sylius.ui.cancel: cancel
-                            sylius.ui.capture: capture
-                            sylius.ui.payout: payout
-                            sylius.ui.refund: refund
-                            sylius.ui.status: status
-                            sylius.ui.sync: sync
+                        choices:                            
+                            sylius.ui.authorize: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::ACTION_AUTHORIZE
+                            sylius.ui.cancel: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::ACTION_CANCEL
+                            sylius.ui.capture: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::ACTION_CAPTURE
+                            sylius.ui.payout: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::ACTION_PAYOUT
+                            sylius.ui.refund: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::ACTION_REFUND
+                            sylius.ui.status: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::ACTION_STATUS
+                            sylius.ui.sync: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::ACTION_SYNC
                 state:
                     type: select
                     label: sylius.ui.state
                     form_options:
                         choices:
-                            sylius.ui.cancelled: cancelled
-                            sylius.ui.completed: completed
-                            sylius.ui.failed: failed
-                            sylius.ui.new: new
-                            sylius.ui.processing: processing
+                            sylius.ui.cancelled: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::STATE_CANCELLED
+                            sylius.ui.completed: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::STATE_COMPLETED
+                            sylius.ui.failed: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::STATE_FAILED
+                            sylius.ui.new: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::STATE_NEW
+                            sylius.ui.processing: !php/const Sylius\Component\Payment\Model\PaymentRequestInterface::STATE_PROCESSING
             actions:
                 item:
                     show:
diff --git a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
index 58e0c255d4..1b1711c4f4 100644
--- a/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
+++ b/src/Sylius/Bundle/PaymentBundle/Doctrine/ORM/PaymentRequestRepository.php
@@ -40,7 +40,7 @@ class PaymentRequestRepository extends EntityRepository implements PaymentReques
         ;
     }
 
-    public function createForPaymentQueryBuilder(string $paymentId): QueryBuilder
+    public function createQueryBuilderForPayment(string $paymentId): QueryBuilder
     {
         $queryBuilder = $this->createQueryBuilder('o');
         $queryBuilder
diff --git a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
index a3f7887948..de63cb8da8 100644
--- a/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
+++ b/src/Sylius/Component/Payment/Repository/PaymentRequestRepositoryInterface.php
@@ -26,7 +26,7 @@ interface PaymentRequestRepositoryInterface extends RepositoryInterface
 {
     public function findOneByPaymentId(mixed $hash, mixed $paymentId): ?PaymentRequestInterface;
 
-    public function createForPaymentQueryBuilder(string $paymentId): QueryBuilder;
+    public function createQueryBuilderForPayment(string $paymentId): QueryBuilder;
 
     public function duplicateExists(PaymentRequestInterface $paymentRequest): bool;
 }

From cda6fcf1d925c84608e20e3da0ed208084a077fd Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 26 Sep 2024 09:08:03 +0200
Subject: [PATCH 197/200] [PaymentBundle] Add symfony/doctrine-bridge

---
 .../Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php   | 2 +-
 src/Sylius/Bundle/PaymentBundle/composer.json                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
index 95aec44a99..22e7ee7245 100644
--- a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
+++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
@@ -35,7 +35,7 @@ final readonly class ManagingPaymentRequestsContext implements Context
      */
     public function iBrowseOrdersOfACustomer(OrderInterface $order): void
     {
-        $this->indexPage->open(['id' => $order->getLastPayment()->getId()]);
+        $this->indexPage->open(['paymentId' => $order->getLastPayment()->getId()]);
     }
 
     /**
diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json
index f7d5272f99..63afad1961 100644
--- a/src/Sylius/Bundle/PaymentBundle/composer.json
+++ b/src/Sylius/Bundle/PaymentBundle/composer.json
@@ -29,6 +29,7 @@
         "php": "^8.2",
         "sylius/payment": "^2.0",
         "sylius/resource-bundle": "^1.11 || ^1.12@alpha",
+        "symfony/doctrine-bridge": "^6.4.0 || ^7.1",
         "symfony/framework-bundle": "^6.4.1 || ^7.1"
     },
     "conflict": {

From 89cd8b63577c9ca4f114c900ad31e756594b5260 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Thu, 26 Sep 2024 13:09:20 +0200
Subject: [PATCH 198/200] [PaymentBundle] Move payment request to outside of
 payment

---
 .../Admin/Payment/PaymentRequest/ShowPage.php |  2 +-
 .../config/services/pages/admin/payment.xml   |  2 +-
 .../payment/payment_request/index.yaml        |  5 ---
 .../payment/payment_request/show.yaml         | 38 -------------------
 .../app/twig_hooks/payment_request/index.yaml |  5 +++
 .../app/twig_hooks/payment_request/show.yaml  | 38 +++++++++++++++++++
 .../Resources/config/grids/payment.yml        |  2 +-
 ...ayment_request.yml => payment_request.yml} | 10 ++---
 .../config/routing/payment_request.yaml       | 10 ++---
 .../actions/list_payment_requests.html.twig   |  2 +-
 .../grid/field/state.html.twig                |  1 -
 .../payment/payment_request/index.html.twig   |  3 --
 .../payment/payment_request/show.html.twig    |  3 --
 .../common/label/state/cancelled.html.twig    |  0
 .../common/label/state/completed.html.twig    |  0
 .../common/label/state/failed.html.twig       |  0
 .../common/label/state/new.html.twig          |  0
 .../common/label/state/processing.html.twig   |  0
 .../grid/field/action.html.twig               |  0
 .../grid/field/method.html.twig               |  0
 .../grid/field/state.html.twig                |  1 +
 .../content/header/breadcrumbs.html.twig      |  0
 .../show/content/header/breadcrumbs.html.twig |  2 +-
 .../show/content/sections.html.twig           |  0
 .../show/content/sections/general.html.twig   |  0
 .../content/sections/general/action.html.twig |  0
 .../sections/general/created_at.html.twig     |  0
 .../content/sections/general/hash.html.twig   |  0
 .../content/sections/general/method.html.twig |  0
 .../content/sections/general/state.html.twig  |  2 +-
 .../sections/general/updated_at.html.twig     |  0
 .../show/content/sections/payload.html.twig   |  0
 .../content/sections/response_data.html.twig  |  0
 33 files changed, 60 insertions(+), 66 deletions(-)
 delete mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/index.yaml
 delete mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/show.yaml
 create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/index.yaml
 create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/show.yaml
 rename src/Sylius/Bundle/AdminBundle/Resources/config/grids/{payment_payment_request.yml => payment_request.yml} (91%)
 delete mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/state.html.twig
 delete mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index.html.twig
 delete mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show.html.twig
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/common/label/state/cancelled.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/common/label/state/completed.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/common/label/state/failed.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/common/label/state/new.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/common/label/state/processing.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/grid/field/action.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/grid/field/method.html.twig (100%)
 create mode 100644 src/Sylius/Bundle/AdminBundle/templates/payment_request/grid/field/state.html.twig
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/index/content/header/breadcrumbs.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/header/breadcrumbs.html.twig (86%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/general.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/general/action.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/general/created_at.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/general/hash.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/general/method.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/general/state.html.twig (57%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/general/updated_at.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/payload.html.twig (100%)
 rename src/Sylius/Bundle/AdminBundle/templates/{payment => }/payment_request/show/content/sections/response_data.html.twig (100%)

diff --git a/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPage.php b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPage.php
index 5e8ced226f..bbdc46d091 100644
--- a/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPage.php
+++ b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/ShowPage.php
@@ -19,7 +19,7 @@ class ShowPage extends SymfonyPage implements ShowPageInterface
 {
     public function getRouteName(): string
     {
-        return 'sylius_admin_payment_payment_request_show';
+        return 'sylius_admin_payment_request_show';
     }
 
     public function getFieldText(string $fieldName): string
diff --git a/src/Sylius/Behat/Resources/config/services/pages/admin/payment.xml b/src/Sylius/Behat/Resources/config/services/pages/admin/payment.xml
index 415f7382a4..e872f8c5c7 100644
--- a/src/Sylius/Behat/Resources/config/services/pages/admin/payment.xml
+++ b/src/Sylius/Behat/Resources/config/services/pages/admin/payment.xml
@@ -30,7 +30,7 @@
             class="%sylius.behat.page.admin.payment.payment_request.index.class%"
             parent="sylius.behat.page.admin.crud.index"
         >
-            <argument type="string">sylius_admin_payment_payment_request_index</argument>
+            <argument type="string">sylius_admin_payment_request_index</argument>
             <argument type="service" id="Sylius\Behat\Service\Helper\AutocompleteHelperInterface" />
         </service>
 
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/index.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/index.yaml
deleted file mode 100644
index 65a77dcde3..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/index.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-twig_hooks:
-    hooks:
-        'sylius_admin.payment.payment_request.index.content.header':
-            breadcrumbs:
-                template: '@SyliusAdmin/payment/payment_request/index/content/header/breadcrumbs.html.twig'
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/show.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/show.yaml
deleted file mode 100644
index 0300d97740..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment/payment_request/show.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-twig_hooks:
-    hooks:
-        'sylius_admin.payment.payment_request.show.content':
-            sections:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections.html.twig'
-        
-        'sylius_admin.payment.payment_request.show.content.header':
-            breadcrumbs:
-                template: '@SyliusAdmin/payment/payment_request/show/content/header/breadcrumbs.html.twig'
-
-        'sylius_admin.payment.payment_request.show.content.sections':
-            general:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general.html.twig'
-
-        'sylius_admin.payment.payment_request.show.content.sections#left':
-            payload:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/payload.html.twig'
-
-        'sylius_admin.payment.payment_request.show.content.sections#right':
-            response_data:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/response_data.html.twig'
-
-        'sylius_admin.payment.payment_request.show.content.sections.general':
-            hash:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/hash.html.twig'
-            method:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/method.html.twig'
-            action:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/action.html.twig'
-            state:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/state.html.twig'
-            created_at:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/created_at.html.twig'
-            updated_at:
-                template: '@SyliusAdmin/payment/payment_request/show/content/sections/general/updated_at.html.twig'
-            
-                
-            
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/index.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/index.yaml
new file mode 100644
index 0000000000..087c9da377
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/index.yaml
@@ -0,0 +1,5 @@
+twig_hooks:
+    hooks:
+        'sylius_admin.payment_request.index.content.header':
+            breadcrumbs:
+                template: '@SyliusAdmin/payment_request/index/content/header/breadcrumbs.html.twig'
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/show.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/show.yaml
new file mode 100644
index 0000000000..0fc8760724
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/show.yaml
@@ -0,0 +1,38 @@
+twig_hooks:
+    hooks:
+        'sylius_admin.payment_request.show.content':
+            sections:
+                template: '@SyliusAdmin/payment_request/show/content/sections.html.twig'
+        
+        'sylius_admin.payment_request.show.content.header':
+            breadcrumbs:
+                template: '@SyliusAdmin/payment_request/show/content/header/breadcrumbs.html.twig'
+
+        'sylius_admin.payment_request.show.content.sections':
+            general:
+                template: '@SyliusAdmin/payment_request/show/content/sections/general.html.twig'
+
+        'sylius_admin.payment_request.show.content.sections#left':
+            payload:
+                template: '@SyliusAdmin/payment_request/show/content/sections/payload.html.twig'
+
+        'sylius_admin.payment_request.show.content.sections#right':
+            response_data:
+                template: '@SyliusAdmin/payment_request/show/content/sections/response_data.html.twig'
+
+        'sylius_admin.payment_request.show.content.sections.general':
+            hash:
+                template: '@SyliusAdmin/payment_request/show/content/sections/general/hash.html.twig'
+            method:
+                template: '@SyliusAdmin/payment_request/show/content/sections/general/method.html.twig'
+            action:
+                template: '@SyliusAdmin/payment_request/show/content/sections/general/action.html.twig'
+            state:
+                template: '@SyliusAdmin/payment_request/show/content/sections/general/state.html.twig'
+            created_at:
+                template: '@SyliusAdmin/payment_request/show/content/sections/general/created_at.html.twig'
+            updated_at:
+                template: '@SyliusAdmin/payment_request/show/content/sections/general/updated_at.html.twig'
+            
+                
+            
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
index d154262af3..3d72df10f9 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
@@ -75,7 +75,7 @@ sylius_grid:
                         label: sylius.ui.list_payment_requests
                         options:
                             link:
-                                route: sylius_admin_payment_payment_request_index
+                                route: sylius_admin_payment_request_index
                                 parameters:
                                     paymentId: resource.id
                     complete:
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_payment_request.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request.yml
similarity index 91%
rename from src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_payment_request.yml
rename to src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request.yml
index 26ca780b22..59a908ad5c 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_payment_request.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment_request.yml
@@ -1,6 +1,6 @@
 sylius_grid:
     grids:
-        sylius_admin_payment_payment_request:
+        sylius_admin_payment_request:
             driver:
                 name: doctrine/orm
                 options:
@@ -21,17 +21,17 @@ sylius_grid:
                     label: sylius.ui.payment_method
                     path: .
                     options:
-                        template: "@SyliusAdmin/payment/payment_request/grid/field/method.html.twig"
+                        template: "@SyliusAdmin/payment_request/grid/field/method.html.twig"
                 action:
                     type: twig
                     label: sylius.ui.action
                     options:
-                        template: "@SyliusAdmin/payment/payment_request/grid/field/action.html.twig"
+                        template: "@SyliusAdmin/payment_request/grid/field/action.html.twig"
                 state:
                     type: twig
                     label: sylius.ui.state
                     options:
-                        template: "@SyliusAdmin/payment/payment_request/grid/field/state.html.twig"
+                        template: "@SyliusAdmin/payment_request/grid/field/state.html.twig"
                 createdAt:
                     type: twig
                     label: sylius.ui.creation_date
@@ -87,7 +87,7 @@ sylius_grid:
                         type: show
                         options:
                             link:
-                                route: sylius_admin_payment_payment_request_show
+                                route: sylius_admin_payment_request_show
                                 parameters:
                                     hash: resource.hash
                                     paymentId: resource.payment.id
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_request.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_request.yaml
index d627e4e3f4..b70fcc573c 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_request.yaml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_request.yaml
@@ -1,4 +1,4 @@
-sylius_admin_payment_payment_request_index:
+sylius_admin_payment_request_index:
     path: /
     methods: [GET]
     defaults:
@@ -6,10 +6,10 @@ sylius_admin_payment_payment_request_index:
         _sylius:
             section: admin
             permission: true
-            template: "@SyliusAdmin/payment/payment_request/index.html.twig"
-            grid: sylius_admin_payment_payment_request
+            template: "@SyliusAdmin/shared/crud/index.html.twig"
+            grid: sylius_admin_payment_request
             
-sylius_admin_payment_payment_request_show:
+sylius_admin_payment_request_show:
     path: /{hash}
     methods: [GET]
     defaults:
@@ -17,7 +17,7 @@ sylius_admin_payment_payment_request_show:
         _sylius:
             section: admin
             permission: true
-            template: "@SyliusAdmin/payment/payment_request/show.html.twig"
+            template: "@SyliusAdmin/shared/crud/show.html.twig"
             repository:
                 method: findOneByPaymentId
                 arguments:
diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
index 1ef5f85c2e..eb9d4afdf5 100644
--- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments/item/actions/list_payment_requests.html.twig
@@ -2,6 +2,6 @@
 
 {% set payment = hookable_metadata.context.payment %}
 
-<a title="details" href="{{ path('sylius_admin_payment_payment_request_index', {'paymentId': payment.id}) }}" class="btn btn-icon" data-bs-toggle="tooltip" data-bs-title="{{ 'sylius.ui.list_payment_requests'|trans }}" {{ sylius_test_html_attribute('list_payment_requests') }}>
+<a title="details" href="{{ path('sylius_admin_payment_request_index', {'paymentId': payment.id}) }}" class="btn btn-icon" data-bs-toggle="tooltip" data-bs-title="{{ 'sylius.ui.list_payment_requests'|trans }}" {{ sylius_test_html_attribute('list_payment_requests') }}>
     {{ icon({ icon: 'list_letters', class: 'icon icon-tabler' }) }}
 </a>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/state.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/state.html.twig
deleted file mode 100644
index f4e5ed460d..0000000000
--- a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/state.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{{ include('@SyliusAdmin/payment/payment_request/common/label/state/' ~ data ~ '.html.twig') }}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index.html.twig
deleted file mode 100644
index 0173df70ac..0000000000
--- a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends '@SyliusAdmin/shared/crud/index.html.twig' %}
-
-{% set resource_name = 'payment.payment_request' %}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show.html.twig
deleted file mode 100644
index b7fccd3b30..0000000000
--- a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends '@SyliusAdmin/shared/crud/show.html.twig' %}
-
-{% set resource_name = 'payment.payment_request' %}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/cancelled.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/cancelled.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/cancelled.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/cancelled.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/completed.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/completed.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/completed.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/completed.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/failed.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/failed.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/failed.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/failed.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/new.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/new.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/new.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/new.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/processing.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/processing.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/common/label/state/processing.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/common/label/state/processing.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/action.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/grid/field/action.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/action.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/grid/field/action.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/method.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/grid/field/method.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/grid/field/method.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/grid/field/method.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment_request/grid/field/state.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/grid/field/state.html.twig
new file mode 100644
index 0000000000..3aa2d08bac
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment_request/grid/field/state.html.twig
@@ -0,0 +1 @@
+{{ include('@SyliusAdmin/payment_request/common/label/state/' ~ data ~ '.html.twig') }}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index/content/header/breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/index/content/header/breadcrumbs.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/index/content/header/breadcrumbs.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/index/content/header/breadcrumbs.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/header/breadcrumbs.html.twig
similarity index 86%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/header/breadcrumbs.html.twig
index 48ecd8d00c..64db485e5f 100644
--- a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/header/breadcrumbs.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/header/breadcrumbs.html.twig
@@ -7,6 +7,6 @@
     { name: 'sylius.ui.dashboard', url: path('sylius_admin_dashboard'), active: false },
     { name: 'sylius.ui.payments'|trans, url: path('sylius_admin_payment_index'), active: false },
     { name: payment_id, active: false },
-    { name: 'sylius.ui.payment_requests'|trans, url: path('sylius_admin_payment_payment_request_index', {'paymentId': payment_id}), active: false },
+    { name: 'sylius.ui.payment_requests'|trans, url: path('sylius_admin_payment_request_index', {'paymentId': payment_id}), active: false },
     { name: payment_request.hash, active: true },
 ]) }}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/action.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/action.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/action.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/action.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/created_at.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/created_at.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/created_at.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/created_at.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/hash.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/hash.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/hash.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/hash.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/method.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/method.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/method.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/method.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/state.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/state.html.twig
similarity index 57%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/state.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/state.html.twig
index a541449a76..3db192851d 100644
--- a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/state.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/state.html.twig
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="col-12 col-md-4 fw-bold">{{ 'sylius.ui.state'|trans }}</div>
     <div class="col-12 col-md-8" {{ sylius_test_html_attribute('state') }}>
-        {{ include('@SyliusAdmin/payment/payment_request/common/label/state/' ~ hookable_metadata.context.resource.state ~ '.html.twig') }}
+        {{ include('@SyliusAdmin/payment_request/common/label/state/' ~ hookable_metadata.context.resource.state ~ '.html.twig') }}
     </div>
 </div>
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/updated_at.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/updated_at.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/general/updated_at.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/general/updated_at.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/payload.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/payload.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/payload.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/payload.html.twig
diff --git a/src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/response_data.html.twig b/src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/response_data.html.twig
similarity index 100%
rename from src/Sylius/Bundle/AdminBundle/templates/payment/payment_request/show/content/sections/response_data.html.twig
rename to src/Sylius/Bundle/AdminBundle/templates/payment_request/show/content/sections/response_data.html.twig

From 5e753f591a1d6d8b2274957e48cb5369c7e73063 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Fri, 27 Sep 2024 09:44:07 +0200
Subject: [PATCH 199/200] [PaymentBundle] Minor improvements

---
 .../payment_request/browsing_payment_requests.feature        | 2 +-
 .../payment_request/seeing_payment_request_details.feature   | 2 +-
 src/Sylius/Behat/Context/Setup/PaymentContext.php            | 2 +-
 .../Context/Ui/Admin/ManagingPaymentRequestsContext.php      | 5 +----
 .../Page/Admin/Payment/PaymentRequest/IndexPageInterface.php | 1 -
 .../config/app/twig_hooks/payment_request/show.yaml          | 3 ---
 .../Bundle/AdminBundle/Resources/config/grids/payment.yml    | 2 +-
 7 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/features/admin/payment/managing_payments/payment_request/browsing_payment_requests.feature b/features/admin/payment/managing_payments/payment_request/browsing_payment_requests.feature
index 3b53205378..84df289684 100644
--- a/features/admin/payment/managing_payments/payment_request/browsing_payment_requests.feature
+++ b/features/admin/payment/managing_payments/payment_request/browsing_payment_requests.feature
@@ -18,7 +18,7 @@ Feature: Browsing payment requests
     @api @ui
     Scenario: Browsing payment requests of a payment
         When I browse payments
-        And I want to view the payment request of the first payment
+        And I want to view the payment requests of the first payment
         Then there should be 3 payment requests on the list
         And it should be the payment request with action "authorize"
         And it should be the payment request with action "capture"
diff --git a/features/admin/payment/managing_payments/payment_request/seeing_payment_request_details.feature b/features/admin/payment/managing_payments/payment_request/seeing_payment_request_details.feature
index f51af8331a..a1af8f9f26 100644
--- a/features/admin/payment/managing_payments/payment_request/seeing_payment_request_details.feature
+++ b/features/admin/payment/managing_payments/payment_request/seeing_payment_request_details.feature
@@ -1,5 +1,5 @@
 @managing_payments
-Feature: Seeing payment request details
+Feature: Seeing payment request's details
     In order to have an overview of one of payment requests
     As an Administrator
     I want to be able to see its details
diff --git a/src/Sylius/Behat/Context/Setup/PaymentContext.php b/src/Sylius/Behat/Context/Setup/PaymentContext.php
index 2de4188c42..e5d3b91e73 100644
--- a/src/Sylius/Behat/Context/Setup/PaymentContext.php
+++ b/src/Sylius/Behat/Context/Setup/PaymentContext.php
@@ -127,7 +127,7 @@ final readonly class PaymentContext implements Context
     /**
      * @Given the store has :paymentMethodName payment method not assigned to any channel
      */
-    public function theStoreHasPaymentMethodNotAssignedToAnyChannel($paymentMethodName): void
+    public function theStoreHasPaymentMethodNotAssignedToAnyChannel(string $paymentMethodName): void
     {
         $this->createPaymentMethod($paymentMethodName, 'PM_' . $paymentMethodName, 'Offline', 'Payment method', false);
     }
diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
index 22e7ee7245..cc74e4ffc9 100644
--- a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
+++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentRequestsContext.php
@@ -84,10 +84,7 @@ final readonly class ManagingPaymentRequestsContext implements Context
      */
     public function thereShouldBeProductVariantsOnTheList(int $count): void
     {
-        Assert::same(
-            $this->indexPage->countItems(),
-            $count,
-        );
+        Assert::same($this->indexPage->countItems(), $count);
     }
 
     /**
diff --git a/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPageInterface.php b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPageInterface.php
index 348607d720..2aa4f49da1 100644
--- a/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPageInterface.php
+++ b/src/Sylius/Behat/Page/Admin/Payment/PaymentRequest/IndexPageInterface.php
@@ -22,5 +22,4 @@ interface IndexPageInterface extends BaseIndexPageInterface
     public function chooseActionToFilter(string $action): void;
 
     public function chooseStateToFilter(string $state): void;
-
 }
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/show.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/show.yaml
index 0fc8760724..731c453478 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/show.yaml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/payment_request/show.yaml
@@ -33,6 +33,3 @@ twig_hooks:
                 template: '@SyliusAdmin/payment_request/show/content/sections/general/created_at.html.twig'
             updated_at:
                 template: '@SyliusAdmin/payment_request/show/content/sections/general/updated_at.html.twig'
-            
-                
-            
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
index 3d72df10f9..48567073b3 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/payment.yml
@@ -69,7 +69,7 @@ sylius_grid:
                         class: "%sylius.model.channel.class%"
             actions:
                 item:
-                    show_payment_requests:
+                    list_payment_requests:
                         type: show
                         icon: list_letters
                         label: sylius.ui.list_payment_requests

From f8063051297a5e2fc55db17bcee47670e3119745 Mon Sep 17 00:00:00 2001
From: Wojdylak <karolwojdyla37@gmail.com>
Date: Fri, 27 Sep 2024 10:20:51 +0200
Subject: [PATCH 200/200] [PaymentBundle] Minor improvement

---
 .../Behat/Context/Api/Admin/ManagingPaymentsContext.php       | 4 ++--
 src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentsContext.php
index 8175dde7a4..73c778c96e 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingPaymentsContext.php
@@ -59,9 +59,9 @@ final readonly class ManagingPaymentsContext implements Context
     }
 
     /**
-     * @When I want to view the payment request of the first payment
+     * @When I want to view the payment requests of the first payment
      */
-    public function iWantToViewThePaymentRequestOfTheFirstPayment(): void
+    public function iWantToViewThePaymentRequestsOfTheFirstPayment(): void
     {
         $response = $this->client->getLastResponse();
 
diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php
index e9cf67042b..308462e854 100644
--- a/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php
+++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingPaymentsContext.php
@@ -81,9 +81,9 @@ final class ManagingPaymentsContext implements Context
     }
 
     /**
-     * @When I want to view the payment request of the first payment
+     * @When I want to view the payment requests of the first payment
      */
-    public function iWantToViewThePaymentRequestOfTheFirstPayment(): void
+    public function iWantToViewThePaymentRequestsOfTheFirstPayment(): void
     {
         $this->indexPage->showPaymentRequestOfNthPayment(1);
     }