[6.x] Fix phpstan issues for PHP 8.4

CHANGELOG-WIP.md

@@ -0,0 +1,11 @@
+# WIP Release Notes for Craft Commerce
+
+### Store Management
+
+### Administration
+
+### Development
+
+### Extensibility
+
+### System

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed a bug where catalog pricing rules could generate promotional prices for non-promotable purchasables. ([#4118](https://github.com/craftcms/commerce/issues/4118))
+- Fixed a bug where variants weren’t duplicating correctly. ([#4125](https://github.com/craftcms/commerce/issues/4125))
 - Fixed a SQL error that could occur when deleting a shipping method.
 
 ## 5.4.6 - 2025-09-04

src/base/Purchasable.php

@@ -683,7 +683,7 @@ public function getSkuAsText(): string
     /**
      * @param string|null $sku
      */
-    public function setSku(string $sku = null): void
+    public function setSku(?string $sku = null): void
     {
         $this->_sku = $sku;
     }

src/base/Stat.php

@@ -41,7 +41,7 @@ abstract class Stat implements StatInterface, HasStoreInterface
      * @param DateTime|bool|null $endDate
      * @throws \Exception
      */
-    public function __construct(string $dateRange = null, mixed $startDate = null, mixed $endDate = null, ?int $storeId = null)
+    public function __construct(?string $dateRange = null, mixed $startDate = null, mixed $endDate = null, ?int $storeId = null)
     {
         $user = Craft::$app->getUser()->getIdentity();
         if ($user) {

src/controllers/CatalogPricingRulesController.php

@@ -73,7 +73,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @throws HttpException
      * @throws InvalidConfigException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, CatalogPricingRule $catalogPricingRule = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?CatalogPricingRule $catalogPricingRule = null): Response
     {
         if ($id === null) {
             $this->requirePermission('commerce-createCatalogPricingRules');

src/controllers/DiscountsController.php

@@ -65,7 +65,7 @@ public function init(): void
     /**
      * @throws HttpException
      */
-    public function actionIndex(string $storeHandle = null): Response
+    public function actionIndex(?string $storeHandle = null): Response
     {
         if ($storeHandle) {
             $store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle);
@@ -178,7 +178,7 @@ public function actionTableData(): Response
      * @param Discount|null $discount
      * @throws HttpException
      */
-    public function actionEdit(int $id = null, Discount $discount = null, string $storeHandle = null): Response
+    public function actionEdit(?int $id = null, ?Discount $discount = null, ?string $storeHandle = null): Response
     {
         if ($id === null) {
             $this->requirePermission('commerce-createDiscounts');

src/controllers/EmailsController.php

@@ -59,7 +59,7 @@ public function actionIndex(): Response
      * @param Email|null $email
      * @throws HttpException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, Email $email = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?Email $email = null): Response
     {
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {
             $store = Plugin::getInstance()->getStores()->getPrimaryStore();

src/controllers/GatewaysController.php

@@ -75,7 +75,7 @@ public function actionIndex(): Response
      * @throws DeprecationException
      * @throws InvalidConfigException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, ?GatewayInterface $gateway = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?GatewayInterface $gateway = null): Response
     {
         /** @var Gateway|null $gateway */
         $variables = compact('id', 'gateway');

src/controllers/LineItemStatusesController.php

@@ -55,7 +55,7 @@ public function actionIndex(): Response
      * @param LineItemStatus|null $lineItemStatus
      * @throws HttpException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, LineItemStatus $lineItemStatus = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?LineItemStatus $lineItemStatus = null): Response
     {
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {
             $store = Plugin::getInstance()->getStores()->getPrimaryStore();

src/controllers/OrderStatusesController.php

@@ -55,7 +55,7 @@ public function actionIndex(): Response
      * @param OrderStatus|null $orderStatus
      * @throws HttpException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, OrderStatus $orderStatus = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?OrderStatus $orderStatus = null): Response
     {
         $variables = compact('id', 'orderStatus');
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {

src/controllers/OrdersController.php

@@ -129,7 +129,7 @@ public function init(): void
      *
      * @throws Throwable
      */
-    public function actionOrderIndex(string $orderStatusHandle = ''): Response
+    public function actionOrderIndex(?string $orderStatusHandle = ''): Response
     {
         Craft::$app->getView()->registerAssetBundle(CommerceCpAsset::class);
 
@@ -213,7 +213,7 @@ public function actionCreate(string $storeHandle): Response
      * @throws RuntimeError
      * @throws SyntaxError
      */
-    public function actionEditOrder(int $orderId, Order $order = null, $paymentForm = null): Response
+    public function actionEditOrder(int $orderId, ?Order $order = null, $paymentForm = null): Response
     {
         $plugin = Plugin::getInstance();
         $variables = [];

src/controllers/PaymentCurrenciesController.php

@@ -47,7 +47,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @throws HttpException
      * @throws InvalidConfigException
      */
-    public function actionEdit(int $id = null, PaymentCurrency $currency = null, string $storeHandle = null): Response
+    public function actionEdit(?int $id = null, ?PaymentCurrency $currency = null, ?string $storeHandle = null): Response
     {
         $variables = compact('id', 'currency');
 

src/controllers/PdfsController.php

@@ -62,7 +62,7 @@ public function actionIndex(): Response
      * @throws InvalidConfigException
      * @since 3.2
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, Pdf $pdf = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?Pdf $pdf = null): Response
     {
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {
             $store = Plugin::getInstance()->getStores()->getPrimaryStore();

src/controllers/PlansController.php

@@ -66,7 +66,7 @@ public function actionPlanIndex(): Response
      * @throws DeprecationException
      * @throws ForbiddenHttpException
      */
-    public function actionEditPlan(int $planId = null, Plan $plan = null): Response
+    public function actionEditPlan(?int $planId = null, ?Plan $plan = null): Response
     {
         $this->requirePermission('commerce-manageSubscriptions');
 

src/controllers/ProductTypesController.php

@@ -44,7 +44,7 @@ public function actionProductTypeIndex(): Response
      * @param ProductType|null $productType
      * @throws HttpException
      */
-    public function actionEditProductType(int $productTypeId = null, ProductType $productType = null): Response
+    public function actionEditProductType(?int $productTypeId = null, ?ProductType $productType = null): Response
     {
         $variables = compact('productTypeId', 'productType');
 

src/controllers/SalesController.php

@@ -74,7 +74,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @throws HttpException
      * @throws InvalidConfigException
      */
-    public function actionEdit(int $id = null, Sale $sale = null, ?string $storeHandle = null): Response
+    public function actionEdit(?int $id = null, ?Sale $sale = null, ?string $storeHandle = null): Response
     {
         if ($id === null) {
             $this->requirePermission('commerce-createSales');

src/controllers/ShippingCategoriesController.php

@@ -51,7 +51,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @param ShippingCategory|null $shippingCategory
      * @throws HttpException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, ShippingCategory $shippingCategory = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?ShippingCategory $shippingCategory = null): Response
     {
         $variables = [
             'id' => $id,

src/controllers/ShippingMethodsController.php

@@ -45,7 +45,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @throws HttpException
      * @throws InvalidConfigException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, ShippingMethod $shippingMethod = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?ShippingMethod $shippingMethod = null): Response
     {
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {
             $store = Plugin::getInstance()->getStores()->getPrimaryStore();

src/controllers/ShippingRulesController.php

@@ -48,7 +48,7 @@ class ShippingRulesController extends BaseShippingSettingsController
      * @throws SyntaxError
      * @throws Exception
      */
-    public function actionEdit(?string $storeHandle = null, int $methodId = null, int $ruleId = null, ShippingRule $shippingRule = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $methodId = null, ?int $ruleId = null, ?ShippingRule $shippingRule = null): Response
     {
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {
             $store = Plugin::getInstance()->getStores()->getPrimaryStore();

src/controllers/ShippingZonesController.php

@@ -42,7 +42,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @param ShippingAddressZone|null $shippingZone
      * @throws HttpException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, ShippingAddressZone $shippingZone = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?ShippingAddressZone $shippingZone = null): Response
     {
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {
             $store = Plugin::getInstance()->getStores()->getPrimaryStore();

src/controllers/StoreManagementController.php

@@ -67,7 +67,7 @@ public function actionIndex(): Response
      * @throws TemplateLoaderException
      * @throws InvalidConfigException
      */
-    public function actionEdit(StoreSettings $storeSettings = null, ?string $storeHandle = null): Response
+    public function actionEdit(?StoreSettings $storeSettings = null, ?string $storeHandle = null): Response
     {
         $this->requirePermission('commerce-manageGeneralStoreSettings');
 

src/controllers/StoresController.php

@@ -332,7 +332,7 @@ public function actionReorderStores(): Response
      * @return Response
      * @throws InvalidConfigException
      */
-    public function actionEditSiteStores(Collection $sitesStores = null): Response
+    public function actionEditSiteStores(?Collection $sitesStores = null): Response
     {
         // Breadcrumbs
         $crumbs = [

src/controllers/SubscriptionsController.php

@@ -53,7 +53,7 @@ public function actionIndex(): Response
      * @throws HttpException
      * @throws InvalidConfigException
      */
-    public function actionEdit(int $subscriptionId = null, Subscription $subscription = null): Response
+    public function actionEdit(?int $subscriptionId = null, ?Subscription $subscription = null): Response
     {
         $variables = [];
 

src/controllers/TaxCategoriesController.php

@@ -48,7 +48,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @param TaxCategory|null $taxCategory
      * @throws HttpException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, TaxCategory $taxCategory = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?TaxCategory $taxCategory = null): Response
     {
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {
             $store = Plugin::getInstance()->getStores()->getPrimaryStore();

src/controllers/TaxRatesController.php

@@ -71,7 +71,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @throws SyntaxError
      * @throws Exception
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, TaxRate $taxRate = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?TaxRate $taxRate = null): Response
     {
         if (!Plugin::getInstance()->getTaxes()->viewTaxRates()) {
             throw new ForbiddenHttpException('Tax engine does not permit you to perform this action');

src/controllers/TaxZonesController.php

@@ -50,7 +50,7 @@ public function actionIndex(?string $storeHandle = null): Response
      * @param TaxAddressZone|null $taxZone
      * @throws HttpException
      */
-    public function actionEdit(?string $storeHandle = null, int $id = null, TaxAddressZone $taxZone = null): Response
+    public function actionEdit(?string $storeHandle = null, ?int $id = null, ?TaxAddressZone $taxZone = null): Response
     {
         if ($storeHandle === null || !$store = Plugin::getInstance()->getStores()->getStoreByHandle($storeHandle)) {
             $store = Plugin::getInstance()->getStores()->getPrimaryStore();

src/elements/Order.php

@@ -2422,7 +2422,7 @@ public function getCpEditUrl(): ?string
      * @param string|null $pdfHandle The handle of the PDF to use. If none is passed the default PDF is used.
      * @return string|null The URL to the order’s PDF invoice, or null if the PDF template doesn’t exist
      */
-    public function getPdfUrl(string $option = null, string $pdfHandle = null): ?string
+    public function getPdfUrl(?string $option = null, ?string $pdfHandle = null): ?string
     {
         $path = "commerce/downloads/pdf";
         $params = [];

src/elements/Product.php

@@ -219,7 +219,7 @@ public static function createCondition(): ElementConditionInterface
     /**
      * @inheritdoc
      */
-    protected static function defineSources(string $context = null): array
+    protected static function defineSources(?string $context = null): array
     {
         if ($context == 'index') {
             $productTypes = Plugin::getInstance()->getProductTypes()->getEditableProductTypes();
@@ -334,7 +334,7 @@ protected static function defineFieldLayouts(?string $source): array
     /**
      * @inheritdoc
      */
-    protected static function defineActions(string $source = null): array
+    protected static function defineActions(?string $source = null): array
     {
         $elementsService = Craft::$app->getElements();
         // Get the selected site
@@ -1107,7 +1107,15 @@ public function getVariants(bool $includeDisabled = false): VariantCollection
                 return VariantCollection::make();
             }
 
-            $variants = self::createVariantQuery($this)->status(null)->collect();
+            /** @var self|null $duplicatingProduct */
+            $duplicatingProduct = $this->duplicateOf;
+            if ($duplicatingProduct) {
+                $query = self::createVariantQuery($duplicatingProduct)->status(null);
+            } else {
+                $query = self::createVariantQuery($this)->status(null);
+            }
+
+            $variants = $query->collect();
 
             // Don't memoize empty collections in favour of a new query next time
             if ($variants->isEmpty()) {
@@ -1885,12 +1893,9 @@ protected static function defineSearchableAttributes(): array
      */
     private static function createVariantQuery(Product $product): VariantQuery
     {
-        $productId = $product->duplicateOf?->id ?? $product->id;
-        $productSiteId = $product->duplicateOf?->siteId ?? $product->siteId;
-
         $query = Variant::find()
-            ->productId($productId)
-            ->siteId($productSiteId)
+            ->productId($product->id)
+            ->siteId($product->siteId)
             ->orderBy(['sortOrder' => SORT_ASC]);
 
         if ($product->getIsRevision()) {

src/elements/Subscription.php

@@ -435,7 +435,7 @@ public function getStatus(): ?string
     /**
      * @inheritdoc
      */
-    public static function defineSources(string $context = null): array
+    public static function defineSources(?string $context = null): array
     {
         $plans = Plugin::getInstance()->getPlans()->getAllPlans();
 

src/elements/Transfer.php

@@ -443,7 +443,7 @@ public function getUriFormat(): ?string
      * @param string|null $context
      * @return array
      */
-    protected static function defineSources(string $context = null): array
+    protected static function defineSources(?string $context = null): array
     {
         $transferStatuses = TransferStatusType::cases();
         $transferStatusSources = [];