[UPMERGE] 1.6 -> 1.7 (Sylius#351)

This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/PayPalPlugin/blob/1.7/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/1.7 -m "Resolve conflicts between 1.6 and 1.7"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/PayPalPlugin`
repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.

Author: GSadee

UPGRADE.md

@@ -240,34 +240,34 @@ public function __construct(
     ```
 
    `Sylius\PayPalPlugin\Controller\ProcessPayPalOrderAction`:
-   ```diff
-   public function __construct(
-       private readonly OrderRepositoryInterface $orderRepository,
-       private readonly CustomerRepositoryInterface $customerRepository,
-       private readonly FactoryInterface $customerFactory,
-       private readonly AddressFactoryInterface $addressFactory,
-       private readonly ObjectManager $orderManager,
-       private readonly StateMachineFactoryInterface|StateMachineInterface $stateMachineFactory,
-       private readonly PaymentStateManagerInterface $paymentStateManager,
-       private readonly CacheAuthorizeClientApiInterface $authorizeClientApi,
-       private readonly OrderDetailsApiInterface $orderDetailsApi,
-       private readonly OrderProviderInterface $orderProvider,
-   +   private readonly ?PaymentAmountVerifierInterface $paymentAmountVerifier = null,
-   )
-   ```
-   
+    ```diff
+    public function __construct(
+        private readonly OrderRepositoryInterface $orderRepository,
+        private readonly CustomerRepositoryInterface $customerRepository,
+        private readonly FactoryInterface $customerFactory,
+        private readonly AddressFactoryInterface $addressFactory,
+        private readonly ObjectManager $orderManager,
+        private readonly StateMachineFactoryInterface|StateMachineInterface $stateMachineFactory,
+        private readonly PaymentStateManagerInterface $paymentStateManager,
+        private readonly CacheAuthorizeClientApiInterface $authorizeClientApi,
+        private readonly OrderDetailsApiInterface $orderDetailsApi,
+        private readonly OrderProviderInterface $orderProvider,
+    +   private readonly ?PaymentAmountVerifierInterface $paymentAmountVerifier = null,
+    )
+    ```
+
    `Sylius\PayPalPlugin\Controller\CompletePayPalOrderFromPaymentPageAction`:
-   ```diff
-   public function __construct(
-       private readonly PaymentStateManagerInterface $paymentStateManager,
-       private readonly UrlGeneratorInterface $router,
-       private readonly OrderProviderInterface $orderProvider,
-       private readonly FactoryInterface|StateMachineInterface $stateMachine,
-       private readonly ObjectManager $orderManager,
-   +   private readonly ?PaymentAmountVerifierInterface $paymentAmountVerifier = null,
-   +   private readonly ?OrderProcessorInterface $orderProcessor = null,
-   )
-   ```
+    ```diff
+    public function __construct(
+        private readonly PaymentStateManagerInterface $paymentStateManager,
+        private readonly UrlGeneratorInterface $router,
+        private readonly OrderProviderInterface $orderProvider,
+        private readonly FactoryInterface|StateMachineInterface $stateMachine,
+        private readonly ObjectManager $orderManager,
+    +   private readonly ?PaymentAmountVerifierInterface $paymentAmountVerifier = null,
+    +   private readonly ?OrderProcessorInterface $orderProcessor = null,
+    )
+    ```
 
 ### UPGRADE FROM 1.5.1 to 1.6.0
 

src/Controller/ProcessPayPalOrderAction.php

@@ -61,16 +61,6 @@ public function __construct(
                 ),
             );
         }
-        if (null !== $this->orderRepository) {
-            trigger_deprecation(
-                'sylius/paypal-plugin',
-                '1.7',
-                sprintf(
-                    'Passing an instance of "%s" as the first argument is deprecated and will be prohibited in 2.0',
-                    OrderRepositoryInterface::class,
-                ),
-            );
-        }
         if (null === $this->paymentAmountVerifier) {
             trigger_deprecation(
                 'sylius/paypal-plugin',
@@ -81,6 +71,16 @@ public function __construct(
                 ),
             );
         }
+        if (null !== $this->orderRepository) {
+            trigger_deprecation(
+                'sylius/paypal-plugin',
+                '1.7',
+                sprintf(
+                    'Passing an instance of "%s" as the first argument is deprecated and will be prohibited in 2.0',
+                    OrderRepositoryInterface::class,
+                ),
+            );
+        }
     }
 
     public function __invoke(Request $request): Response

src/Resources/config/services.xml

@@ -317,7 +317,7 @@
             <tag name="twig.extension" />
         </service>
         <service id="sylius_paypal.twig.extension.order_address" alias="Sylius\PayPalPlugin\Twig\OrderAddressExtension" />
-        
+
         <service id="sylius_paypal.verifier.payment_amount" class="Sylius\PayPalPlugin\Verifier\PaymentAmountVerifier" />
         <service id="Sylius\PayPalPlugin\Verifier\PaymentAmountVerifierInterface" alias="sylius_paypal.verifier.payment_amount" />
     </services>