From 3e1ca41a52a25977380a7a0eed30bc6fada47335 Mon Sep 17 00:00:00 2001 From: Mateusz Zalewski Date: Fri, 17 Sep 2021 13:58:57 +0200 Subject: [PATCH] Bump PHP to 7.4 and use its syntax --- .github/workflows/build.yml | 8 +---- composer.json | 7 +++-- rector.php | 18 +++++++++++ src/Api/AuthorizeClientApi.php | 3 +- src/Api/CacheAuthorizeClientApi.php | 12 +++----- src/Api/CompleteOrderApi.php | 3 +- src/Api/CreateOrderApi.php | 9 ++---- src/Api/GenericApi.php | 3 +- src/Api/IdentityApi.php | 3 +- src/Api/OrderDetailsApi.php | 3 +- src/Api/RefundPaymentApi.php | 3 +- src/Api/UpdateOrderApi.php | 9 ++---- src/Api/WebhookApi.php | 6 ++-- src/ApiPlatform/PayPalPayment.php | 6 ++-- src/Client/PayPalClient.php | 24 +++++---------- src/Command/CompletePaidPaymentsCommand.php | 15 ++++------ .../CancelPayPalCheckoutPaymentAction.php | 6 ++-- src/Controller/CancelPayPalOrderAction.php | 9 ++---- src/Controller/CancelPayPalPaymentAction.php | 15 ++++------ src/Controller/CompletePayPalOrderAction.php | 9 ++---- ...mpletePayPalOrderFromPaymentPageAction.php | 15 ++++------ src/Controller/CreatePayPalOrderAction.php | 21 +++++-------- .../CreatePayPalOrderFromCartAction.php | 18 ++++------- ...CreatePayPalOrderFromPaymentPageAction.php | 15 ++++------ .../DownloadPayoutsReportAction.php | 6 ++-- src/Controller/EnableSellerAction.php | 6 ++-- src/Controller/PayPalButtonsController.php | 24 +++++---------- src/Controller/PayPalPaymentOnErrorAction.php | 6 ++-- src/Controller/PayWithPayPalFormAction.php | 15 ++++------ src/Controller/ProcessPayPalOrderAction.php | 30 +++++++------------ src/Controller/UpdatePayPalOrderAction.php | 18 ++++------- src/Controller/Webhook/RefundOrderAction.php | 12 +++----- .../SftpPayoutsReportDownloader.php | 3 +- src/Enabler/PayPalPaymentMethodEnabler.php | 12 +++----- src/Entity/PayPalCredentials.php | 18 ++++------- .../PayPalPaymentMethodNewResourceFactory.php | 6 ++-- src/Listener/PayPalPaymentMethodListener.php | 12 +++----- src/Manager/PaymentStateManager.php | 9 ++---- src/Model/Report.php | 6 ++-- .../Initiator/OnboardingInitiator.php | 9 ++---- .../Processor/BasicOnboardingProcessor.php | 9 ++---- src/Payum/Action/CaptureAction.php | 9 ++---- src/Payum/Action/CompleteOrderAction.php | 24 +++++---------- src/Payum/Request/CompleteOrder.php | 3 +- .../AfterCheckoutOrderPaymentProcessor.php | 3 +- src/Processor/OrderPaymentProcessor.php | 6 ++-- src/Processor/PayPalAddressProcessor.php | 3 +- .../PayPalOrderCompleteProcessor.php | 3 +- .../PayPalPaymentCompleteProcessor.php | 3 +- .../PayPalPaymentRefundProcessor.php | 15 ++++------ .../UiPayPalPaymentRefundProcessor.php | 3 +- src/Provider/AvailableCountriesProvider.php | 6 ++-- src/Provider/OrderProvider.php | 3 +- src/Provider/PayPalConfigurationProvider.php | 3 +- src/Provider/PayPalItemDataProvider.php | 3 +- src/Provider/PayPalPaymentMethodProvider.php | 3 +- src/Provider/PayPalRefundDataProvider.php | 9 ++---- src/Provider/PaymentProvider.php | 3 +- src/Registrar/SellerWebhookRegistrar.php | 9 ++---- src/Resolver/CapturePaymentResolver.php | 3 +- src/Resolver/CompleteOrderPaymentResolver.php | 3 +- .../PayPalDefaultPaymentMethodResolver.php | 6 ++-- ...yPalPrioritisingPaymentMethodsResolver.php | 6 ++-- src/Updater/PayPalPaymentUpdater.php | 3 +- .../Context/Admin/ManagingOrdersContext.php | 15 ++++------ .../Admin/ManagingPaymentMethodsContext.php | 9 ++---- .../Context/Setup/PaymentPayPalContext.php | 21 +++++-------- 67 files changed, 217 insertions(+), 401 deletions(-) create mode 100644 rector.php diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 214641cb..24dae674 100644 --- 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 index 050d5876..982868ab 100644 --- 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 new file mode 100644 index 00000000..6566b71d --- /dev/null +++ b/rector.php @@ -0,0 +1,18 @@ +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 index 7b06a2c4..f011b72a 100644 --- 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 index f2e5774c..68ebf0c3 100644 --- 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 index f563c430..bf72b878 100644 --- 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 index 12270026..288ebf46 100644 --- 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 index ec93e135..d8fc5788 100644 --- 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 index 64ff06f3..f7b964c9 100644 --- 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 index 61ca617f..e4d08b35 100644 --- 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 index e03c881a..35ac8211 100644 --- 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 index 85002527..4f9eeaee 100644 --- 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 index e73887ce..89c0be6f 100644 --- 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 index 011d78a8..1be17b57 100644 --- 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 index ecdb4d78..25cc2cd7 100644 --- 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 index de73f5a9..931077bb 100644 --- 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 index 523db726..ad53d03d 100644 --- 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 index a207076f..8c6527ee 100644 --- 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 index 57dfef9d..b8e7c06d 100644 --- 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 index e7a24936..453b5f1e 100644 --- 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 index 4b211cfa..62f6cf48 100644 --- 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, diff --git a/src/Controller/CreatePayPalOrderAction.php b/src/Controller/CreatePayPalOrderAction.php index 9699389b..6da35553 100644 --- a/src/Controller/CreatePayPalOrderAction.php +++ b/src/Controller/CreatePayPalOrderAction.php @@ -18,26 +18,19 @@ final class CreatePayPalOrderAction { - /** @var Payum */ - private $payum; + private Payum $payum; - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; - /** @var ObjectManager */ - private $paymentManager; + private ObjectManager $paymentManager; - /** @var PaymentStateManagerInterface */ - private $paymentStateManager; + private PaymentStateManagerInterface $paymentStateManager; - /** @var OrderProviderInterface */ - private $orderProvider; + private OrderProviderInterface $orderProvider; - /** @var CapturePaymentResolverInterface */ - private $capturePaymentResolver; + private CapturePaymentResolverInterface $capturePaymentResolver; public function __construct( Payum $payum, diff --git a/src/Controller/CreatePayPalOrderFromCartAction.php b/src/Controller/CreatePayPalOrderFromCartAction.php index 2f54dd0f..83068787 100644 --- a/src/Controller/CreatePayPalOrderFromCartAction.php +++ b/src/Controller/CreatePayPalOrderFromCartAction.php @@ -19,23 +19,17 @@ final class CreatePayPalOrderFromCartAction { - /** @var Payum */ - private $payum; + private Payum $payum; - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; - /** @var ObjectManager */ - private $paymentManager; + private ObjectManager $paymentManager; - /** @var OrderProviderInterface */ - private $orderProvider; + private OrderProviderInterface $orderProvider; - /** @var CapturePaymentResolverInterface */ - private $capturePaymentResolver; + private CapturePaymentResolverInterface $capturePaymentResolver; public function __construct( Payum $payum, diff --git a/src/Controller/CreatePayPalOrderFromPaymentPageAction.php b/src/Controller/CreatePayPalOrderFromPaymentPageAction.php index 9a819369..12f184bc 100644 --- a/src/Controller/CreatePayPalOrderFromPaymentPageAction.php +++ b/src/Controller/CreatePayPalOrderFromPaymentPageAction.php @@ -20,20 +20,15 @@ final class CreatePayPalOrderFromPaymentPageAction { - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; - /** @var ObjectManager */ - private $paymentManager; + private ObjectManager $paymentManager; - /** @var PaymentStateManagerInterface */ - private $paymentStateManager; + private PaymentStateManagerInterface $paymentStateManager; - /** @var OrderProviderInterface */ - private $orderProvider; + private OrderProviderInterface $orderProvider; - /** @var CapturePaymentResolverInterface */ - private $capturePaymentResolver; + private CapturePaymentResolverInterface $capturePaymentResolver; public function __construct( FactoryInterface $stateMachineFactory, diff --git a/src/Controller/DownloadPayoutsReportAction.php b/src/Controller/DownloadPayoutsReportAction.php index 408e579b..1dbdd402 100644 --- a/src/Controller/DownloadPayoutsReportAction.php +++ b/src/Controller/DownloadPayoutsReportAction.php @@ -13,11 +13,9 @@ final class DownloadPayoutsReportAction { - /** @var PayoutsReportDownloaderInterface */ - private $payoutsReportDownloader; + private PayoutsReportDownloaderInterface $payoutsReportDownloader; - /** @var PaymentMethodRepositoryInterface */ - private $paymentMethodRepository; + private PaymentMethodRepositoryInterface $paymentMethodRepository; public function __construct( PayoutsReportDownloaderInterface $payoutsReportDownloader, diff --git a/src/Controller/EnableSellerAction.php b/src/Controller/EnableSellerAction.php index 97c88733..ac662985 100644 --- a/src/Controller/EnableSellerAction.php +++ b/src/Controller/EnableSellerAction.php @@ -16,11 +16,9 @@ final class EnableSellerAction { - /** @var PaymentMethodRepositoryInterface */ - private $paymentMethodRepository; + private PaymentMethodRepositoryInterface $paymentMethodRepository; - /** @var PaymentMethodEnablerInterface */ - private $paymentMethodEnabler; + private PaymentMethodEnablerInterface $paymentMethodEnabler; public function __construct( PaymentMethodRepositoryInterface $paymentMethodRepository, diff --git a/src/Controller/PayPalButtonsController.php b/src/Controller/PayPalButtonsController.php index f2a577ce..6640282d 100644 --- a/src/Controller/PayPalButtonsController.php +++ b/src/Controller/PayPalButtonsController.php @@ -19,29 +19,21 @@ final class PayPalButtonsController { - /** @var Environment */ - private $twig; + private Environment $twig; - /** @var UrlGeneratorInterface */ - private $router; + private UrlGeneratorInterface $router; - /** @var ChannelContextInterface */ - private $channelContext; + private ChannelContextInterface $channelContext; - /** @var LocaleContextInterface */ - private $localeContext; + private LocaleContextInterface $localeContext; - /** @var PayPalConfigurationProviderInterface */ - private $payPalConfigurationProvider; + private PayPalConfigurationProviderInterface $payPalConfigurationProvider; - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; - /** @var AvailableCountriesProviderInterface */ - private $availableCountriesProvider; + private AvailableCountriesProviderInterface $availableCountriesProvider; - /** @var LocaleProcessorInterface */ - private $localeProcessor; + private LocaleProcessorInterface $localeProcessor; public function __construct( Environment $twig, diff --git a/src/Controller/PayPalPaymentOnErrorAction.php b/src/Controller/PayPalPaymentOnErrorAction.php index de9ab7c5..a5c70232 100644 --- a/src/Controller/PayPalPaymentOnErrorAction.php +++ b/src/Controller/PayPalPaymentOnErrorAction.php @@ -11,11 +11,9 @@ final class PayPalPaymentOnErrorAction { - /** @var FlashBagInterface */ - private $flashBag; + private FlashBagInterface $flashBag; - /** @var LoggerInterface */ - private $logger; + private LoggerInterface $logger; public function __construct(FlashBagInterface $flashBag, LoggerInterface $logger) { diff --git a/src/Controller/PayWithPayPalFormAction.php b/src/Controller/PayWithPayPalFormAction.php index 8e2ace2c..d1c13888 100644 --- a/src/Controller/PayWithPayPalFormAction.php +++ b/src/Controller/PayWithPayPalFormAction.php @@ -18,20 +18,15 @@ final class PayWithPayPalFormAction { - /** @var Environment */ - private $twig; + private Environment $twig; - /** @var PaymentRepositoryInterface */ - private $paymentRepository; + private PaymentRepositoryInterface $paymentRepository; - /** @var AvailableCountriesProviderInterface */ - private $countriesProvider; + private AvailableCountriesProviderInterface $countriesProvider; - /** @var CacheAuthorizeClientApiInterface */ - private $authorizeClientApi; + private CacheAuthorizeClientApiInterface $authorizeClientApi; - /** @var IdentityApiInterface */ - private $identityApi; + private IdentityApiInterface $identityApi; public function __construct( Environment $twig, diff --git a/src/Controller/ProcessPayPalOrderAction.php b/src/Controller/ProcessPayPalOrderAction.php index 1e45d8c9..11d79841 100644 --- a/src/Controller/ProcessPayPalOrderAction.php +++ b/src/Controller/ProcessPayPalOrderAction.php @@ -24,35 +24,25 @@ final class ProcessPayPalOrderAction { - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; - /** @var CustomerRepositoryInterface */ - private $customerRepository; + private CustomerRepositoryInterface $customerRepository; - /** @var FactoryInterface */ - private $customerFactory; + private \Sylius\Component\Resource\Factory\FactoryInterface $customerFactory; - /** @var AddressFactoryInterface */ - private $addressFactory; + private AddressFactoryInterface $addressFactory; - /** @var ObjectManager */ - private $orderManager; + private ObjectManager $orderManager; - /** @var StateMachineFactoryInterface */ - private $stateMachineFactory; + private StateMachineFactoryInterface $stateMachineFactory; - /** @var PaymentStateManagerInterface */ - private $paymentStateManager; + private PaymentStateManagerInterface $paymentStateManager; - /** @var CacheAuthorizeClientApiInterface */ - private $authorizeClientApi; + private CacheAuthorizeClientApiInterface $authorizeClientApi; - /** @var OrderDetailsApiInterface */ - private $orderDetailsApi; + private OrderDetailsApiInterface $orderDetailsApi; - /** @var OrderProviderInterface */ - private $orderProvider; + private OrderProviderInterface $orderProvider; public function __construct( OrderRepositoryInterface $orderRepository, diff --git a/src/Controller/UpdatePayPalOrderAction.php b/src/Controller/UpdatePayPalOrderAction.php index 117e63a6..7048c14b 100644 --- a/src/Controller/UpdatePayPalOrderAction.php +++ b/src/Controller/UpdatePayPalOrderAction.php @@ -20,23 +20,17 @@ final class UpdatePayPalOrderAction { - /** @var PaymentProviderInterface */ - private $paymentProvider; + private PaymentProviderInterface $paymentProvider; - /** @var CacheAuthorizeClientApiInterface */ - private $authorizeClientApi; + private CacheAuthorizeClientApiInterface $authorizeClientApi; - /** @var OrderDetailsApiInterface */ - private $orderDetailsApi; + private OrderDetailsApiInterface $orderDetailsApi; - /** @var UpdateOrderApiInterface */ - private $updateOrderApi; + private UpdateOrderApiInterface $updateOrderApi; - /** @var AddressFactoryInterface */ - private $addressFactory; + private AddressFactoryInterface $addressFactory; - /** @var OrderProcessorInterface */ - private $orderProcessor; + private OrderProcessorInterface $orderProcessor; public function __construct( PaymentProviderInterface $paymentProvider, diff --git a/src/Controller/Webhook/RefundOrderAction.php b/src/Controller/Webhook/RefundOrderAction.php index 231ecd53..440907b5 100644 --- a/src/Controller/Webhook/RefundOrderAction.php +++ b/src/Controller/Webhook/RefundOrderAction.php @@ -19,17 +19,13 @@ final class RefundOrderAction { - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; - /** @var PaymentProviderInterface */ - private $paymentProvider; + private PaymentProviderInterface $paymentProvider; - /** @var ObjectManager */ - private $paymentManager; + private ObjectManager $paymentManager; - /** @var PayPalRefundDataProviderInterface */ - private $payPalRefundDataProvider; + private PayPalRefundDataProviderInterface $payPalRefundDataProvider; public function __construct( FactoryInterface $stateMachineFactory, diff --git a/src/Downloader/SftpPayoutsReportDownloader.php b/src/Downloader/SftpPayoutsReportDownloader.php index acca5735..816634b7 100644 --- a/src/Downloader/SftpPayoutsReportDownloader.php +++ b/src/Downloader/SftpPayoutsReportDownloader.php @@ -21,8 +21,7 @@ final class SftpPayoutsReportDownloader implements PayoutsReportDownloaderInterface { - /** @var SFTP */ - private $sftp; + private SFTP $sftp; public function __construct(SFTP $sftp) { diff --git a/src/Enabler/PayPalPaymentMethodEnabler.php b/src/Enabler/PayPalPaymentMethodEnabler.php index 48a4fe92..e67d88a6 100644 --- a/src/Enabler/PayPalPaymentMethodEnabler.php +++ b/src/Enabler/PayPalPaymentMethodEnabler.php @@ -22,17 +22,13 @@ final class PayPalPaymentMethodEnabler implements PaymentMethodEnablerInterface { - /** @var Client */ - private $client; + private Client $client; - /** @var string */ - private $baseUrl; + private string $baseUrl; - /** @var ObjectManager */ - private $paymentMethodManager; + private ObjectManager $paymentMethodManager; - /** @var SellerWebhookRegistrarInterface */ - private $sellerWebhookRegistrar; + private SellerWebhookRegistrarInterface $sellerWebhookRegistrar; public function __construct( Client $client, diff --git a/src/Entity/PayPalCredentials.php b/src/Entity/PayPalCredentials.php index 858b5daa..7e90db43 100644 --- a/src/Entity/PayPalCredentials.php +++ b/src/Entity/PayPalCredentials.php @@ -23,41 +23,33 @@ class PayPalCredentials implements PayPalCredentialsInterface { /** - * @var string * * @ORM\Id * @ORM\Column(type="string") */ - private $id; + private string $id; /** - * @var PaymentMethodInterface * * @ORM\ManyToOne(targetEntity="Sylius\Component\Core\Model\PaymentMethodInterface") * @ORM\JoinColumn(name="payment_method_id", referencedColumnName="id") */ - private $paymentMethod; + private PaymentMethodInterface $paymentMethod; /** - * @var string - * * @ORM\Column(type="string", name="access_token") */ - private $accessToken; + private string $accessToken; /** - * @var \DateTime - * * @ORM\Column(type="datetime", name="creation_time") */ - private $creationTime; + private \DateTime $creationTime; /** - * @var \DateTime - * * @ORM\Column(type="datetime", name="expiration_time") */ - private $expirationTime; + private \DateTime $expirationTime; public function __construct( string $id, diff --git a/src/Factory/PayPalPaymentMethodNewResourceFactory.php b/src/Factory/PayPalPaymentMethodNewResourceFactory.php index 04a00f29..125645e1 100644 --- a/src/Factory/PayPalPaymentMethodNewResourceFactory.php +++ b/src/Factory/PayPalPaymentMethodNewResourceFactory.php @@ -13,11 +13,9 @@ final class PayPalPaymentMethodNewResourceFactory implements NewResourceFactoryInterface { - /** @var NewResourceFactoryInterface */ - private $newResourceFactory; + private NewResourceFactoryInterface $newResourceFactory; - /** @var OnboardingProcessorInterface */ - private $onboardingProcessor; + private OnboardingProcessorInterface $onboardingProcessor; public function __construct( NewResourceFactoryInterface $newResourceFactory, diff --git a/src/Listener/PayPalPaymentMethodListener.php b/src/Listener/PayPalPaymentMethodListener.php index 6f3b0c9d..f4318a13 100644 --- a/src/Listener/PayPalPaymentMethodListener.php +++ b/src/Listener/PayPalPaymentMethodListener.php @@ -17,17 +17,13 @@ final class PayPalPaymentMethodListener { - /** @var OnboardingInitiatorInterface */ - private $onboardingInitiator; + private OnboardingInitiatorInterface $onboardingInitiator; - /** @var UrlGeneratorInterface */ - private $urlGenerator; + private UrlGeneratorInterface $urlGenerator; - /** @var FlashBagInterface */ - private $flashBag; + private FlashBagInterface $flashBag; - /** @var PayPalPaymentMethodProviderInterface */ - private $payPalPaymentMethodProvider; + private PayPalPaymentMethodProviderInterface $payPalPaymentMethodProvider; public function __construct( OnboardingInitiatorInterface $onboardingInitiator, diff --git a/src/Manager/PaymentStateManager.php b/src/Manager/PaymentStateManager.php index 3a62415b..32d3d3db 100644 --- a/src/Manager/PaymentStateManager.php +++ b/src/Manager/PaymentStateManager.php @@ -14,14 +14,11 @@ final class PaymentStateManager implements PaymentStateManagerInterface { - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; - /** @var ObjectManager */ - private $paymentManager; + private ObjectManager $paymentManager; - /** @var PaymentCompleteProcessorInterface */ - private $paypalPaymentCompleteProcessor; + private PaymentCompleteProcessorInterface $paypalPaymentCompleteProcessor; public function __construct( FactoryInterface $stateMachineFactory, diff --git a/src/Model/Report.php b/src/Model/Report.php index bb384f77..b10d2f0a 100644 --- a/src/Model/Report.php +++ b/src/Model/Report.php @@ -15,11 +15,9 @@ final class Report { - /** @var string */ - private $content; + private string $content; - /** @var string */ - private $fileName; + private string $fileName; public function __construct(string $content, string $fileName) { diff --git a/src/Onboarding/Initiator/OnboardingInitiator.php b/src/Onboarding/Initiator/OnboardingInitiator.php index f8bf261f..348ec3f5 100644 --- a/src/Onboarding/Initiator/OnboardingInitiator.php +++ b/src/Onboarding/Initiator/OnboardingInitiator.php @@ -12,14 +12,11 @@ final class OnboardingInitiator implements OnboardingInitiatorInterface { - /** @var UrlGeneratorInterface */ - private $urlGenerator; + private UrlGeneratorInterface $urlGenerator; - /** @var string */ - private $createPartnerReferralsUrl; + private string $createPartnerReferralsUrl; - /** @var Security */ - private $security; + private Security $security; public function __construct(UrlGeneratorInterface $urlGenerator, Security $security, string $facilitatorUrl) { diff --git a/src/Onboarding/Processor/BasicOnboardingProcessor.php b/src/Onboarding/Processor/BasicOnboardingProcessor.php index a3046186..d2767082 100644 --- a/src/Onboarding/Processor/BasicOnboardingProcessor.php +++ b/src/Onboarding/Processor/BasicOnboardingProcessor.php @@ -15,14 +15,11 @@ final class BasicOnboardingProcessor implements OnboardingProcessorInterface { - /** @var ClientInterface */ - private $httpClient; + private ClientInterface $httpClient; - /** @var SellerWebhookRegistrarInterface */ - private $sellerWebhookRegistrar; + private SellerWebhookRegistrarInterface $sellerWebhookRegistrar; - /** @var string */ - private $url; + private string $url; public function __construct( ClientInterface $httpClient, diff --git a/src/Payum/Action/CaptureAction.php b/src/Payum/Action/CaptureAction.php index 10c2de5a..a0982f71 100644 --- a/src/Payum/Action/CaptureAction.php +++ b/src/Payum/Action/CaptureAction.php @@ -24,14 +24,11 @@ final class CaptureAction implements ActionInterface { - /** @var CacheAuthorizeClientApiInterface */ - private $authorizeClientApi; + private CacheAuthorizeClientApiInterface $authorizeClientApi; - /** @var CreateOrderApiInterface */ - private $createOrderApi; + private CreateOrderApiInterface $createOrderApi; - /** @var UuidProviderInterface */ - private $uuidProvider; + private UuidProviderInterface $uuidProvider; public function __construct( CacheAuthorizeClientApiInterface $authorizeClientApi, diff --git a/src/Payum/Action/CompleteOrderAction.php b/src/Payum/Action/CompleteOrderAction.php index 4f139182..53b3622a 100644 --- a/src/Payum/Action/CompleteOrderAction.php +++ b/src/Payum/Action/CompleteOrderAction.php @@ -31,29 +31,21 @@ final class CompleteOrderAction implements ActionInterface { - /** @var CacheAuthorizeClientApiInterface */ - private $authorizeClientApi; + private CacheAuthorizeClientApiInterface $authorizeClientApi; - /** @var UpdateOrderApiInterface */ - private $updateOrderApi; + private UpdateOrderApiInterface $updateOrderApi; - /** @var CompleteOrderApiInterface */ - private $completeOrderApi; + private CompleteOrderApiInterface $completeOrderApi; - /** @var OrderDetailsApiInterface */ - private $orderDetailsApi; + private OrderDetailsApiInterface $orderDetailsApi; - /** @var PayPalAddressProcessor */ - private $payPalAddressProcessor; + private PayPalAddressProcessor $payPalAddressProcessor; - /** @var PaymentUpdaterInterface */ - private $payPalPaymentUpdater; + private PaymentUpdaterInterface $payPalPaymentUpdater; - /** @var StateResolverInterface */ - private $orderPaymentStateResolver; + private StateResolverInterface $orderPaymentStateResolver; - /** @var PayPalItemDataProviderInterface */ - private $payPalItemsDataProvider; + private PayPalItemDataProviderInterface $payPalItemsDataProvider; public function __construct( CacheAuthorizeClientApiInterface $authorizeClientApi, diff --git a/src/Payum/Request/CompleteOrder.php b/src/Payum/Request/CompleteOrder.php index 90cb03eb..540c1bf3 100644 --- a/src/Payum/Request/CompleteOrder.php +++ b/src/Payum/Request/CompleteOrder.php @@ -8,8 +8,7 @@ class CompleteOrder extends Generic { - /** @var string */ - private $orderId; + private string $orderId; public function __construct($model, string $orderId) { diff --git a/src/Processor/AfterCheckoutOrderPaymentProcessor.php b/src/Processor/AfterCheckoutOrderPaymentProcessor.php index 5395d93e..dec5c990 100644 --- a/src/Processor/AfterCheckoutOrderPaymentProcessor.php +++ b/src/Processor/AfterCheckoutOrderPaymentProcessor.php @@ -12,8 +12,7 @@ final class AfterCheckoutOrderPaymentProcessor implements OrderProcessorInterface { - /** @var OrderProcessorInterface */ - private $baseAfterCheckoutOrderPaymentProcessor; + private OrderProcessorInterface $baseAfterCheckoutOrderPaymentProcessor; public function __construct(OrderProcessorInterface $baseAfterCheckoutOrderPaymentProcessor) { diff --git a/src/Processor/OrderPaymentProcessor.php b/src/Processor/OrderPaymentProcessor.php index 443dbc8c..084e486c 100644 --- a/src/Processor/OrderPaymentProcessor.php +++ b/src/Processor/OrderPaymentProcessor.php @@ -15,11 +15,9 @@ final class OrderPaymentProcessor implements OrderProcessorInterface { - /** @var OrderProcessorInterface */ - private $baseOrderPaymentProcessor; + private OrderProcessorInterface $baseOrderPaymentProcessor; - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; public function __construct( OrderProcessorInterface $baseOrderPaymentProcessor, diff --git a/src/Processor/PayPalAddressProcessor.php b/src/Processor/PayPalAddressProcessor.php index a8569f69..f42d5388 100644 --- a/src/Processor/PayPalAddressProcessor.php +++ b/src/Processor/PayPalAddressProcessor.php @@ -11,8 +11,7 @@ final class PayPalAddressProcessor implements PayPalAddressProcessorInterface { - /** @var ObjectManager */ - private $objectManager; + private ObjectManager $objectManager; public function __construct(ObjectManager $objectManager) { diff --git a/src/Processor/PayPalOrderCompleteProcessor.php b/src/Processor/PayPalOrderCompleteProcessor.php index c177513a..bfebc16d 100644 --- a/src/Processor/PayPalOrderCompleteProcessor.php +++ b/src/Processor/PayPalOrderCompleteProcessor.php @@ -12,8 +12,7 @@ final class PayPalOrderCompleteProcessor { - /** @var PaymentStateManagerInterface */ - private $paymentStateManager; + private PaymentStateManagerInterface $paymentStateManager; public function __construct(PaymentStateManagerInterface $paymentStateManager) { diff --git a/src/Processor/PayPalPaymentCompleteProcessor.php b/src/Processor/PayPalPaymentCompleteProcessor.php index 5c432149..92f18dde 100644 --- a/src/Processor/PayPalPaymentCompleteProcessor.php +++ b/src/Processor/PayPalPaymentCompleteProcessor.php @@ -21,8 +21,7 @@ final class PayPalPaymentCompleteProcessor implements PaymentCompleteProcessorInterface { - /** @var Payum */ - private $payum; + private Payum $payum; public function __construct(Payum $payum) { diff --git a/src/Processor/PayPalPaymentRefundProcessor.php b/src/Processor/PayPalPaymentRefundProcessor.php index 0f11a09f..a4778780 100644 --- a/src/Processor/PayPalPaymentRefundProcessor.php +++ b/src/Processor/PayPalPaymentRefundProcessor.php @@ -27,20 +27,15 @@ final class PayPalPaymentRefundProcessor implements PaymentRefundProcessorInterface { - /** @var CacheAuthorizeClientApiInterface */ - private $authorizeClientApi; + private CacheAuthorizeClientApiInterface $authorizeClientApi; - /** @var OrderDetailsApiInterface */ - private $orderDetailsApi; + private OrderDetailsApiInterface $orderDetailsApi; - /** @var RefundPaymentApiInterface */ - private $refundOrderApi; + private RefundPaymentApiInterface $refundOrderApi; - /** @var PayPalAuthAssertionGeneratorInterface */ - private $payPalAuthAssertionGenerator; + private PayPalAuthAssertionGeneratorInterface $payPalAuthAssertionGenerator; - /** @var RefundReferenceNumberProviderInterface */ - private $refundReferenceNumberProvider; + private RefundReferenceNumberProviderInterface $refundReferenceNumberProvider; public function __construct( CacheAuthorizeClientApiInterface $authorizeClientApi, diff --git a/src/Processor/UiPayPalPaymentRefundProcessor.php b/src/Processor/UiPayPalPaymentRefundProcessor.php index 4457024b..db440d9b 100644 --- a/src/Processor/UiPayPalPaymentRefundProcessor.php +++ b/src/Processor/UiPayPalPaymentRefundProcessor.php @@ -19,8 +19,7 @@ final class UiPayPalPaymentRefundProcessor implements PaymentRefundProcessorInterface { - /** @var PaymentRefundProcessorInterface */ - private $paymentRefundProcessor; + private PaymentRefundProcessorInterface $paymentRefundProcessor; public function __construct(PaymentRefundProcessorInterface $paymentRefundProcessor) { diff --git a/src/Provider/AvailableCountriesProvider.php b/src/Provider/AvailableCountriesProvider.php index 52003ea9..39f8627a 100644 --- a/src/Provider/AvailableCountriesProvider.php +++ b/src/Provider/AvailableCountriesProvider.php @@ -11,11 +11,9 @@ class AvailableCountriesProvider implements AvailableCountriesProviderInterface { - /** @var RepositoryInterface */ - private $countryRepository; + private RepositoryInterface $countryRepository; - /** @var ChannelContextInterface */ - private $channelContext; + private ChannelContextInterface $channelContext; public function __construct(RepositoryInterface $countryRepository, ChannelContextInterface $channelContext) { diff --git a/src/Provider/OrderProvider.php b/src/Provider/OrderProvider.php index eaffda13..c176dc8b 100644 --- a/src/Provider/OrderProvider.php +++ b/src/Provider/OrderProvider.php @@ -10,8 +10,7 @@ final class OrderProvider implements OrderProviderInterface { - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; public function __construct(OrderRepositoryInterface $orderRepository) { diff --git a/src/Provider/PayPalConfigurationProvider.php b/src/Provider/PayPalConfigurationProvider.php index 017f7b93..f37d9801 100644 --- a/src/Provider/PayPalConfigurationProvider.php +++ b/src/Provider/PayPalConfigurationProvider.php @@ -21,8 +21,7 @@ final class PayPalConfigurationProvider implements PayPalConfigurationProviderInterface { - /** @var PaymentMethodRepositoryInterface */ - private $paymentMethodRepository; + private PaymentMethodRepositoryInterface $paymentMethodRepository; public function __construct(PaymentMethodRepositoryInterface $paymentMethodRepository) { diff --git a/src/Provider/PayPalItemDataProvider.php b/src/Provider/PayPalItemDataProvider.php index 643703e6..2edac259 100644 --- a/src/Provider/PayPalItemDataProvider.php +++ b/src/Provider/PayPalItemDataProvider.php @@ -10,8 +10,7 @@ final class PayPalItemDataProvider implements PayPalItemDataProviderInterface { - /** @var OrderItemNonNeutralTaxesProviderInterface */ - private $orderItemNonNeutralTaxesProvider; + private OrderItemNonNeutralTaxesProviderInterface $orderItemNonNeutralTaxesProvider; public function __construct(OrderItemNonNeutralTaxesProviderInterface $orderItemNonNeutralTaxesProvider) { diff --git a/src/Provider/PayPalPaymentMethodProvider.php b/src/Provider/PayPalPaymentMethodProvider.php index e51bf6c4..1d3022b2 100644 --- a/src/Provider/PayPalPaymentMethodProvider.php +++ b/src/Provider/PayPalPaymentMethodProvider.php @@ -11,8 +11,7 @@ final class PayPalPaymentMethodProvider implements PayPalPaymentMethodProviderInterface { - /** @var PaymentMethodRepositoryInterface */ - private $paymentMethodRepository; + private PaymentMethodRepositoryInterface $paymentMethodRepository; public function __construct(PaymentMethodRepositoryInterface $paymentMethodRepository) { diff --git a/src/Provider/PayPalRefundDataProvider.php b/src/Provider/PayPalRefundDataProvider.php index 52e869ce..76074924 100644 --- a/src/Provider/PayPalRefundDataProvider.php +++ b/src/Provider/PayPalRefundDataProvider.php @@ -10,14 +10,11 @@ final class PayPalRefundDataProvider implements PayPalRefundDataProviderInterface { - /** @var CacheAuthorizeClientApiInterface */ - private $authorizeClientApi; + private CacheAuthorizeClientApiInterface $authorizeClientApi; - /** @var PayPalPaymentMethodProviderInterface */ - private $payPalPaymentMethodProvider; + private PayPalPaymentMethodProviderInterface $payPalPaymentMethodProvider; - /** @var GenericApiInterface */ - private $genericApi; + private GenericApiInterface $genericApi; public function __construct( CacheAuthorizeClientApiInterface $authorizeClientApi, diff --git a/src/Provider/PaymentProvider.php b/src/Provider/PaymentProvider.php index 98ec2c90..7dff9802 100644 --- a/src/Provider/PaymentProvider.php +++ b/src/Provider/PaymentProvider.php @@ -19,8 +19,7 @@ final class PaymentProvider implements PaymentProviderInterface { - /** @var PaymentRepositoryInterface */ - private $paymentRepository; + private PaymentRepositoryInterface $paymentRepository; public function __construct(PaymentRepositoryInterface $paymentRepository) { diff --git a/src/Registrar/SellerWebhookRegistrar.php b/src/Registrar/SellerWebhookRegistrar.php index 0a1c8d23..32d13f02 100644 --- a/src/Registrar/SellerWebhookRegistrar.php +++ b/src/Registrar/SellerWebhookRegistrar.php @@ -25,14 +25,11 @@ final class SellerWebhookRegistrar implements SellerWebhookRegistrarInterface { - /** @var AuthorizeClientApiInterface */ - private $authorizeClientApi; + private AuthorizeClientApiInterface $authorizeClientApi; - /** @var UrlGeneratorInterface */ - private $urlGenerator; + private UrlGeneratorInterface $urlGenerator; - /** @var WebhookApiInterface */ - private $webhookApi; + private WebhookApiInterface $webhookApi; public function __construct( AuthorizeClientApiInterface $authorizeClientApi, diff --git a/src/Resolver/CapturePaymentResolver.php b/src/Resolver/CapturePaymentResolver.php index e7eee469..d0006de9 100644 --- a/src/Resolver/CapturePaymentResolver.php +++ b/src/Resolver/CapturePaymentResolver.php @@ -12,8 +12,7 @@ final class CapturePaymentResolver implements CapturePaymentResolverInterface { - /** @var Payum */ - private $payum; + private Payum $payum; public function __construct(Payum $payum) { diff --git a/src/Resolver/CompleteOrderPaymentResolver.php b/src/Resolver/CompleteOrderPaymentResolver.php index 9f4d03f2..c3228eb9 100644 --- a/src/Resolver/CompleteOrderPaymentResolver.php +++ b/src/Resolver/CompleteOrderPaymentResolver.php @@ -12,8 +12,7 @@ final class CompleteOrderPaymentResolver implements CompleteOrderPaymentResolverInterface { - /** @var Payum */ - private $payum; + private Payum $payum; public function __construct(Payum $payum) { diff --git a/src/Resolver/PayPalDefaultPaymentMethodResolver.php b/src/Resolver/PayPalDefaultPaymentMethodResolver.php index 7e89e124..dc7d8efe 100644 --- a/src/Resolver/PayPalDefaultPaymentMethodResolver.php +++ b/src/Resolver/PayPalDefaultPaymentMethodResolver.php @@ -27,11 +27,9 @@ final class PayPalDefaultPaymentMethodResolver implements DefaultPaymentMethodResolverInterface { - /** @var PaymentMethodRepositoryInterface */ - private $paymentMethodRepository; + private PaymentMethodRepositoryInterface $paymentMethodRepository; - /** @var DefaultPaymentMethodResolverInterface */ - private $decoratedDefaultPaymentMethodResolver; + private DefaultPaymentMethodResolverInterface $decoratedDefaultPaymentMethodResolver; public function __construct( DefaultPaymentMethodResolverInterface $decoratedDefaultPaymentMethodResolver, diff --git a/src/Resolver/PayPalPrioritisingPaymentMethodsResolver.php b/src/Resolver/PayPalPrioritisingPaymentMethodsResolver.php index 88a7b136..b5c1b59e 100644 --- a/src/Resolver/PayPalPrioritisingPaymentMethodsResolver.php +++ b/src/Resolver/PayPalPrioritisingPaymentMethodsResolver.php @@ -19,11 +19,9 @@ final class PayPalPrioritisingPaymentMethodsResolver implements PaymentMethodsResolverInterface { - /** @var PaymentMethodsResolverInterface */ - private $decoratedPaymentMethodsResolver; + private PaymentMethodsResolverInterface $decoratedPaymentMethodsResolver; - /** @var string */ - private $firstPaymentMethodFactoryName; + private string $firstPaymentMethodFactoryName; public function __construct(PaymentMethodsResolverInterface $decoratedPaymentMethodsResolver, string $firstPaymentMethodFactoryName) { diff --git a/src/Updater/PayPalPaymentUpdater.php b/src/Updater/PayPalPaymentUpdater.php index 311e9b04..e2a85857 100644 --- a/src/Updater/PayPalPaymentUpdater.php +++ b/src/Updater/PayPalPaymentUpdater.php @@ -18,8 +18,7 @@ final class PayPalPaymentUpdater implements PaymentUpdaterInterface { - /** @var ObjectManager */ - private $paymentManager; + private ObjectManager $paymentManager; public function __construct(ObjectManager $paymentManager) { diff --git a/tests/Behat/Context/Admin/ManagingOrdersContext.php b/tests/Behat/Context/Admin/ManagingOrdersContext.php index 4b1c3764..d31b2821 100644 --- a/tests/Behat/Context/Admin/ManagingOrdersContext.php +++ b/tests/Behat/Context/Admin/ManagingOrdersContext.php @@ -18,20 +18,15 @@ final class ManagingOrdersContext implements Context { - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; - /** @var ObjectManager */ - private $objectManager; + private ObjectManager $objectManager; - /** @var KernelBrowser */ - private $client; + private KernelBrowser $client; - /** @var ShowPageInterface */ - private $showPage; + private ShowPageInterface $showPage; - /** @var int */ - private $refundAmount; + private ?int $refundAmount = null; public function __construct( FactoryInterface $stateMachineFactory, diff --git a/tests/Behat/Context/Admin/ManagingPaymentMethodsContext.php b/tests/Behat/Context/Admin/ManagingPaymentMethodsContext.php index 73bdce83..493e71c5 100644 --- a/tests/Behat/Context/Admin/ManagingPaymentMethodsContext.php +++ b/tests/Behat/Context/Admin/ManagingPaymentMethodsContext.php @@ -16,14 +16,11 @@ final class ManagingPaymentMethodsContext implements Context { - /** @var DownloadPayPalReportElementInterface */ - private $downloadPayPalReportElement; + private DownloadPayPalReportElementInterface $downloadPayPalReportElement; - /** @var NotificationCheckerInterface */ - private $notificationChecker; + private NotificationCheckerInterface $notificationChecker; - /** @var CreatePageInterface */ - private $createPage; + private CreatePageInterface $createPage; public function __construct( DownloadPayPalReportElementInterface $downloadPayPalReportElement, diff --git a/tests/Behat/Context/Setup/PaymentPayPalContext.php b/tests/Behat/Context/Setup/PaymentPayPalContext.php index 52ce364b..3fc96a49 100644 --- a/tests/Behat/Context/Setup/PaymentPayPalContext.php +++ b/tests/Behat/Context/Setup/PaymentPayPalContext.php @@ -24,26 +24,19 @@ final class PaymentPayPalContext implements Context { - /** @var SharedStorageInterface */ - private $sharedStorage; + private SharedStorageInterface $sharedStorage; - /** @var PaymentMethodRepositoryInterface */ - private $paymentMethodRepository; + private PaymentMethodRepositoryInterface $paymentMethodRepository; - /** @var ExampleFactoryInterface */ - private $paymentMethodExampleFactory; + private ExampleFactoryInterface $paymentMethodExampleFactory; - /** @var array */ - private $gatewayFactories; + private array $gatewayFactories; - /** @var TranslatorInterface */ - private $translator; + private TranslatorInterface $translator; - /** @var PayPalSelectPaymentPageInterface */ - private $selectPaymentPage; + private PayPalSelectPaymentPageInterface $selectPaymentPage; - /** @var string */ - private $clientId; + private string $clientId; public function __construct( SharedStorageInterface $sharedStorage,