Use PHP 7.4 syntax

Sylius · Sep 6, 2021 · 79fede9 · 79fede9
1 parent 5a59100
commit 79fede9
Show file tree

Hide file tree

Showing 72 changed files with 238 additions and 428 deletions.
diff --git a/composer.json b/composer.json
@@ -43,9 +43,10 @@
         "matthiasnoback/symfony-config-test": "^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpspec/phpspec": "^7.0",
-        "phpstan/phpstan": "0.12.84",
+        "phpstan/phpstan": "0.12.96",
         "phpstan/phpstan-webmozart-assert": "0.12.12",
         "phpunit/phpunit": "^9.5",
+        "rector/rector": "^0.11.52",
         "sylius-labs/coding-standard": "^4.0",
         "symfony/browser-kit": "^4.4 || ^5.2",
         "symfony/debug-bundle": "^4.4 || ^5.2",

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/Action/Admin/DownloadCreditMemoAction.php b/src/Action/Admin/DownloadCreditMemoAction.php
@@ -20,11 +20,9 @@
 
 final class DownloadCreditMemoAction
 {
-    /** @var CreditMemoPdfFileGeneratorInterface */
-    private $creditMemoPdfFileGenerator;
+    private CreditMemoPdfFileGeneratorInterface $creditMemoPdfFileGenerator;
 
-    /** @var CreditMemoFileResponseBuilderInterface */
-    private $creditMemoFileResponseBuilder;
+    private CreditMemoFileResponseBuilderInterface $creditMemoFileResponseBuilder;
 
     public function __construct(
         CreditMemoPdfFileGeneratorInterface $creditMemoPdfFileGenerator,

diff --git a/src/Action/Admin/OrderRefundsListAction.php b/src/Action/Admin/OrderRefundsListAction.php
@@ -28,23 +28,17 @@
 
 final class OrderRefundsListAction
 {
-    /** @var OrderRepositoryInterface */
-    private $orderRepository;
+    private OrderRepositoryInterface $orderRepository;
 
-    /** @var OrderRefundingAvailabilityCheckerInterface */
-    private $orderRefundsListAvailabilityChecker;
+    private OrderRefundingAvailabilityCheckerInterface $orderRefundsListAvailabilityChecker;
 
-    /** @var RefundPaymentMethodsProviderInterface */
-    private $refundPaymentMethodsProvider;
+    private RefundPaymentMethodsProviderInterface $refundPaymentMethodsProvider;
 
-    /** @var Environment */
-    private $twig;
+    private Environment $twig;
 
-    /** @var Session */
-    private $session;
+    private Session $session;
 
-    /** @var UrlGeneratorInterface */
-    private $router;
+    private UrlGeneratorInterface $router;
 
     public function __construct(
         OrderRepositoryInterface $orderRepository,

diff --git a/src/Action/Admin/RefundUnitsAction.php b/src/Action/Admin/RefundUnitsAction.php
@@ -26,20 +26,15 @@
 
 final class RefundUnitsAction
 {
-    /** @var MessageBusInterface */
-    private $commandBus;
+    private MessageBusInterface $commandBus;
 
-    /** @var Session */
-    private $session;
+    private Session $session;
 
-    /** @var UrlGeneratorInterface */
-    private $router;
+    private UrlGeneratorInterface $router;
 
-    /** @var RefundUnitsCommandCreatorInterface */
-    private $commandCreator;
+    private RefundUnitsCommandCreatorInterface $commandCreator;
 
-    /** @var LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
     public function __construct(
         MessageBusInterface $commandBus,

diff --git a/src/Action/Admin/SendCreditMemoAction.php b/src/Action/Admin/SendCreditMemoAction.php
@@ -25,17 +25,13 @@
 
 final class SendCreditMemoAction
 {
-    /** @var MessageBusInterface */
-    private $commandBus;
+    private MessageBusInterface $commandBus;
 
-    /** @var RepositoryInterface */
-    private $creditMemoRepository;
+    private RepositoryInterface $creditMemoRepository;
 
-    /** @var Session */
-    private $session;
+    private Session $session;
 
-    /** @var UrlGeneratorInterface */
-    private $router;
+    private UrlGeneratorInterface $router;
 
     public function __construct(
         MessageBusInterface $commandBus,

diff --git a/src/Action/CompleteRefundPaymentAction.php b/src/Action/CompleteRefundPaymentAction.php
@@ -26,20 +26,15 @@
 
 final class CompleteRefundPaymentAction
 {
-    /** @var Session */
-    private $session;
+    private Session $session;
 
-    /** @var ObjectRepository */
-    private $refundPaymentRepository;
+    private ObjectRepository $refundPaymentRepository;
 
-    /** @var RefundPaymentCompletedStateApplierInterface */
-    private $refundPaymentCompletedStateApplier;
+    private RefundPaymentCompletedStateApplierInterface $refundPaymentCompletedStateApplier;
 
-    /** @var RouterInterface */
-    private $router;
+    private RouterInterface $router;
 
-    /** @var OrderRepositoryInterface */
-    private $orderRepository;
+    private OrderRepositoryInterface $orderRepository;
 
     public function __construct(
         Session $session,

diff --git a/src/Action/Shop/DownloadCreditMemoAction.php b/src/Action/Shop/DownloadCreditMemoAction.php
@@ -22,14 +22,11 @@
 
 final class DownloadCreditMemoAction
 {
-    /** @var CreditMemoPdfFileGeneratorInterface */
-    private $creditMemoPdfFileGenerator;
+    private CreditMemoPdfFileGeneratorInterface $creditMemoPdfFileGenerator;
 
-    /** @var CreditMemoCustomerRelationCheckerInterface */
-    private $creditMemoCustomerRelationChecker;
+    private CreditMemoCustomerRelationCheckerInterface $creditMemoCustomerRelationChecker;
 
-    /** @var CreditMemoFileResponseBuilderInterface */
-    private $creditMemoFileResponseBuilder;
+    private CreditMemoFileResponseBuilderInterface $creditMemoFileResponseBuilder;
 
     public function __construct(
         CreditMemoPdfFileGeneratorInterface $creditMemoPdfFileGenerator,

diff --git a/src/Calculator/UnitRefundTotalCalculator.php b/src/Calculator/UnitRefundTotalCalculator.php
@@ -18,8 +18,7 @@
 
 final class UnitRefundTotalCalculator implements UnitRefundTotalCalculatorInterface
 {
-    /** @var RemainingTotalProviderInterface */
-    private $remainingTotalProvider;
+    private RemainingTotalProviderInterface $remainingTotalProvider;
 
     public function __construct(RemainingTotalProviderInterface $remainingTotalProvider)
     {

diff --git a/src/Checker/CreditMemoCustomerRelationChecker.php b/src/Checker/CreditMemoCustomerRelationChecker.php
@@ -21,11 +21,9 @@
 
 final class CreditMemoCustomerRelationChecker implements CreditMemoCustomerRelationCheckerInterface
 {
-    /** @var CustomerContextInterface */
-    private $customerContext;
+    private CustomerContextInterface $customerContext;
 
-    /** @var RepositoryInterface */
-    private $creditMemoRepository;
+    private RepositoryInterface $creditMemoRepository;
 
     public function __construct(
         CustomerContextInterface $customerContext,

diff --git a/src/Checker/OrderFullyRefundedTotalChecker.php b/src/Checker/OrderFullyRefundedTotalChecker.php
@@ -18,8 +18,7 @@
 
 final class OrderFullyRefundedTotalChecker implements OrderFullyRefundedTotalCheckerInterface
 {
-    /** @var OrderRefundedTotalProviderInterface */
-    private $orderRefundedTotalProvider;
+    private OrderRefundedTotalProviderInterface $orderRefundedTotalProvider;
 
     public function __construct(OrderRefundedTotalProviderInterface $orderRefundedTotalProvider)
     {

diff --git a/src/Checker/OrderRefundingAvailabilityChecker.php b/src/Checker/OrderRefundingAvailabilityChecker.php
@@ -20,8 +20,7 @@
 
 final class OrderRefundingAvailabilityChecker implements OrderRefundingAvailabilityCheckerInterface
 {
-    /** @var OrderRepositoryInterface */
-    private $orderRepository;
+    private OrderRepositoryInterface $orderRepository;
 
     public function __construct(OrderRepositoryInterface $orderRepository)
     {

diff --git a/src/Checker/OrderRefundsListAvailabilityChecker.php b/src/Checker/OrderRefundsListAvailabilityChecker.php
@@ -20,8 +20,7 @@
 
 final class OrderRefundsListAvailabilityChecker implements OrderRefundingAvailabilityCheckerInterface
 {
-    /** @var OrderRepositoryInterface */
-    private $orderRepository;
+    private OrderRepositoryInterface $orderRepository;
 
     public function __construct(OrderRepositoryInterface $orderRepository)
     {

diff --git a/src/Checker/UnitRefundingAvailabilityChecker.php b/src/Checker/UnitRefundingAvailabilityChecker.php
@@ -18,8 +18,7 @@
 
 final class UnitRefundingAvailabilityChecker implements UnitRefundingAvailabilityCheckerInterface
 {
-    /** @var RemainingTotalProviderInterface */
-    private $remainingTotalProvider;
+    private RemainingTotalProviderInterface $remainingTotalProvider;
 
     public function __construct(RemainingTotalProviderInterface $remainingTotalProvider)
     {

diff --git a/src/Command/GenerateCreditMemo.php b/src/Command/GenerateCreditMemo.php
@@ -19,20 +19,17 @@
 
 class GenerateCreditMemo
 {
-    /** @var string */
-    private $orderNumber;
+    private string $orderNumber;
 
-    /** @var int */
-    private $total;
+    private int $total;
 
     /** @var array|OrderItemUnitRefund[] */
-    private $units;
+    private array $units;
 
     /** @var array|ShipmentRefund[] */
-    private $shipments;
+    private array $shipments;
 
-    /** @var string */
-    private $comment;
+    private string $comment;
 
     public function __construct(string $orderNumber, int $total, array $units, array $shipments, string $comment)
     {

diff --git a/src/Command/RefundUnits.php b/src/Command/RefundUnits.php
@@ -19,20 +19,17 @@
 
 class RefundUnits
 {
-    /** @var string */
-    private $orderNumber;
+    private string $orderNumber;
 
     /** @var array|OrderItemUnitRefund[] */
-    private $units;
+    private array $units;
 
     /** @var array|ShipmentRefund[] */
-    private $shipments;
+    private array $shipments;
 
-    /** @var int */
-    private $paymentMethodId;
+    private int $paymentMethodId;
 
-    /** @var string */
-    private $comment;
+    private string $comment;
 
     public function __construct(string $orderNumber, array $units, array $shipments, int $paymentMethodId, string $comment)
     {

diff --git a/src/Command/SendCreditMemo.php b/src/Command/SendCreditMemo.php
@@ -15,8 +15,7 @@
 
 class SendCreditMemo
 {
-    /** @var string */
-    private $number;
+    private string $number;
 
     public function __construct(string $number)
     {

diff --git a/src/CommandHandler/GenerateCreditMemoHandler.php b/src/CommandHandler/GenerateCreditMemoHandler.php
@@ -23,17 +23,13 @@
 
 final class GenerateCreditMemoHandler
 {
-    /** @var CreditMemoGeneratorInterface */
-    private $creditMemoGenerator;
+    private CreditMemoGeneratorInterface $creditMemoGenerator;
 
-    /** @var ObjectManager */
-    private $creditMemoManager;
+    private ObjectManager $creditMemoManager;
 
-    /** @var MessageBusInterface */
-    private $eventBus;
+    private MessageBusInterface $eventBus;
 
-    /** @var OrderRepositoryInterface */
-    private $orderRepository;
+    private OrderRepositoryInterface $orderRepository;
 
     public function __construct(
         CreditMemoGeneratorInterface $creditMemoGenerator,

diff --git a/src/CommandHandler/RefundUnitsHandler.php b/src/CommandHandler/RefundUnitsHandler.php
@@ -24,20 +24,15 @@
 
 final class RefundUnitsHandler
 {
-    /** @var RefunderInterface */
-    private $orderUnitsRefunder;
+    private RefunderInterface $orderUnitsRefunder;
 
-    /** @var RefunderInterface */
-    private $orderShipmentsRefunder;
+    private RefunderInterface $orderShipmentsRefunder;
 
-    /** @var MessageBusInterface */
-    private $eventBus;
+    private MessageBusInterface $eventBus;
 
-    /** @var OrderRepositoryInterface */
-    private $orderRepository;
+    private OrderRepositoryInterface $orderRepository;
 
-    /** @var RefundUnitsCommandValidatorInterface */
-    private $refundUnitsCommandValidator;
+    private RefundUnitsCommandValidatorInterface $refundUnitsCommandValidator;
 
     public function __construct(
         RefunderInterface $orderUnitsRefunder,

diff --git a/src/CommandHandler/SendCreditMemoHandler.php b/src/CommandHandler/SendCreditMemoHandler.php
@@ -23,11 +23,9 @@
 
 final class SendCreditMemoHandler
 {
-    /** @var RepositoryInterface */
-    private $creditMemoRepository;
+    private RepositoryInterface $creditMemoRepository;
 
-    /** @var CreditMemoEmailSenderInterface */
-    private $creditMemoEmailSender;
+    private CreditMemoEmailSenderInterface $creditMemoEmailSender;
 
     public function __construct(
         RepositoryInterface $creditMemoRepository,

diff --git a/src/Converter/OrderItemUnitLineItemsConverter.php b/src/Converter/OrderItemUnitLineItemsConverter.php
@@ -24,11 +24,9 @@
 
 final class OrderItemUnitLineItemsConverter implements LineItemsConverterInterface
 {
-    /** @var RepositoryInterface */
-    private $orderItemUnitRepository;
+    private RepositoryInterface $orderItemUnitRepository;
 
-    /** @var TaxRateProviderInterface */
-    private $taxRateProvider;
+    private TaxRateProviderInterface $taxRateProvider;
 
     public function __construct(RepositoryInterface $orderItemUnitRepository, TaxRateProviderInterface $taxRateProvider)
     {

diff --git a/src/Converter/RefundUnitsConverter.php b/src/Converter/RefundUnitsConverter.php
@@ -19,8 +19,7 @@
 
 final class RefundUnitsConverter implements RefundUnitsConverterInterface
 {
-    /** @var UnitRefundTotalCalculatorInterface */
-    private $unitRefundTotalCalculator;
+    private UnitRefundTotalCalculatorInterface $unitRefundTotalCalculator;
 
     public function __construct(UnitRefundTotalCalculatorInterface $unitRefundTotalCalculator)
     {

diff --git a/src/Converter/ShipmentLineItemsConverter.php b/src/Converter/ShipmentLineItemsConverter.php
@@ -26,11 +26,9 @@
 
 final class ShipmentLineItemsConverter implements LineItemsConverterInterface
 {
-    /** @var RepositoryInterface */
-    private $adjustmentRepository;
+    private RepositoryInterface $adjustmentRepository;
 
-    /** @var TaxRateProviderInterface */
-    private $taxRateProvider;
+    private TaxRateProviderInterface $taxRateProvider;
 
     public function __construct(RepositoryInterface $adjustmentRepository, TaxRateProviderInterface $taxRateProvider)
     {