Bump PHP to 7.4 and use its syntax

Sylius · Sep 22, 2021 · 3e1ca41 · 3e1ca41
1 parent be88995
commit 3e1ca41
Show file tree

Hide file tree

Showing 67 changed files with 217 additions and 401 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,22 +18,16 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.0", "7.4", "7.3"]
+                php: ["8.0", "7.4"]
                 node: ["10.x"]
                 mysql: ["5.7", "8.0"]
                 symfony: ["^4.4", "^5.2"]
                 sylius: ["~1.8.0", "~1.9.0", "~1.10.0"]
 
                 exclude:
-                    -
-                        php: "7.3"
-                        mysql: "8.0"
                     -
                         sylius: "~1.8.0"
                         symfony: "^5.2"
-                    -
-                        php: "7.3"
-                        sylius: "~1.10.0"
                     -
                         php: "8.0"
                         sylius: "~1.8.0"

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "description": "PayPal plugin for Sylius.",
     "license": "MIT",
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
 
         "sylius/sylius": "^1.8",
         "phpseclib/phpseclib": "^2.0",
@@ -27,7 +27,7 @@
         "friends-of-behat/variadic-extension": "^1.3",
         "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
         "phpspec/phpspec": "^6.1",
-        "phpstan/phpstan": "0.12.84",
+        "phpstan/phpstan": "0.12.98",
         "phpstan/phpstan-doctrine": "0.12.33",
         "phpstan/phpstan-webmozart-assert": "0.12.12",
         "phpunit/phpunit": "^8.5",
@@ -39,7 +39,8 @@
         "symfony/intl": "^4.4 || ^5.2",
         "symfony/web-profiler-bundle": "^4.4 || ^5.2",
         "symfony/web-server-bundle": "^4.4|^5.0",
