From 79fede93e736f4176d305bc0720536b3160eac68 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Mon, 6 Sep 2021 12:31:32 +0200 Subject: [PATCH] Use PHP 7.4 syntax --- composer.json | 3 +- rector.php | 18 +++++++++ src/Action/Admin/DownloadCreditMemoAction.php | 6 +-- src/Action/Admin/OrderRefundsListAction.php | 18 +++------ src/Action/Admin/RefundUnitsAction.php | 15 +++----- src/Action/Admin/SendCreditMemoAction.php | 12 ++---- src/Action/CompleteRefundPaymentAction.php | 15 +++----- src/Action/Shop/DownloadCreditMemoAction.php | 9 ++--- src/Calculator/UnitRefundTotalCalculator.php | 3 +- .../CreditMemoCustomerRelationChecker.php | 6 +-- .../OrderFullyRefundedTotalChecker.php | 3 +- .../OrderRefundingAvailabilityChecker.php | 3 +- .../OrderRefundsListAvailabilityChecker.php | 3 +- .../UnitRefundingAvailabilityChecker.php | 3 +- src/Command/GenerateCreditMemo.php | 13 +++---- src/Command/RefundUnits.php | 13 +++---- src/Command/SendCreditMemo.php | 3 +- .../GenerateCreditMemoHandler.php | 12 ++---- src/CommandHandler/RefundUnitsHandler.php | 15 +++----- src/CommandHandler/SendCreditMemoHandler.php | 6 +-- .../OrderItemUnitLineItemsConverter.php | 6 +-- src/Converter/RefundUnitsConverter.php | 3 +- src/Converter/ShipmentLineItemsConverter.php | 6 +-- src/Creator/RefundCreator.php | 12 ++---- src/Creator/RefundUnitsCommandCreator.php | 3 +- src/Entity/CreditMemo.php | 37 +++++++------------ src/Entity/CreditMemoSequence.php | 9 ++--- src/Entity/CustomerBillingData.php | 27 +++++--------- src/Entity/LineItem.php | 27 +++++--------- src/Entity/Refund.php | 15 +++----- src/Entity/RefundPayment.php | 18 +++------ src/Entity/ShopBillingData.php | 18 +++------ src/Entity/TaxItem.php | 9 ++--- src/Event/CreditMemoGenerated.php | 6 +-- src/Event/RefundPaymentGenerated.php | 18 +++------ src/Event/ShipmentRefunded.php | 9 ++--- src/Event/UnitRefunded.php | 9 ++--- src/Event/UnitsRefunded.php | 19 ++++------ src/Factory/CreditMemoFactory.php | 12 ++---- src/Factory/CustomerBillingDataFactory.php | 3 +- src/Factory/RefundFactory.php | 3 +- src/Factory/RefundPaymentFactory.php | 3 +- src/Factory/RefundTypeFactory.php | 3 +- src/Factory/ShopBillingDataFactory.php | 3 +- src/File/TemporaryFileManager.php | 3 +- src/Generator/CreditMemoGenerator.php | 18 +++------ src/Generator/CreditMemoPdfFileGenerator.php | 18 +++------ .../SequentialCreditMemoNumberGenerator.php | 15 +++----- .../CreditMemoGeneratedEventListener.php | 3 +- .../ShipmentRefundedEventListener.php | 3 +- src/Listener/UnitRefundedEventListener.php | 3 +- src/Menu/OrderShowMenuListener.php | 3 +- src/Model/CreditMemoPdf.php | 6 +-- src/Model/OrderItemUnitRefund.php | 6 +-- src/Model/ShipmentRefund.php | 6 +-- .../CreditMemoProcessManager.php | 3 +- .../RefundPaymentProcessManager.php | 21 ++++------- .../UnitsRefundedProcessManager.php | 2 +- src/Provider/OrderRefundedTotalProvider.php | 3 +- src/Provider/RefundedShipmentFeeProvider.php | 3 +- src/Provider/RemainingTotalProvider.php | 9 ++--- .../SupportedRefundPaymentMethodsProvider.php | 6 +-- src/Provider/UnitRefundedTotalProvider.php | 3 +- src/Refunder/OrderItemUnitsRefunder.php | 6 +-- src/Refunder/OrderShipmentsRefunder.php | 6 +-- src/Sender/CreditMemoEmailSender.php | 9 ++--- .../OrderFullyRefundedStateResolver.php | 12 ++---- .../OrderPartiallyRefundedStateResolver.php | 9 ++--- .../RefundPaymentCompletedStateApplier.php | 6 +-- src/Twig/OrderRefundsExtension.php | 18 +++------ src/Validator/RefundAmountValidator.php | 3 +- src/Validator/RefundUnitsCommandValidator.php | 6 +-- 72 files changed, 238 insertions(+), 428 deletions(-) create mode 100644 rector.php diff --git a/composer.json b/composer.json index 84231e3f..9ea47331 100644 --- 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 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/Action/Admin/DownloadCreditMemoAction.php b/src/Action/Admin/DownloadCreditMemoAction.php index 24c2ee61..662481f5 100644 --- 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 index 11911831..aef528f6 100644 --- 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 index 454fee43..b6bee6ec 100644 --- 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 index d330cbf3..17bde9b0 100644 --- 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 index 268ce861..3b132fb2 100644 --- 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 index 42fc0367..b0638ac1 100644 --- 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 index 45fa15db..62c69f97 100644 --- 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 index df4483cc..58fe9263 100644 --- 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 index da5193ab..6f8236df 100644 --- 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 index af49dc2d..b4e3c34c 100644 --- 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 index fadf09cd..39023a1f 100644 --- 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 index 55447185..0904adfd 100644 --- 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 index b9bbdfbc..46f926fa 100644 --- 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 index e34b1136..ddcaae86 100644 --- 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 index 88128379..4bded9ae 100644 --- 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 index f45acedc..a36ac390 100644 --- 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 index d12045eb..749d605e 100644 --- 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 index b4577d0e..fdfc50dd 100644 --- 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 index 4037caf3..b227027e 100644 --- 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 index ba084c25..9891ee4e 100644 --- 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 index a5fa7bbd..b8501881 100644 --- 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) { diff --git a/src/Creator/RefundCreator.php b/src/Creator/RefundCreator.php index 67d25e7f..1e62ba62 100644 --- a/src/Creator/RefundCreator.php +++ b/src/Creator/RefundCreator.php @@ -24,17 +24,13 @@ final class RefundCreator implements RefundCreatorInterface { - /** @var RefundFactoryInterface */ - private $refundFactory; + private RefundFactoryInterface $refundFactory; - /** @var RemainingTotalProviderInterface */ - private $remainingTotalProvider; + private RemainingTotalProviderInterface $remainingTotalProvider; - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; - /** @var ObjectManager */ - private $refundManager; + private ObjectManager $refundManager; public function __construct( RefundFactoryInterface $refundFactory, diff --git a/src/Creator/RefundUnitsCommandCreator.php b/src/Creator/RefundUnitsCommandCreator.php index 1ae8feea..eb16fe29 100644 --- a/src/Creator/RefundUnitsCommandCreator.php +++ b/src/Creator/RefundUnitsCommandCreator.php @@ -24,8 +24,7 @@ final class RefundUnitsCommandCreator implements RefundUnitsCommandCreatorInterface { - /** @var RefundUnitsConverterInterface */ - private $refundUnitsConverter; + private RefundUnitsConverterInterface $refundUnitsConverter; public function __construct(RefundUnitsConverterInterface $refundUnitsConverter) { diff --git a/src/Entity/CreditMemo.php b/src/Entity/CreditMemo.php index e530979d..021c8e1d 100644 --- a/src/Entity/CreditMemo.php +++ b/src/Entity/CreditMemo.php @@ -20,44 +20,33 @@ class CreditMemo implements CreditMemoInterface { - /** @var string */ - protected $id; + protected ?string $id = null; - /** @var string */ - protected $number; + protected ?string $number = null; - /** @var OrderInterface */ - protected $order; + protected ?OrderInterface $order = null; - /** @var int */ - protected $total; + protected ?int $total = null; - /** @var string */ - protected $currencyCode; + protected ?string $currencyCode = null; - /** @var string */ - protected $localeCode; + protected ?string $localeCode = null; - /** @var ChannelInterface */ - protected $channel; + protected ?ChannelInterface $channel = null; /** @var Collection|LineItemInterface[] */ - protected $lineItems; + protected Collection $lineItems; /** @var Collection|TaxItemInterface[] */ - protected $taxItems; + protected Collection $taxItems; - /** @var string */ - protected $comment; + protected ?string $comment = null; - /** @var \DateTimeImmutable */ - protected $issuedAt; + protected ?\DateTimeImmutable $issuedAt = null; - /** @var CustomerBillingDataInterface */ - protected $from; + protected ?CustomerBillingDataInterface $from = null; - /** @var ShopBillingDataInterface|null */ - protected $to; + protected ?ShopBillingDataInterface $to = null; public function __construct() { diff --git a/src/Entity/CreditMemoSequence.php b/src/Entity/CreditMemoSequence.php index e605d1e6..c26eca52 100644 --- a/src/Entity/CreditMemoSequence.php +++ b/src/Entity/CreditMemoSequence.php @@ -16,14 +16,11 @@ /** @final */ class CreditMemoSequence implements CreditMemoSequenceInterface { - /** @var int|null */ - protected $id; + protected ?int $id = null; - /** @var int */ - protected $index = 0; + protected int $index = 0; - /** @var int */ - protected $version = 1; + protected int $version = 1; public function getId(): ?int { diff --git a/src/Entity/CustomerBillingData.php b/src/Entity/CustomerBillingData.php index 5ef81323..2201c60e 100644 --- a/src/Entity/CustomerBillingData.php +++ b/src/Entity/CustomerBillingData.php @@ -19,32 +19,23 @@ class CustomerBillingData implements CustomerBillingDataInterface /** @var int|null */ protected $id; - /** @var string */ - protected $firstName; + protected ?string $firstName = null; - /** @var string */ - protected $lastName; + protected ?string $lastName = null; - /** @var string */ - protected $street; + protected ?string $street = null; - /** @var string */ - protected $postcode; + protected ?string $postcode = null; - /** @var string */ - protected $countryCode; + protected ?string $countryCode = null; - /** @var string */ - protected $city; + protected ?string $city = null; - /** @var string|null */ - protected $company; + protected ?string $company = null; - /** @var string|null */ - protected $provinceName; + protected ?string $provinceName = null; - /** @var string|null */ - protected $provinceCode; + protected ?string $provinceCode = null; /** @deprecated this function is deprecated and will be removed in v1.0.0. Use CustomerBillingData::getId() instead */ public function id() diff --git a/src/Entity/LineItem.php b/src/Entity/LineItem.php index e1453abd..f156ccc8 100644 --- a/src/Entity/LineItem.php +++ b/src/Entity/LineItem.php @@ -17,32 +17,23 @@ class LineItem implements LineItemInterface { - /** @var int|null */ - protected $id; + protected ?int $id = null; - /** @var string */ - protected $name; + protected string $name; - /** @var int */ - protected $quantity; + protected int $quantity; - /** @var int */ - protected $unitNetPrice; + protected int $unitNetPrice; - /** @var int */ - protected $unitGrossPrice; + protected int $unitGrossPrice; - /** @var int */ - protected $netValue; + protected int $netValue; - /** @var int */ - protected $grossValue; + protected int $grossValue; - /** @var int */ - protected $taxAmount; + protected int $taxAmount; - /** @var string|null */ - protected $taxRate; + protected ?string $taxRate; public function __construct( string $name, diff --git a/src/Entity/Refund.php b/src/Entity/Refund.php index 353be23b..7cd6f15e 100644 --- a/src/Entity/Refund.php +++ b/src/Entity/Refund.php @@ -18,20 +18,15 @@ class Refund implements RefundInterface { - /** @var int|null */ - protected $id; + protected ?int $id = null; - /** @var OrderInterface */ - protected $order; + protected OrderInterface $order; - /** @var int */ - protected $amount; + protected int $amount; - /** @var int */ - protected $refundedUnitId; + protected int $refundedUnitId; - /** @var RefundTypeInterface */ - protected $type; + protected RefundTypeInterface $type; public function __construct(OrderInterface $order, int $amount, int $refundedUnitId, RefundTypeInterface $type) { diff --git a/src/Entity/RefundPayment.php b/src/Entity/RefundPayment.php index c3fbc0b8..a21a92a0 100644 --- a/src/Entity/RefundPayment.php +++ b/src/Entity/RefundPayment.php @@ -18,23 +18,17 @@ class RefundPayment implements RefundPaymentInterface { - /** @var int|null */ - protected $id; + protected ?int $id = null; - /** @var OrderInterface */ - protected $order; + protected OrderInterface $order; - /** @var int */ - protected $amount; + protected int $amount; - /** @var string */ - protected $currencyCode; + protected string $currencyCode; - /** @var string */ - protected $state; + protected string $state; - /** @var PaymentMethodInterface */ - protected $paymentMethod; + protected PaymentMethodInterface $paymentMethod; public function __construct( OrderInterface $order, diff --git a/src/Entity/ShopBillingData.php b/src/Entity/ShopBillingData.php index 66780c10..2b2c3913 100644 --- a/src/Entity/ShopBillingData.php +++ b/src/Entity/ShopBillingData.php @@ -19,23 +19,17 @@ class ShopBillingData implements ShopBillingDataInterface /** @var mixed */ protected $id; - /** @var string|null */ - protected $company; + protected ?string $company = null; - /** @var string|null */ - protected $taxId; + protected ?string $taxId = null; - /** @var string|null */ - protected $countryCode; + protected ?string $countryCode = null; - /** @var string|null */ - protected $street; + protected ?string $street = null; - /** @var string|null */ - protected $city; + protected ?string $city = null; - /** @var string|null */ - protected $postcode; + protected ?string $postcode = null; public function getId() { diff --git a/src/Entity/TaxItem.php b/src/Entity/TaxItem.php index b735c998..8bf09070 100644 --- a/src/Entity/TaxItem.php +++ b/src/Entity/TaxItem.php @@ -15,14 +15,11 @@ class TaxItem implements TaxItemInterface { - /** @var int|null */ - protected $id; + protected ?int $id = null; - /** @var string */ - protected $label; + protected string $label; - /** @var int */ - protected $amount; + protected int $amount; public function __construct(string $label, int $amount) { diff --git a/src/Event/CreditMemoGenerated.php b/src/Event/CreditMemoGenerated.php index 4ec861fe..e9391dbc 100644 --- a/src/Event/CreditMemoGenerated.php +++ b/src/Event/CreditMemoGenerated.php @@ -15,11 +15,9 @@ class CreditMemoGenerated { - /** @var string */ - private $number; + private string $number; - /** @var string */ - private $orderNumber; + private string $orderNumber; public function __construct(string $number, string $orderNumber) { diff --git a/src/Event/RefundPaymentGenerated.php b/src/Event/RefundPaymentGenerated.php index 07ff61cc..828cadb9 100644 --- a/src/Event/RefundPaymentGenerated.php +++ b/src/Event/RefundPaymentGenerated.php @@ -15,23 +15,17 @@ class RefundPaymentGenerated { - /** @var int */ - private $id; + private int $id; - /** @var string */ - private $orderNumber; + private string $orderNumber; - /** @var int */ - private $amount; + private int $amount; - /** @var string */ - private $currencyCode; + private string $currencyCode; - /** @var int */ - private $paymentMethodId; + private int $paymentMethodId; - /** @var int */ - private $paymentId; + private int $paymentId; public function __construct( int $id, diff --git a/src/Event/ShipmentRefunded.php b/src/Event/ShipmentRefunded.php index 39bb0dbb..fadcb986 100644 --- a/src/Event/ShipmentRefunded.php +++ b/src/Event/ShipmentRefunded.php @@ -15,14 +15,11 @@ class ShipmentRefunded { - /** @var string */ - private $orderNumber; + private string $orderNumber; - /** @var int */ - private $shipmentUnitId; + private int $shipmentUnitId; - /** @var int */ - private $amount; + private int $amount; public function __construct(string $orderNumber, int $shipmentUnitId, int $amount) { diff --git a/src/Event/UnitRefunded.php b/src/Event/UnitRefunded.php index f730179c..1cff86ff 100644 --- a/src/Event/UnitRefunded.php +++ b/src/Event/UnitRefunded.php @@ -15,14 +15,11 @@ class UnitRefunded { - /** @var string */ - private $orderNumber; + private string $orderNumber; - /** @var int */ - private $unitId; + private int $unitId; - /** @var int */ - private $amount; + private int $amount; public function __construct(string $orderNumber, int $unitId, int $amount) { diff --git a/src/Event/UnitsRefunded.php b/src/Event/UnitsRefunded.php index 1bfff049..fdd5d4c7 100644 --- a/src/Event/UnitsRefunded.php +++ b/src/Event/UnitsRefunded.php @@ -19,26 +19,21 @@ class UnitsRefunded { - /** @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 int */ - private $amount; + private int $amount; - /** @var string */ - private $currencyCode; + private string $currencyCode; - /** @var string */ - private $comment; + private string $comment; public function __construct( string $orderNumber, diff --git a/src/Factory/CreditMemoFactory.php b/src/Factory/CreditMemoFactory.php index 681a2742..2fb575df 100644 --- a/src/Factory/CreditMemoFactory.php +++ b/src/Factory/CreditMemoFactory.php @@ -27,17 +27,13 @@ final class CreditMemoFactory implements CreditMemoFactoryInterface { - /** @var FactoryInterface */ - private $creditMemoFactory; + private FactoryInterface $creditMemoFactory; - /** @var CreditMemoIdentifierGeneratorInterface */ - private $creditMemoIdentifierGenerator; + private CreditMemoIdentifierGeneratorInterface $creditMemoIdentifierGenerator; - /** @var CreditMemoNumberGeneratorInterface */ - private $creditMemoNumberGenerator; + private CreditMemoNumberGeneratorInterface $creditMemoNumberGenerator; - /** @var CurrentDateTimeImmutableProviderInterface */ - private $currentDateTimeImmutableProvider; + private CurrentDateTimeImmutableProviderInterface $currentDateTimeImmutableProvider; public function __construct( FactoryInterface $creditMemoFactory, diff --git a/src/Factory/CustomerBillingDataFactory.php b/src/Factory/CustomerBillingDataFactory.php index f3965c50..1c1ceeee 100644 --- a/src/Factory/CustomerBillingDataFactory.php +++ b/src/Factory/CustomerBillingDataFactory.php @@ -20,8 +20,7 @@ class CustomerBillingDataFactory implements CustomerBillingDataFactoryInterface { - /** @var FactoryInterface */ - private $customerBillingDataFactory; + private FactoryInterface $customerBillingDataFactory; public function __construct(FactoryInterface $customerBillingDataFactory) { diff --git a/src/Factory/RefundFactory.php b/src/Factory/RefundFactory.php index 7ddcd84d..195c5cfc 100644 --- a/src/Factory/RefundFactory.php +++ b/src/Factory/RefundFactory.php @@ -19,8 +19,7 @@ final class RefundFactory implements RefundFactoryInterface { - /** @var string */ - private $className; + private string $className; public function __construct(string $className) { diff --git a/src/Factory/RefundPaymentFactory.php b/src/Factory/RefundPaymentFactory.php index 64ba3464..2454e514 100644 --- a/src/Factory/RefundPaymentFactory.php +++ b/src/Factory/RefundPaymentFactory.php @@ -19,8 +19,7 @@ final class RefundPaymentFactory implements RefundPaymentFactoryInterface { - /** @var string */ - private $className; + private string $className; public function __construct(string $className) { diff --git a/src/Factory/RefundTypeFactory.php b/src/Factory/RefundTypeFactory.php index b76ff990..c961dec2 100644 --- a/src/Factory/RefundTypeFactory.php +++ b/src/Factory/RefundTypeFactory.php @@ -17,8 +17,7 @@ final class RefundTypeFactory implements RefundTypeFactoryInterface { - /** @var string */ - public $className; + public string $className; public function __construct(string $className) { diff --git a/src/Factory/ShopBillingDataFactory.php b/src/Factory/ShopBillingDataFactory.php index 9cee2db8..c14fc3f8 100644 --- a/src/Factory/ShopBillingDataFactory.php +++ b/src/Factory/ShopBillingDataFactory.php @@ -18,8 +18,7 @@ final class ShopBillingDataFactory implements ShopBillingDataFactoryInterface { - /** @var FactoryInterface */ - private $shopBillingDataFactory; + private FactoryInterface $shopBillingDataFactory; public function __construct(FactoryInterface $shopBillingDataFactory) { diff --git a/src/File/TemporaryFileManager.php b/src/File/TemporaryFileManager.php index aabe7a35..a8d21bca 100644 --- a/src/File/TemporaryFileManager.php +++ b/src/File/TemporaryFileManager.php @@ -15,8 +15,7 @@ final class TemporaryFileManager implements FileManagerInterface { - /** @var string */ - private $baseDirectory; + private string $baseDirectory; public function __construct() { diff --git a/src/Generator/CreditMemoGenerator.php b/src/Generator/CreditMemoGenerator.php index 75539eb8..b5034503 100644 --- a/src/Generator/CreditMemoGenerator.php +++ b/src/Generator/CreditMemoGenerator.php @@ -30,23 +30,17 @@ final class CreditMemoGenerator implements CreditMemoGeneratorInterface { - /** @var LineItemsConverterInterface */ - private $lineItemsConverter; + private LineItemsConverterInterface $lineItemsConverter; - /** @var LineItemsConverterInterface */ - private $shipmentLineItemsConverter; + private LineItemsConverterInterface $shipmentLineItemsConverter; - /** @var TaxItemsGeneratorInterface */ - private $taxItemsGenerator; + private TaxItemsGeneratorInterface $taxItemsGenerator; - /** @var CreditMemoFactoryInterface */ - private $creditMemoFactory; + private CreditMemoFactoryInterface $creditMemoFactory; - /** @var CustomerBillingDataFactoryInterface */ - private $customerBillingDataFactory; + private CustomerBillingDataFactoryInterface $customerBillingDataFactory; - /** @var ShopBillingDataFactoryInterface */ - private $shopBillingDataFactory; + private ShopBillingDataFactoryInterface $shopBillingDataFactory; public function __construct( LineItemsConverterInterface $lineItemsConverter, diff --git a/src/Generator/CreditMemoPdfFileGenerator.php b/src/Generator/CreditMemoPdfFileGenerator.php index 6f43cdaf..5400c305 100644 --- a/src/Generator/CreditMemoPdfFileGenerator.php +++ b/src/Generator/CreditMemoPdfFileGenerator.php @@ -25,23 +25,17 @@ final class CreditMemoPdfFileGenerator implements CreditMemoPdfFileGeneratorInte { private const FILE_EXTENSION = '.pdf'; - /** @var RepositoryInterface */ - private $creditMemoRepository; + private RepositoryInterface $creditMemoRepository; - /** @var Environment */ - private $twig; + private Environment $twig; - /** @var GeneratorInterface */ - private $pdfGenerator; + private GeneratorInterface $pdfGenerator; - /** @var FileLocatorInterface */ - private $fileLocator; + private FileLocatorInterface $fileLocator; - /** @var string */ - private $template; + private string $template; - /** @var string */ - private $creditMemoLogoPath; + private string $creditMemoLogoPath; public function __construct( RepositoryInterface $creditMemoRepository, diff --git a/src/Generator/SequentialCreditMemoNumberGenerator.php b/src/Generator/SequentialCreditMemoNumberGenerator.php index 5f98eef5..a56574d7 100644 --- a/src/Generator/SequentialCreditMemoNumberGenerator.php +++ b/src/Generator/SequentialCreditMemoNumberGenerator.php @@ -22,20 +22,15 @@ final class SequentialCreditMemoNumberGenerator implements CreditMemoNumberGeneratorInterface { - /** @var ObjectRepository */ - private $sequenceRepository; + private ObjectRepository $sequenceRepository; - /** @var CreditMemoSequenceFactoryInterface */ - private $sequenceFactory; + private CreditMemoSequenceFactoryInterface $sequenceFactory; - /** @var EntityManagerInterface */ - private $sequenceManager; + private EntityManagerInterface $sequenceManager; - /** @var int */ - private $startNumber; + private int $startNumber; - /** @var int */ - private $numberLength; + private int $numberLength; public function __construct( ObjectRepository $sequenceRepository, diff --git a/src/Listener/CreditMemoGeneratedEventListener.php b/src/Listener/CreditMemoGeneratedEventListener.php index 1036ecf7..88c61943 100644 --- a/src/Listener/CreditMemoGeneratedEventListener.php +++ b/src/Listener/CreditMemoGeneratedEventListener.php @@ -19,8 +19,7 @@ final class CreditMemoGeneratedEventListener { - /** @var MessageBusInterface */ - private $commandBus; + private MessageBusInterface $commandBus; public function __construct(MessageBusInterface $commandBus) { diff --git a/src/Listener/ShipmentRefundedEventListener.php b/src/Listener/ShipmentRefundedEventListener.php index 8c34c14b..36258de8 100644 --- a/src/Listener/ShipmentRefundedEventListener.php +++ b/src/Listener/ShipmentRefundedEventListener.php @@ -18,8 +18,7 @@ final class ShipmentRefundedEventListener { - /** @var OrderPartiallyRefundedStateResolverInterface */ - private $orderPartiallyRefundedStateResolver; + private OrderPartiallyRefundedStateResolverInterface $orderPartiallyRefundedStateResolver; public function __construct(OrderPartiallyRefundedStateResolverInterface $orderPartiallyRefundedStateResolver) { diff --git a/src/Listener/UnitRefundedEventListener.php b/src/Listener/UnitRefundedEventListener.php index 150aecbc..10d13000 100644 --- a/src/Listener/UnitRefundedEventListener.php +++ b/src/Listener/UnitRefundedEventListener.php @@ -18,8 +18,7 @@ final class UnitRefundedEventListener { - /** @var OrderPartiallyRefundedStateResolverInterface */ - private $orderPartiallyRefundedStateResolver; + private OrderPartiallyRefundedStateResolverInterface $orderPartiallyRefundedStateResolver; public function __construct(OrderPartiallyRefundedStateResolverInterface $orderPartiallyRefundedStateResolver) { diff --git a/src/Menu/OrderShowMenuListener.php b/src/Menu/OrderShowMenuListener.php index af8840cb..6d628af8 100644 --- a/src/Menu/OrderShowMenuListener.php +++ b/src/Menu/OrderShowMenuListener.php @@ -19,8 +19,7 @@ final class OrderShowMenuListener { - /** @var OrderRefundingAvailabilityCheckerInterface */ - private $orderRefundsListAvailabilityChecker; + private OrderRefundingAvailabilityCheckerInterface $orderRefundsListAvailabilityChecker; public function __construct(OrderRefundingAvailabilityCheckerInterface $orderRefundsListAvailabilityChecker) { diff --git a/src/Model/CreditMemoPdf.php b/src/Model/CreditMemoPdf.php index 1debad68..62e42be0 100644 --- a/src/Model/CreditMemoPdf.php +++ b/src/Model/CreditMemoPdf.php @@ -15,11 +15,9 @@ final class CreditMemoPdf { - /** @var string */ - private $filename; + private string $filename; - /** @var string */ - private $content; + private string $content; public function __construct(string $filename, string $content) { diff --git a/src/Model/OrderItemUnitRefund.php b/src/Model/OrderItemUnitRefund.php index 89e6a717..ef6b6168 100644 --- a/src/Model/OrderItemUnitRefund.php +++ b/src/Model/OrderItemUnitRefund.php @@ -15,11 +15,9 @@ final class OrderItemUnitRefund implements UnitRefundInterface { - /** @var int */ - private $unitId; + private int $unitId; - /** @var int */ - private $total; + private int $total; public function __construct(int $unitId, int $total) { diff --git a/src/Model/ShipmentRefund.php b/src/Model/ShipmentRefund.php index 298f9264..53fbac94 100644 --- a/src/Model/ShipmentRefund.php +++ b/src/Model/ShipmentRefund.php @@ -15,11 +15,9 @@ final class ShipmentRefund implements UnitRefundInterface { - /** @var int */ - private $shipmentId; + private int $shipmentId; - /** @var int */ - private $total; + private int $total; public function __construct(int $shipmentId, int $total) { diff --git a/src/ProcessManager/CreditMemoProcessManager.php b/src/ProcessManager/CreditMemoProcessManager.php index a6bb67d4..c4b33eef 100644 --- a/src/ProcessManager/CreditMemoProcessManager.php +++ b/src/ProcessManager/CreditMemoProcessManager.php @@ -19,8 +19,7 @@ final class CreditMemoProcessManager implements UnitsRefundedProcessStepInterface { - /** @var MessageBusInterface */ - private $commandBus; + private MessageBusInterface $commandBus; public function __construct(MessageBusInterface $commandBus) { diff --git a/src/ProcessManager/RefundPaymentProcessManager.php b/src/ProcessManager/RefundPaymentProcessManager.php index 1d794648..6c1fcfda 100644 --- a/src/ProcessManager/RefundPaymentProcessManager.php +++ b/src/ProcessManager/RefundPaymentProcessManager.php @@ -29,26 +29,19 @@ final class RefundPaymentProcessManager implements UnitsRefundedProcessStepInterface { - /** @var OrderFullyRefundedStateResolverInterface */ - private $orderFullyRefundedStateResolver; + private OrderFullyRefundedStateResolverInterface $orderFullyRefundedStateResolver; - /** @var RelatedPaymentIdProviderInterface */ - private $relatedPaymentIdProvider; + private RelatedPaymentIdProviderInterface $relatedPaymentIdProvider; - /** @var RefundPaymentFactoryInterface */ - private $refundPaymentFactory; + private RefundPaymentFactoryInterface $refundPaymentFactory; - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; - /** @var PaymentMethodRepositoryInterface */ - private $paymentMethodRepository; + private PaymentMethodRepositoryInterface $paymentMethodRepository; - /** @var EntityManagerInterface */ - private $entityManager; + private EntityManagerInterface $entityManager; - /** @var MessageBusInterface */ - private $eventBus; + private MessageBusInterface $eventBus; public function __construct( OrderFullyRefundedStateResolverInterface $orderFullyRefundedStateResolver, diff --git a/src/ProcessManager/UnitsRefundedProcessManager.php b/src/ProcessManager/UnitsRefundedProcessManager.php index 38bbd9e3..2a63a4ac 100644 --- a/src/ProcessManager/UnitsRefundedProcessManager.php +++ b/src/ProcessManager/UnitsRefundedProcessManager.php @@ -18,7 +18,7 @@ final class UnitsRefundedProcessManager implements UnitsRefundedProcessManagerInterface { /** @var iterable|UnitsRefundedProcessStepInterface[] */ - private $steps; + private iterable $steps; public function __construct(iterable $steps) { diff --git a/src/Provider/OrderRefundedTotalProvider.php b/src/Provider/OrderRefundedTotalProvider.php index 712b1524..88e7ac08 100644 --- a/src/Provider/OrderRefundedTotalProvider.php +++ b/src/Provider/OrderRefundedTotalProvider.php @@ -19,8 +19,7 @@ final class OrderRefundedTotalProvider implements OrderRefundedTotalProviderInterface { - /** @var RepositoryInterface */ - private $refundRepository; + private RepositoryInterface $refundRepository; public function __construct(RepositoryInterface $refundRepository) { diff --git a/src/Provider/RefundedShipmentFeeProvider.php b/src/Provider/RefundedShipmentFeeProvider.php index d9dc0549..f5ca2f07 100644 --- a/src/Provider/RefundedShipmentFeeProvider.php +++ b/src/Provider/RefundedShipmentFeeProvider.php @@ -19,8 +19,7 @@ final class RefundedShipmentFeeProvider implements RefundedShipmentFeeProviderInterface { - /** @var RepositoryInterface */ - private $adjustmentRepository; + private RepositoryInterface $adjustmentRepository; public function __construct(RepositoryInterface $adjustmentRepository) { diff --git a/src/Provider/RemainingTotalProvider.php b/src/Provider/RemainingTotalProvider.php index dc3ade07..69e22b2e 100644 --- a/src/Provider/RemainingTotalProvider.php +++ b/src/Provider/RemainingTotalProvider.php @@ -23,14 +23,11 @@ final class RemainingTotalProvider implements RemainingTotalProviderInterface { - /** @var RepositoryInterface */ - private $orderItemUnitRepository; + private RepositoryInterface $orderItemUnitRepository; - /** @var RepositoryInterface */ - private $adjustmentRepository; + private RepositoryInterface $adjustmentRepository; - /** @var RepositoryInterface */ - private $refundRepository; + private RepositoryInterface $refundRepository; public function __construct( RepositoryInterface $orderItemUnitRepository, diff --git a/src/Provider/SupportedRefundPaymentMethodsProvider.php b/src/Provider/SupportedRefundPaymentMethodsProvider.php index 24337e83..fbf32548 100644 --- a/src/Provider/SupportedRefundPaymentMethodsProvider.php +++ b/src/Provider/SupportedRefundPaymentMethodsProvider.php @@ -20,11 +20,9 @@ final class SupportedRefundPaymentMethodsProvider implements RefundPaymentMethodsProviderInterface { - /** @var PaymentMethodRepositoryInterface */ - private $paymentMethodRepository; + private PaymentMethodRepositoryInterface $paymentMethodRepository; - /** @var array|string[] */ - private $supportedGateways; + private array $supportedGateways; public function __construct(PaymentMethodRepositoryInterface $paymentMethodRepository, array $supportedGateways) { diff --git a/src/Provider/UnitRefundedTotalProvider.php b/src/Provider/UnitRefundedTotalProvider.php index 6e884880..c415219e 100644 --- a/src/Provider/UnitRefundedTotalProvider.php +++ b/src/Provider/UnitRefundedTotalProvider.php @@ -19,8 +19,7 @@ final class UnitRefundedTotalProvider implements UnitRefundedTotalProviderInterface { - /** @var RepositoryInterface */ - private $refundRepository; + private RepositoryInterface $refundRepository; public function __construct(RepositoryInterface $refundRepository) { diff --git a/src/Refunder/OrderItemUnitsRefunder.php b/src/Refunder/OrderItemUnitsRefunder.php index 59984bb0..187a0a0d 100644 --- a/src/Refunder/OrderItemUnitsRefunder.php +++ b/src/Refunder/OrderItemUnitsRefunder.php @@ -21,11 +21,9 @@ final class OrderItemUnitsRefunder implements RefunderInterface { - /** @var RefundCreatorInterface */ - private $refundCreator; + private RefundCreatorInterface $refundCreator; - /** @var MessageBusInterface */ - private $eventBus; + private MessageBusInterface $eventBus; public function __construct( RefundCreatorInterface $refundCreator, diff --git a/src/Refunder/OrderShipmentsRefunder.php b/src/Refunder/OrderShipmentsRefunder.php index 8c5821f1..7d9d0baa 100644 --- a/src/Refunder/OrderShipmentsRefunder.php +++ b/src/Refunder/OrderShipmentsRefunder.php @@ -21,11 +21,9 @@ final class OrderShipmentsRefunder implements RefunderInterface { - /** @var RefundCreatorInterface */ - private $refundCreator; + private RefundCreatorInterface $refundCreator; - /** @var MessageBusInterface */ - private $eventBus; + private MessageBusInterface $eventBus; public function __construct(RefundCreatorInterface $refundCreator, MessageBusInterface $eventBus) { diff --git a/src/Sender/CreditMemoEmailSender.php b/src/Sender/CreditMemoEmailSender.php index 8f660a75..c8db3008 100644 --- a/src/Sender/CreditMemoEmailSender.php +++ b/src/Sender/CreditMemoEmailSender.php @@ -22,14 +22,11 @@ final class CreditMemoEmailSender implements CreditMemoEmailSenderInterface { private const UNITS_REFUNDED = 'units_refunded'; - /** @var CreditMemoPdfFileGeneratorInterface */ - private $creditMemoPdfFileGenerator; + private CreditMemoPdfFileGeneratorInterface $creditMemoPdfFileGenerator; - /** @var SenderInterface */ - private $sender; + private SenderInterface $sender; - /** @var FileManagerInterface */ - private $fileManager; + private FileManagerInterface $fileManager; public function __construct( CreditMemoPdfFileGeneratorInterface $creditMemoPdfFileGenerator, diff --git a/src/StateResolver/OrderFullyRefundedStateResolver.php b/src/StateResolver/OrderFullyRefundedStateResolver.php index 3cb3e4d1..11ebb844 100644 --- a/src/StateResolver/OrderFullyRefundedStateResolver.php +++ b/src/StateResolver/OrderFullyRefundedStateResolver.php @@ -24,17 +24,13 @@ final class OrderFullyRefundedStateResolver implements OrderFullyRefundedStateResolverInterface { - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; - /** @var ObjectManager */ - private $orderManager; + private ObjectManager $orderManager; - /** @var OrderFullyRefundedTotalCheckerInterface */ - private $orderFullyRefundedTotalChecker; + private OrderFullyRefundedTotalCheckerInterface $orderFullyRefundedTotalChecker; - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; public function __construct( FactoryInterface $stateMachineFactory, diff --git a/src/StateResolver/OrderPartiallyRefundedStateResolver.php b/src/StateResolver/OrderPartiallyRefundedStateResolver.php index 98a4d85a..d203f8c1 100644 --- a/src/StateResolver/OrderPartiallyRefundedStateResolver.php +++ b/src/StateResolver/OrderPartiallyRefundedStateResolver.php @@ -23,14 +23,11 @@ final class OrderPartiallyRefundedStateResolver implements OrderPartiallyRefundedStateResolverInterface { - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; - /** @var FactoryInterface */ - private $stateMachineFactory; + private FactoryInterface $stateMachineFactory; - /** @var ObjectManager */ - private $orderManager; + private ObjectManager $orderManager; public function __construct( OrderRepositoryInterface $orderRepository, diff --git a/src/StateResolver/RefundPaymentCompletedStateApplier.php b/src/StateResolver/RefundPaymentCompletedStateApplier.php index 15383c59..99c9cda0 100644 --- a/src/StateResolver/RefundPaymentCompletedStateApplier.php +++ b/src/StateResolver/RefundPaymentCompletedStateApplier.php @@ -19,11 +19,9 @@ final class RefundPaymentCompletedStateApplier implements RefundPaymentCompletedStateApplierInterface { - /** @var StateMachineFactoryInterface */ - private $stateMachineFactory; + private StateMachineFactoryInterface $stateMachineFactory; - /** @var ObjectManager */ - private $refundPaymentManager; + private ObjectManager $refundPaymentManager; public function __construct(StateMachineFactoryInterface $stateMachineFactory, ObjectManager $refundPaymentManager) { diff --git a/src/Twig/OrderRefundsExtension.php b/src/Twig/OrderRefundsExtension.php index 932f16e6..62e2d7d4 100644 --- a/src/Twig/OrderRefundsExtension.php +++ b/src/Twig/OrderRefundsExtension.php @@ -25,23 +25,17 @@ final class OrderRefundsExtension extends AbstractExtension { - /** @var OrderRefundedTotalProviderInterface */ - private $orderRefundedTotalProvider; + private OrderRefundedTotalProviderInterface $orderRefundedTotalProvider; - /** @var UnitRefundedTotalProviderInterface */ - private $unitRefundedTotalProvider; + private UnitRefundedTotalProviderInterface $unitRefundedTotalProvider; - /** @var UnitRefundingAvailabilityCheckerInterface */ - private $unitRefundingAvailabilityChecker; + private UnitRefundingAvailabilityCheckerInterface $unitRefundingAvailabilityChecker; - /** @var OrderRepositoryInterface */ - private $orderRepository; + private OrderRepositoryInterface $orderRepository; - /** @var RepositoryInterface */ - private $refundPaymentRepository; + private RepositoryInterface $refundPaymentRepository; - /** @var RefundTypeFactoryInterface */ - private $refundTypeFactory; + private RefundTypeFactoryInterface $refundTypeFactory; public function __construct( OrderRefundedTotalProviderInterface $orderRefundedTotalProvider, diff --git a/src/Validator/RefundAmountValidator.php b/src/Validator/RefundAmountValidator.php index f793c22f..c60c7ef2 100644 --- a/src/Validator/RefundAmountValidator.php +++ b/src/Validator/RefundAmountValidator.php @@ -21,8 +21,7 @@ final class RefundAmountValidator implements RefundAmountValidatorInterface { - /** @var RemainingTotalProviderInterface */ - private $remainingTotalProvider; + private RemainingTotalProviderInterface $remainingTotalProvider; public function __construct(RemainingTotalProviderInterface $unitRefundedTotalProvider) { diff --git a/src/Validator/RefundUnitsCommandValidator.php b/src/Validator/RefundUnitsCommandValidator.php index 9375f3c9..ea759633 100644 --- a/src/Validator/RefundUnitsCommandValidator.php +++ b/src/Validator/RefundUnitsCommandValidator.php @@ -20,11 +20,9 @@ final class RefundUnitsCommandValidator implements RefundUnitsCommandValidatorInterface { - /** @var OrderRefundingAvailabilityCheckerInterface */ - private $orderRefundingAvailabilityChecker; + private OrderRefundingAvailabilityCheckerInterface $orderRefundingAvailabilityChecker; - /** @var RefundAmountValidatorInterface */ - private $refundAmountValidator; + private RefundAmountValidatorInterface $refundAmountValidator; public function __construct( OrderRefundingAvailabilityCheckerInterface $orderRefundingAvailabilityChecker,