NEXT-25051 - Run rector Core

phpstan.neon.dist

@@ -8,7 +8,7 @@ parameters:
     treatPhpDocTypesAsCertain: false
     checkMissingIterableValueType: true
     inferPrivatePropertyTypeFromConstructor: true
-    reportUnmatchedIgnoredErrors: true # Could be set to false if necessary during PHPStan update
+    reportUnmatchedIgnoredErrors: false # Could be set to false if necessary during PHPStan update
     tmpDir: var/cache/phpstan
     paths:
         - src

src/Core/Checkout/Cart/Address/AddressValidator.php

@@ -21,8 +21,6 @@
  */
 class AddressValidator implements CartValidatorInterface, ResetInterface
 {
-    private EntityRepository $repository;
-
     /**
      * @var array<string, bool>
      */
@@ -31,9 +29,8 @@ class AddressValidator implements CartValidatorInterface, ResetInterface
     /**
      * @internal
      */
-    public function __construct(EntityRepository $repository)
+    public function __construct(private readonly EntityRepository $repository)
     {
-        $this->repository = $repository;
     }
 
     public function validate(Cart $cart, ErrorCollection $errors, SalesChannelContext $context): void

src/Core/Checkout/Cart/Address/Error/AddressValidationError.php

@@ -17,20 +17,8 @@ class AddressValidationError extends Error
 {
     private const KEY = 'address-invalid';
 
-    /**
-     * @var bool
-     */
-    private $isBillingAddress;
-
-    /**
-     * @var ConstraintViolationList
-     */
-    private $violations;
-
-    public function __construct(bool $isBillingAddress, ConstraintViolationList $violations)
+    public function __construct(private readonly bool $isBillingAddress, private readonly ConstraintViolationList $violations)
     {
-        $this->isBillingAddress = $isBillingAddress;
-        $this->violations = $violations;
         $this->message = sprintf(
             'Please check your %s address for missing or invalid values.',
             $isBillingAddress ? 'billing' : 'shipping'

src/Core/Checkout/Cart/Address/Error/BillingAddressBlockedError.php

@@ -11,15 +11,8 @@ class BillingAddressBlockedError extends Error
 {
     private const KEY = 'billing-address-blocked';
 
-    /**
-     * @var string
-     */
-    private $name;
-
-    public function __construct(string $name)
+    public function __construct(private readonly string $name)
     {
-        $this->name = $name;
-
         $this->message = sprintf(
             'Billings to billing address %s are not possible.',
             $name

src/Core/Checkout/Cart/Address/Error/ShippingAddressBlockedError.php

@@ -11,15 +11,8 @@ class ShippingAddressBlockedError extends Error
 {
     private const KEY = 'shipping-address-blocked';
 
-    /**
-     * @var string
-     */
-    private $name;
-
-    public function __construct(string $name)
+    public function __construct(private readonly string $name)
     {
-        $this->name = $name;
-
         $this->message = sprintf(
             'Shippings to shipping address %s are not possible.',
             $name

src/Core/Checkout/Cart/ApiOrderCartService.php

@@ -14,17 +14,11 @@
  */
 class ApiOrderCartService
 {
-    protected CartService $cartService;
-
-    protected SalesChannelContextPersister $contextPersister;
-
     /**
      * @internal
      */
-    public function __construct(CartService $cartService, SalesChannelContextPersister $contextPersister)
+    public function __construct(protected CartService $cartService, protected SalesChannelContextPersister $contextPersister)
     {
-        $this->cartService = $cartService;
-        $this->contextPersister = $contextPersister;
     }
 
     public function updateShippingCosts(CalculatedPrice $calculatedPrice, SalesChannelContext $context): Cart

src/Core/Checkout/Cart/CachedRuleLoader.php

@@ -11,19 +11,13 @@
  */
 class CachedRuleLoader extends AbstractRuleLoader
 {
-    public const CACHE_KEY = 'cart_rules';
-
-    private AbstractRuleLoader $decorated;
-
-    private CacheInterface $cache;
+    final public const CACHE_KEY = 'cart_rules';
 
     /**
      * @internal
      */
-    public function __construct(AbstractRuleLoader $decorated, CacheInterface $cache)
+    public function __construct(private readonly AbstractRuleLoader $decorated, private readonly CacheInterface $cache)
     {
-        $this->decorated = $decorated;
-        $this->cache = $cache;
     }
 
     public function getDecorated(): AbstractRuleLoader
@@ -33,8 +27,6 @@ public function getDecorated(): AbstractRuleLoader
 
     public function load(Context $context): RuleCollection
     {
-        return $this->cache->get(self::CACHE_KEY, function () use ($context): RuleCollection {
-            return $this->decorated->load($context);
-        });
+        return $this->cache->get(self::CACHE_KEY, fn (): RuleCollection => $this->decorated->load($context));
     }
 }

src/Core/Checkout/Cart/Calculator.php

@@ -20,23 +20,11 @@
  */
 class Calculator
 {
-    private QuantityPriceCalculator $quantityPriceCalculator;
-
-    private PercentagePriceCalculator $percentagePriceCalculator;
-
-    private AbsolutePriceCalculator $absolutePriceCalculator;
-
     /**
      * @internal
      */
-    public function __construct(
-        QuantityPriceCalculator $quantityPriceCalculator,
-        PercentagePriceCalculator $percentagePriceCalculator,
-        AbsolutePriceCalculator $absolutePriceCalculator
-    ) {
-        $this->quantityPriceCalculator = $quantityPriceCalculator;
-        $this->percentagePriceCalculator = $percentagePriceCalculator;
-        $this->absolutePriceCalculator = $absolutePriceCalculator;
+    public function __construct(private readonly QuantityPriceCalculator $quantityPriceCalculator, private readonly PercentagePriceCalculator $percentagePriceCalculator, private readonly AbsolutePriceCalculator $absolutePriceCalculator)
+    {
     }
 
     public function calculate(LineItemCollection $lineItems, SalesChannelContext $context, CartBehavior $behavior): LineItemCollection

src/Core/Checkout/Cart/Cart.php

@@ -23,8 +23,6 @@ class Cart extends Struct
 {
     use StateAwareTrait;
 
-    protected string $token;
-
     protected CartPrice $price;
 
     protected LineItemCollection $lineItems;
@@ -55,9 +53,8 @@ class Cart extends Struct
     /**
      * @internal
      */
-    public function __construct(string $token)
+    public function __construct(protected string $token)
     {
-        $this->token = $token;
         $this->lineItems = new LineItemCollection();
         $this->transactions = new TransactionCollection();
         $this->errors = new ErrorCollection();

src/Core/Checkout/Cart/CartBehavior.php

@@ -9,20 +9,11 @@
  */
 class CartBehavior extends Struct
 {
-    /**
-     * @var array<mixed>
-     */
-    private array $permissions = [];
-
-    private bool $hookAware;
-
     /**
      * @param array<mixed> $permissions
      */
-    public function __construct(array $permissions = [], bool $hookAware = true)
+    public function __construct(private readonly array $permissions = [], private bool $hookAware = true)
     {
-        $this->permissions = $permissions;
-        $this->hookAware = $hookAware;
     }
 
     public function hasPermission(string $permission): bool

src/Core/Checkout/Cart/CartCalculator.php

@@ -14,14 +14,8 @@
  */
 class CartCalculator
 {
-    /**
-     * @var CartRuleLoader
-     */
-    private $cartRuleLoader;
-
-    public function __construct(CartRuleLoader $cartRuleLoader)
+    public function __construct(private readonly CartRuleLoader $cartRuleLoader)
     {
-        $this->cartRuleLoader = $cartRuleLoader;
     }
 
     public function calculate(Cart $cart, SalesChannelContext $context): Cart

src/Core/Checkout/Cart/CartEvents.php

@@ -10,5 +10,5 @@ class CartEvents
     /**
      * @Event("Shopware\Core\Checkout\Cart\Event\CheckoutOrderPlacedEvent")
      */
-    public const CHECKOUT_ORDER_PLACED = 'checkout.order.placed';
+    final public const CHECKOUT_ORDER_PLACED = 'checkout.order.placed';
 }

src/Core/Checkout/Cart/CartPersister.php

@@ -21,23 +21,11 @@
  */
 class CartPersister extends AbstractCartPersister
 {
-    private Connection $connection;
-
-    private EventDispatcherInterface $eventDispatcher;
-
-    private CartSerializationCleaner $cartSerializationCleaner;
-
-    private bool $compress;
-
     /**
      * @internal
      */
-    public function __construct(Connection $connection, EventDispatcherInterface $eventDispatcher, CartSerializationCleaner $cartSerializationCleaner, bool $compress)
+    public function __construct(private readonly Connection $connection, private readonly EventDispatcherInterface $eventDispatcher, private readonly CartSerializationCleaner $cartSerializationCleaner, private readonly bool $compress)
     {
-        $this->connection = $connection;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->cartSerializationCleaner = $cartSerializationCleaner;
-        $this->compress = $compress;
     }
 
     public function getDecorated(): AbstractCartPersister
@@ -73,7 +61,7 @@ public function load(string $token, SalesChannelContext $context): Cart
         }
 
         $cart->setToken($token);
-        $cart->setRuleIds(json_decode((string) $content['rule_ids'], true) ?? []);
+        $cart->setRuleIds(json_decode((string) $content['rule_ids'], true, 512, \JSON_THROW_ON_ERROR) ?? []);
 
         return $cart;
     }
@@ -123,7 +111,7 @@ public function save(Cart $cart, SalesChannelContext $context): void
             'price' => $cart->getPrice()->getTotalPrice(),
             'line_item_count' => $cart->getLineItems()->count(),
             'payload' => $this->serializeCart($cart, $payloadExists),
-            'rule_ids' => json_encode($context->getRuleIds()),
+            'rule_ids' => json_encode($context->getRuleIds(), \JSON_THROW_ON_ERROR),
             'now' => (new \DateTime())->format(Defaults::STORAGE_DATE_TIME_FORMAT),
         ];
 

src/Core/Checkout/Cart/CartRuleLoader.php

@@ -30,24 +30,8 @@ class CartRuleLoader implements ResetInterface
 {
     private const MAX_ITERATION = 7;
 
-    private AbstractCartPersister $cartPersister;
-
     private ?RuleCollection $rules = null;
 
-    private Processor $processor;
-
-    private LoggerInterface $logger;
-
-    private CacheInterface $cache;
-
-    private AbstractRuleLoader $ruleLoader;
-
-    private TaxDetector $taxDetector;
-
-    private EventDispatcherInterface $dispatcher;
-
-    private Connection $connection;
-
     /**
      * @var array<string, float>
      */
@@ -56,24 +40,8 @@ class CartRuleLoader implements ResetInterface
     /**
      * @internal
      */
-    public function __construct(
-        AbstractCartPersister $cartPersister,
-        Processor $processor,
-        LoggerInterface $logger,
-        CacheInterface $cache,
-        AbstractRuleLoader $loader,
-        TaxDetector $taxDetector,
-        Connection $connection,
-        EventDispatcherInterface $dispatcher
-    ) {
-        $this->cartPersister = $cartPersister;
-        $this->processor = $processor;
-        $this->logger = $logger;
-        $this->cache = $cache;
-        $this->ruleLoader = $loader;
-        $this->taxDetector = $taxDetector;
-        $this->dispatcher = $dispatcher;
-        $this->connection = $connection;
+    public function __construct(private readonly AbstractCartPersister $cartPersister, private readonly Processor $processor, private readonly LoggerInterface $logger, private readonly CacheInterface $cache, private readonly AbstractRuleLoader $ruleLoader, private readonly TaxDetector $taxDetector, private readonly Connection $connection, private readonly EventDispatcherInterface $dispatcher)
+    {
     }
 
     public function loadByToken(SalesChannelContext $context, string $cartToken): RuleLoaderResult
@@ -82,7 +50,7 @@ public function loadByToken(SalesChannelContext $context, string $cartToken): Ru
             $cart = $this->cartPersister->load($cartToken, $context);
 
             return $this->load($context, $cart, new CartBehavior($context->getPermissions()), false);
-        } catch (CartTokenNotFoundException $e) {
+        } catch (CartTokenNotFoundException) {
             $cart = new Cart($cartToken);
             $this->dispatcher->dispatch(new CartCreatedEvent($cart));
 

src/Core/Checkout/Cart/CartSerializationCleaner.php

@@ -13,17 +13,11 @@
  */
 class CartSerializationCleaner
 {
-    private Connection $connection;
-
-    private EventDispatcherInterface $eventDispatcher;
-
     /**
      * @internal
      */
-    public function __construct(Connection $connection, EventDispatcherInterface $eventDispatcher)
+    public function __construct(private readonly Connection $connection, private readonly EventDispatcherInterface $eventDispatcher)
     {
-        $this->connection = $connection;
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     public function cleanupCart(Cart $cart): void

src/Core/Checkout/Cart/Cleanup/CleanupCartTaskHandler.php

@@ -21,8 +21,8 @@ final class CleanupCartTaskHandler extends ScheduledTaskHandler
      */
     public function __construct(
         EntityRepository $repository,
-        private Connection $connection,
-        private int $days
+        private readonly Connection $connection,
+        private readonly int $days
     ) {
         parent::__construct($repository);
     }