[PHP8.4] fixes

Author: dpfaffenbauer

src/CoreShop/Bundle/ThemeBundle/Service/ThemeNotResolvedException.php

@@ -21,7 +21,7 @@
 class ThemeNotResolvedException extends \RuntimeException
 {
     public function __construct(
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct('Theme could not be resolved', 0, $previousException);
     }

src/CoreShop/Component/Address/Context/CountryNotFoundException.php

@@ -21,7 +21,7 @@
 class CountryNotFoundException extends \RuntimeException
 {
     public function __construct(
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct('Country could not be found!', 0, $previousException);
     }

src/CoreShop/Component/Core/Payment/Resolver/StoreBasedPaymentProviderResolver.php

@@ -31,7 +31,7 @@ public function __construct(
     ) {
     }
 
-    public function resolvePaymentProviders(ResourceInterface $subject = null): array
+    public function resolvePaymentProviders(?ResourceInterface $subject = null): array
     {
         return $this->paymentProviderRepository->findActiveForStore($this->storeContext->getStore());
     }

src/CoreShop/Component/Currency/Context/CurrencyNotFoundException.php

@@ -22,7 +22,7 @@ final class CurrencyNotFoundException extends \RuntimeException
 {
     public function __construct(
         $message = null,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct($message ?: 'Currency could not be found!', 0, $previousException);
     }

src/CoreShop/Component/Customer/Context/CustomerNotFoundException.php

@@ -21,7 +21,7 @@
 class CustomerNotFoundException extends \RuntimeException
 {
     public function __construct(
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct('Customer could not be found!', 0, $previousException);
     }

src/CoreShop/Component/Locale/Context/LocaleNotFoundException.php

@@ -22,23 +22,17 @@ final class LocaleNotFoundException extends \RuntimeException
 {
     public function __construct(
         $message = null,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct($message ?: 'Locale could not be found!', 0, $previousException);
     }
 
-    /**
-     * @param string $localeCode
-     */
-    public static function notFound($localeCode): self
+    public static function notFound(string $localeCode): self
     {
         return new self(sprintf('Locale "%s" cannot be found!', $localeCode));
     }
 
-    /**
-     * @param string $localeCode
-     */
-    public static function notAvailable($localeCode, array $availableLocalesCodes): self
+    public static function notAvailable(string $localeCode, array $availableLocalesCodes): self
     {
         return new self(sprintf(
             'Locale "%s" is not available! The available ones are: "%s".',

src/CoreShop/Component/Order/Context/CartNotFoundException.php

@@ -24,7 +24,7 @@ class CartNotFoundException extends StorageListNotFoundException
 {
     public function __construct(
         $message = null,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct($message ?: 'CoreShop was not able to figure out the current cart.', $previousException);
     }

src/CoreShop/Component/Order/Exception/NoPurchasableDiscountPriceFoundException.php

@@ -22,7 +22,7 @@ class NoPurchasableDiscountPriceFoundException extends \Exception
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Price Calculator "%s" was not able to match a valid discount price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/Order/Exception/NoPurchasablePriceFoundException.php

@@ -22,7 +22,7 @@ class NoPurchasablePriceFoundException extends \Exception
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Price Calculator "%s" was not able to match a valid price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/Order/Exception/NoPurchasableRetailPriceFoundException.php

@@ -22,7 +22,7 @@ class NoPurchasableRetailPriceFoundException extends \Exception
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Price Calculator "%s" was not able to match a valid retail price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/Order/Exception/NoPurchasableWholesalePriceFoundException.php

@@ -22,7 +22,7 @@ class NoPurchasableWholesalePriceFoundException extends \Exception
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Price Calculator "%s" was not able to match a valid wholesale price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/Payment/Resolver/PaymentProviderResolver.php

@@ -28,7 +28,7 @@ public function __construct(
     ) {
     }
 
-    public function resolvePaymentProviders(ResourceInterface $subject = null): array
+    public function resolvePaymentProviders(?ResourceInterface $subject = null): array
     {
         return $this->paymentProviderRepository->findActive();
     }

src/CoreShop/Component/Payment/Resolver/PaymentProviderResolverInterface.php

@@ -22,5 +22,5 @@
 
 interface PaymentProviderResolverInterface
 {
-    public function resolvePaymentProviders(ResourceInterface $subject = null): array;
+    public function resolvePaymentProviders(?ResourceInterface $subject = null): array;
 }

src/CoreShop/Component/Payment/Resolver/RuleBasedPaymentProviderResolver.php

@@ -31,7 +31,7 @@ public function __construct(
     ) {
     }
 
-    public function resolvePaymentProviders(ResourceInterface $subject = null): array
+    public function resolvePaymentProviders(?ResourceInterface $subject = null): array
     {
         /**
          * @var PaymentProviderInterface[] $paymentProviders

src/CoreShop/Component/Payment/Validator/PaymentProviderValidator.php

@@ -31,7 +31,7 @@ public function __construct(
 
     public function isPaymentProviderValid(
         PaymentProviderInterface $paymentProvider,
-        ResourceInterface $subject = null,
+        ?ResourceInterface $subject = null,
     ): bool {
         $validProviders = $this->paymentProviderResolver->resolvePaymentProviders($subject);
 

src/CoreShop/Component/Payment/Validator/PaymentProviderValidatorInterface.php

@@ -25,6 +25,6 @@ interface PaymentProviderValidatorInterface
 {
     public function isPaymentProviderValid(
         PaymentProviderInterface $paymentProvider,
-        ResourceInterface $subject = null,
+        ?ResourceInterface $subject = null,
     ): bool;
 }

src/CoreShop/Component/Pimcore/Mail.php

@@ -20,7 +20,7 @@
 
 class Mail extends \Pimcore\Mail
 {
-    public function addRecipients(array|string $recipients = null)
+    public function addRecipients(array|string|null $recipients = null)
     {
         $toRecipients = [];
 

src/CoreShop/Component/Pimcore/Slug/SluggableInterface.php

@@ -29,12 +29,12 @@ public function getKey(): ?string;
     /**
      * @return UrlSlug[]
      */
-    public function getSlug(string $language = null): array;
+    public function getSlug(?string $language = null): array;
 
     /**
      * @param UrlSlug[] $slug
      */
     public function setSlug(array $slug, ?string $language = null);
 
-    public function getNameForSlug(string $language = null): ?string;
+    public function getNameForSlug(?string $language = null): ?string;
 }

src/CoreShop/Component/Pimcore/Slug/SluggableSlugger.php

@@ -28,7 +28,7 @@ public function __construct(
     ) {
     }
 
-    public function slug(SluggableInterface $sluggable, string $locale, string $suffix = null): string
+    public function slug(SluggableInterface $sluggable, string $locale, ?string $suffix = null): string
     {
         $fallback = (string) $sluggable->getId();
 

src/CoreShop/Component/Pimcore/Slug/SluggableSluggerInterface.php

@@ -20,5 +20,5 @@
 
 interface SluggableSluggerInterface
 {
-    public function slug(SluggableInterface $sluggable, string $locale, string $suffix = null): string;
+    public function slug(SluggableInterface $sluggable, string $locale, ?string $suffix = null): string;
 }

src/CoreShop/Component/Pimcore/composer.json

@@ -26,7 +26,8 @@
   "require": {
     "pimcore/pimcore": "^12.0",
     "pimcore/web-to-print-bundle": "^1.3",
-    "pimcore/admin-ui-classic-bundle": "^2.0"
+    "pimcore/admin-ui-classic-bundle": "^2.0",
+    "webmozart/assert": "^1.10"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10",

src/CoreShop/Component/Product/Exception/NoDiscountPriceFoundException.php

@@ -22,7 +22,7 @@ class NoDiscountPriceFoundException extends \Exception
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Price Calculator "%s" was not able to match a valid discount price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/Product/Exception/NoPriceFoundException.php

@@ -22,7 +22,7 @@ class NoPriceFoundException extends \Exception
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Price Calculator "%s" was not able to match a valid price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/Product/Exception/NoRetailPriceFoundException.php

@@ -22,7 +22,7 @@ class NoRetailPriceFoundException extends \Exception
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Price Calculator "%s" was not able to match a valid retail price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/Product/Model/Category.php

@@ -33,7 +33,7 @@ public function hasChildCategories(): bool
         return $this->getChildren()->getTotalCount() > 0;
     }
 
-    public function getNameForSlug(string $language = null): ?string
+    public function getNameForSlug(?string $language = null): ?string
     {
         return $this->getName($language);
     }

src/CoreShop/Component/ProductQuantityPriceRules/Exception/NoPriceFoundException.php

@@ -22,7 +22,7 @@ class NoPriceFoundException extends \RuntimeException
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Quantity Price Calculator "%s" was not able to match a valid price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/ProductQuantityPriceRules/Exception/NoRuleFoundException.php

@@ -22,7 +22,7 @@ class NoRuleFoundException extends \RuntimeException
 {
     public function __construct(
         $message = null,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct($message ?: 'No matching Quantity Price Rule found.', 0, $previousException);
     }

src/CoreShop/Component/Registry/Autoconfiguration.php

@@ -27,7 +27,7 @@ public static function registerForAutoConfiguration(
         ContainerBuilder $container,
         string $interface,
         string $tag,
-        string $attribute = null,
+        ?string $attribute = null,
         bool $autoconfigureWithAttributes = false,
     ): void {
         if (!$autoconfigureWithAttributes) {

src/CoreShop/Component/SEO/Model/SEOOpenGraphAwareInterface.php

@@ -20,9 +20,9 @@
 
 interface SEOOpenGraphAwareInterface
 {
-    public function getOGTitle(string $language = null): ?string;
+    public function getOGTitle(?string $language = null): ?string;
 
-    public function getOGDescription(string $language = null): ?string;
+    public function getOGDescription(?string $language = null): ?string;
 
     public function getOGType(): ?string;
 }

src/CoreShop/Component/Shipping/Exception/NoShippingPriceFoundException.php

@@ -22,7 +22,7 @@ class NoShippingPriceFoundException extends \Exception
 {
     public function __construct(
         $calculatorClass,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(sprintf('Price Calculator "%s" was not able to match a valid shipping price.', $calculatorClass), 0, $previousException);
     }

src/CoreShop/Component/StorageList/Context/StorageListNotFoundException.php

@@ -22,7 +22,7 @@ class StorageListNotFoundException extends \RuntimeException
 {
     public function __construct(
         $message = null,
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct(
             $message ?: 'CoreShop was not able to find out the requested Storage List.',

src/CoreShop/Component/Store/Context/StoreNotFoundException.php

@@ -21,7 +21,7 @@
 class StoreNotFoundException extends \RuntimeException
 {
     public function __construct(
-        \Exception $previousException = null,
+        ?\Exception $previousException = null,
     ) {
         parent::__construct('Store could not be found!', 0, $previousException);
     }

src/CoreShop/Component/Variant/Model/AttributeGroupInterface.php

@@ -22,7 +22,7 @@
 
 interface AttributeGroupInterface extends PimcoreModelInterface
 {
-    public function getName(string $language = null): ?string;
+    public function getName(?string $language = null): ?string;
 
     public function setName(?string $name, ?string $language = null): static;
 

src/CoreShop/Component/Variant/Model/AttributeInterface.php

@@ -22,7 +22,7 @@
 
 interface AttributeInterface extends PimcoreModelInterface
 {
-    public function getName(string $language = null): ?string;
+    public function getName(?string $language = null): ?string;
 
     public function setName(?string $name, ?string $language = null);
 

src/CoreShop/Component/Variant/Model/ProductVariantAwareInterface.php

@@ -23,7 +23,7 @@
 
 interface ProductVariantAwareInterface extends PimcoreModelInterface
 {
-    public function getName(string $language = null): ?string;
+    public function getName(?string $language = null): ?string;
 
     public function setName(?string $name, ?string $language = null);
 

src/CoreShop/Component/Variant/Model/Resolved/ResolvedAttribute.php

@@ -29,7 +29,7 @@ class ResolvedAttribute
     private ArrayCollection $products;
 
     public function __construct(
-        AttributeInterface $attribute = null,
+        ?AttributeInterface $attribute = null,
     ) {
         $this->products = new ArrayCollection();
         if ($attribute) {