-        "vimeo/psalm": "3.11.4"
+        "vimeo/psalm": "3.11.4",
+        "rector/rector": "^0.11.53"
     },
     "conflict": {
         "symfony/doctrine-bridge": "4.4.16",

diff --git a/rector.php b/rector.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\Set\ValueObject\SetList;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void
+{
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
+    $parameters->set(Option::IMPORT_SHORT_CLASSES, false);
+
+    $services = $containerConfigurator->services();
+    $services->set(TypedPropertyRector::class);
+};
diff --git a/src/Api/AuthorizeClientApi.php b/src/Api/AuthorizeClientApi.php
@@ -17,8 +17,7 @@
 
 final class AuthorizeClientApi implements AuthorizeClientApiInterface
 {
-    /** @var PayPalClientInterface */
-    private $payPalClient;
+    private PayPalClientInterface $payPalClient;
 
     public function __construct(PayPalClientInterface $payPalClient)
     {

diff --git a/src/Api/CacheAuthorizeClientApi.php b/src/Api/CacheAuthorizeClientApi.php
@@ -23,17 +23,13 @@
 
 final class CacheAuthorizeClientApi implements CacheAuthorizeClientApiInterface
 {
-    /** @var ObjectManager */
-    private $payPalCredentialsManager;
+    private ObjectManager $payPalCredentialsManager;
 
-    /** @var ObjectRepository */
-    private $payPalCredentialsRepository;
+    private ObjectRepository $payPalCredentialsRepository;
 
-    /** @var AuthorizeClientApiInterface */
-    private $authorizeClientApi;
+    private AuthorizeClientApiInterface $authorizeClientApi;
 
-    /** @var UuidProviderInterface */
-    private $uuidProvider;
+    private UuidProviderInterface $uuidProvider;
 
     public function __construct(
         ObjectManager $payPalCredentialsManager,

diff --git a/src/Api/CompleteOrderApi.php b/src/Api/CompleteOrderApi.php
@@ -17,8 +17,7 @@
 
 final class CompleteOrderApi implements CompleteOrderApiInterface
 {
-    /** @var PayPalClientInterface */
-    private $client;
+    private PayPalClientInterface $client;
 
     public function __construct(PayPalClientInterface $client)
     {

diff --git a/src/Api/CreateOrderApi.php b/src/Api/CreateOrderApi.php
@@ -24,14 +24,11 @@
 
 final class CreateOrderApi implements CreateOrderApiInterface
 {
-    /** @var PayPalClientInterface */
-    private $client;
+    private PayPalClientInterface $client;
 
-    /** @var PaymentReferenceNumberProviderInterface */
-    private $paymentReferenceNumberProvider;
+    private PaymentReferenceNumberProviderInterface $paymentReferenceNumberProvider;
 
-    /** @var PayPalItemDataProviderInterface */
-    private $payPalItemDataProvider;
+    private PayPalItemDataProviderInterface $payPalItemDataProvider;
 
     public function __construct(
         PayPalClientInterface $client,

diff --git a/src/Api/GenericApi.php b/src/Api/GenericApi.php
@@ -8,8 +8,7 @@
 
 final class GenericApi implements GenericApiInterface
 {
-    /** @var ClientInterface */
-    private $client;
+    private ClientInterface $client;
 
     public function __construct(ClientInterface $client)
     {

diff --git a/src/Api/IdentityApi.php b/src/Api/IdentityApi.php
@@ -17,8 +17,7 @@
 
 final class IdentityApi implements IdentityApiInterface
 {
-    /** @var PayPalClientInterface */
-    private $client;
+    private PayPalClientInterface $client;
 
     public function __construct(PayPalClientInterface $client)
     {

diff --git a/src/Api/OrderDetailsApi.php b/src/Api/OrderDetailsApi.php
@@ -8,8 +8,7 @@
 
 final class OrderDetailsApi implements OrderDetailsApiInterface
 {
-    /** @var PayPalClientInterface */
-    private $client;
+    private PayPalClientInterface $client;
 
     public function __construct(PayPalClientInterface $client)
     {

diff --git a/src/Api/RefundPaymentApi.php b/src/Api/RefundPaymentApi.php
@@ -17,8 +17,7 @@
 
 final class RefundPaymentApi implements RefundPaymentApiInterface
 {
-    /** @var PayPalClientInterface */
-    private $client;
+    private PayPalClientInterface $client;
 
     public function __construct(PayPalClientInterface $client)
     {

diff --git a/src/Api/UpdateOrderApi.php b/src/Api/UpdateOrderApi.php
@@ -22,14 +22,11 @@
 
 final class UpdateOrderApi implements UpdateOrderApiInterface
 {
-    /** @var PayPalClientInterface */
-    private $client;
+    private PayPalClientInterface $client;
 
-    /** @var PaymentReferenceNumberProviderInterface */
-    private $paymentReferenceNumberProvider;
+    private PaymentReferenceNumberProviderInterface $paymentReferenceNumberProvider;
 
-    /** @var PayPalItemDataProviderInterface */
-    private $payPalItemsDataProvider;
+    private PayPalItemDataProviderInterface $payPalItemsDataProvider;
 
     public function __construct(
         PayPalClientInterface $client,

diff --git a/src/Api/WebhookApi.php b/src/Api/WebhookApi.php
@@ -8,11 +8,9 @@
 
 final class WebhookApi implements WebhookApiInterface
 {
-    /** @var ClientInterface */
-    private $client;
+    private ClientInterface $client;
 
-    /** @var string */
-    private $baseUrl;
+    private string $baseUrl;
 
     public function __construct(ClientInterface $client, string $baseUrl)
     {

diff --git a/src/ApiPlatform/PayPalPayment.php b/src/ApiPlatform/PayPalPayment.php
@@ -28,11 +28,9 @@
  */
 final class PayPalPayment
 {
-    /** @var RouterInterface */
-    private $router;
+    private RouterInterface $router;
 
-    /** @var AvailableCountriesProviderInterface */
-    private $availableCountriesProvider;
+    private AvailableCountriesProviderInterface $availableCountriesProvider;
 
     public function __construct(RouterInterface $router, AvailableCountriesProviderInterface $availableCountriesProvider)
     {

diff --git a/src/Client/PayPalClient.php b/src/Client/PayPalClient.php
@@ -27,29 +27,21 @@
 
 final class PayPalClient implements PayPalClientInterface
 {
-    /** @var ClientInterface */
-    private $client;
+    private ClientInterface $client;
 
-    /** @var LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
-    /** @var UuidProviderInterface */
-    private $uuidProvider;
+    private UuidProviderInterface $uuidProvider;
 
-    /** @var PayPalConfigurationProviderInterface */
-    private $payPalConfigurationProvider;
+    private PayPalConfigurationProviderInterface $payPalConfigurationProvider;
 
-    /** @var ChannelContextInterface */
-    private $channelContext;
+    private ChannelContextInterface $channelContext;
 
-    /** @var string */
-    private $baseUrl;
+    private string $baseUrl;
 
-    /** @var int */
-    private $requestTrialsLimit;
+    private int $requestTrialsLimit;
 
-    /** @var bool */
-    private $loggingLevelIncreased;
+    private bool $loggingLevelIncreased;
 
     public function __construct(
         ClientInterface $client,

diff --git a/src/Command/CompletePaidPaymentsCommand.php b/src/Command/CompletePaidPaymentsCommand.php
@@ -20,20 +20,15 @@
 
 final class CompletePaidPaymentsCommand extends Command
 {
-    /** @var PaymentRepositoryInterface */
-    private $paymentRepository;
+    private PaymentRepositoryInterface $paymentRepository;
 
-    /** @var ObjectManager */
-    private $paymentManager;
+    private ObjectManager $paymentManager;
 
-    /** @var CacheAuthorizeClientApiInterface */
-    private $authorizeClientApi;
+    private CacheAuthorizeClientApiInterface $authorizeClientApi;
 
-    /** @var OrderDetailsApiInterface */
-    private $orderDetailsApi;
+    private OrderDetailsApiInterface $orderDetailsApi;
 
-    /** @var FactoryInterface */
-    private $stateMachineFactory;
+    private FactoryInterface $stateMachineFactory;
 
     public function __construct(
         PaymentRepositoryInterface $paymentRepository,

diff --git a/src/Controller/CancelPayPalCheckoutPaymentAction.php b/src/Controller/CancelPayPalCheckoutPaymentAction.php
@@ -12,11 +12,9 @@
 
 final class CancelPayPalCheckoutPaymentAction
 {
-    /** @var PaymentProviderInterface */
-    private $paymentProvider;
+    private PaymentProviderInterface $paymentProvider;
 
-    /** @var PaymentStateManagerInterface */
-    private $paymentStateManager;
+    private PaymentStateManagerInterface $paymentStateManager;
 
     public function __construct(
         PaymentProviderInterface $paymentProvider,

diff --git a/src/Controller/CancelPayPalOrderAction.php b/src/Controller/CancelPayPalOrderAction.php
@@ -13,14 +13,11 @@
 
 final class CancelPayPalOrderAction
 {
-    /** @var PaymentProviderInterface */
-    private $paymentProvider;
+    private PaymentProviderInterface $paymentProvider;
 
-    /** @var OrderRepositoryInterface */
-    private $orderRepository;
+    private OrderRepositoryInterface $orderRepository;
 
-    /** @var FlashBag */
-    private $flashBag;
+    private FlashBag $flashBag;
 
     public function __construct(
         PaymentProviderInterface $paymentProvider,

diff --git a/src/Controller/CancelPayPalPaymentAction.php b/src/Controller/CancelPayPalPaymentAction.php
@@ -16,20 +16,15 @@
 
 final class CancelPayPalPaymentAction
 {
-    /** @var PaymentProviderInterface */
-    private $paymentProvider;
+    private PaymentProviderInterface $paymentProvider;
 
-    /** @var ObjectManager */
-    private $objectManager;
+    private ObjectManager $objectManager;
 
-    /** @var FlashBag */
-    private $flashBag;
+    private FlashBag $flashBag;
 
-    /** @var FactoryInterface */
-    private $stateMachineFactory;
+    private FactoryInterface $stateMachineFactory;
 
-    /** @var OrderProcessorInterface */
-    private $orderPaymentProcessor;
+    private OrderProcessorInterface $orderPaymentProcessor;
 
     public function __construct(
         PaymentProviderInterface $paymentProvider,

diff --git a/src/Controller/CompletePayPalOrderAction.php b/src/Controller/CompletePayPalOrderAction.php
@@ -14,14 +14,11 @@
 
 final class CompletePayPalOrderAction
 {
-    /** @var PaymentStateManagerInterface */
-    private $paymentStateManager;
+    private PaymentStateManagerInterface $paymentStateManager;
 
-    /** @var UrlGeneratorInterface */
-    private $router;
+    private UrlGeneratorInterface $router;
 
-    /** @var OrderProviderInterface */
-    private $orderProvider;
+    private OrderProviderInterface $orderProvider;
 
     public function __construct(
         PaymentStateManagerInterface $paymentStateManager,

diff --git a/src/Controller/CompletePayPalOrderFromPaymentPageAction.php b/src/Controller/CompletePayPalOrderFromPaymentPageAction.php
@@ -18,20 +18,15 @@
 
 final class CompletePayPalOrderFromPaymentPageAction
 {
-    /** @var PaymentStateManagerInterface */
-    private $paymentStateManager;
+    private PaymentStateManagerInterface $paymentStateManager;
 
-    /** @var UrlGeneratorInterface */
-    private $router;
+    private UrlGeneratorInterface $router;
 
-    /** @var OrderProviderInterface */
-    private $orderProvider;
+    private OrderProviderInterface $orderProvider;
 
-    /** @var FactoryInterface */
-    private $stateMachine;
+    private FactoryInterface $stateMachine;
 
-    /** @var ObjectManager */
-    private $orderManager;
+    private ObjectManager $orderManager;
 
     public function __construct(
         PaymentStateManagerInterface $paymentStateManager,