Merge pull request #4014 from craftcms/4.9

4.9

Author: nfourtythree

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     uses: craftcms/.github/.github/workflows/ci.yml@v3
     with:
       craft_version: '4'
-      jobs: '["ecs", "phpstan", "prettier", "tests"]'
+      jobs: '["ecs", "phpstan", "prettier", "tests", "rector"]'
       notify_slack: true
       slack_subteam: <!subteam^S01CWPYH9D5>
     secrets:

CHANGELOG-WIP.md

@@ -0,0 +1,5 @@
+# WIP Release Note for Craft Commerce 4.9
+
+- Added the `localized` field to products’ GraphQL data. ([#3783](https://github.com/craftcms/commerce/discussions/3783))
+- Added `craft\commerce\taxidvalidators\EuVatIdValidator::API_URL`.
+- Fixed a PHP error that could occur when saving an order. ([#3283](https://github.com/craftcms/commerce/issues/3283))

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Release Notes for Craft Commerce
 
-## Unreleased
-
-- Fixed a PHP error that could occur when saving an Order. ([#3283](https://github.com/craftcms/commerce/issues/3283))
-
 ## 4.8.4 - 2025-05-01
 
 - Fixed a bug where products weren’t getting updated when default variants were saved directly. ([#3988](https://github.com/craftcms/commerce/issues/3988))

composer.lock

@@ -1,17 +1,18 @@
 <?php
-// rector.php
-use Rector\Set\ValueObject\SetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return static function(ContainerConfigurator $containerConfigurator): void {
-//    $containerConfigurator->import(SetList::CODE_QUALITY);
+declare(strict_types=1);
 
-// register single rule
-    $services = $containerConfigurator->services();
-    //    $containerConfigurator->import(SetList::PHP_80);
-    $services->set(\Rector\Php80\Rector\FunctionLike\UnionTypesRector::class);
-    $services->set(\Rector\Php80\Rector\NotIdentical\StrContainsRector::class);
-    $services->set(\Rector\Php80\Rector\Identical\StrStartsWithRector::class);
-    $services->set(\Rector\Php80\Rector\Identical\StrEndsWithRector::class);
-    $services->set(\Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector::class);
-};
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests/unit',
+    ])
+    ->withSkip([
+        Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector::class => [
+            __DIR__ . '/src/console/controllers/GatewaysController.php',
+        ],
+        Rector\Php80\Rector\Class_\StringableForToStringRector::class,
+    ])
+    ->withPhpSets(php80: true);

rector.php

@@ -428,9 +428,7 @@ public function getOrderStatuses(): ?array
                 continue;
             }
 
-            $orderStatus = ArrayHelper::firstWhere($allOrderStatuses, function(OrderStatus $os) use ($orderStatus) {
-                return $orderStatus === $os->handle || $orderStatus === $os->uid;
-            });
+            $orderStatus = ArrayHelper::firstWhere($allOrderStatuses, fn(OrderStatus $os) => $orderStatus === $os->handle || $orderStatus === $os->uid);
             if (!$orderStatus) {
                 unset($this->_orderStatuses[$key]);
                 continue;

src/base/Stat.php

@@ -47,7 +47,7 @@ abstract class Zone extends BaseModel implements ZoneInterface
     /**
      * @var ?ZoneAddressCondition
      */
-    private ?ZoneAddressCondition $_condition;
+    private ?ZoneAddressCondition $_condition = null;
 
     abstract public function getCpEditUrl(): string;
 

src/base/Zone.php

@@ -263,14 +263,12 @@ public function actionRun(): int
             ->all();
 
         // Filter out the address columns we don't need to migrate to custom fields
-        $this->neededCustomAddressFields = array_filter($this->neededCustomAddressFields, static function($fieldHandle) {
-            return (new Query())
-                ->select($fieldHandle)
-                ->where(['not', [$fieldHandle => null]])
-                ->andWhere(['not', [$fieldHandle => '']])
-                ->from(['{{%commerce_addresses}}'])
-                ->exists();
-        }, ARRAY_FILTER_USE_KEY);
+        $this->neededCustomAddressFields = array_filter($this->neededCustomAddressFields, static fn($fieldHandle) => (new Query())
+            ->select($fieldHandle)
+            ->where(['not', [$fieldHandle => null]])
+            ->andWhere(['not', [$fieldHandle => '']])
+            ->from(['{{%commerce_addresses}}'])
+            ->exists(), ARRAY_FILTER_USE_KEY);
 
         $startTime = DateTimeHelper::currentUTCDateTime();
 
@@ -395,7 +393,7 @@ private function _migrateAddressCustomFields(): void
             $firstTab = $this->_addressFieldLayout->getTabs()[0];
             $layoutElements = $firstTab->getElements();
 
-            $list = implode(array_map(fn($label) => " - $label\n", $this->neededCustomAddressFields));
+            $list = implode('', array_map(fn($label) => " - $label\n", $this->neededCustomAddressFields));
             $this->stdout(<<<EOL
 Customer and order addresses will be migrated to native Craft address elements.
 Some of the existing addresses contain data that will need to be stored in custom fields:

src/console/controllers/UpgradeController.php

@@ -38,7 +38,6 @@
 use yii\web\HttpException;
 use yii\web\Response;
 use function explode;
-use function get_class;
 
 /**
  * Class Discounts Controller
@@ -459,17 +458,11 @@ public function actionClearDiscountUses(): Response
             return $this->asFailure(Craft::t('commerce', 'Type not in allowed options.'));
         }
 
-        switch ($type) {
-            case self::DISCOUNT_COUNTER_TYPE_EMAIL:
-                Plugin::getInstance()->getDiscounts()->clearEmailUsageHistoryById($id);
-                break;
-            case self::DISCOUNT_COUNTER_TYPE_CUSTOMER:
-                Plugin::getInstance()->getDiscounts()->clearCustomerUsageHistoryById($id);
-                break;
-            case self::DISCOUNT_COUNTER_TYPE_TOTAL:
-                Plugin::getInstance()->getDiscounts()->clearDiscountUsesById($id);
-                break;
-        }
+        match ($type) {
+            self::DISCOUNT_COUNTER_TYPE_EMAIL => Plugin::getInstance()->getDiscounts()->clearEmailUsageHistoryById($id),
+            self::DISCOUNT_COUNTER_TYPE_CUSTOMER => Plugin::getInstance()->getDiscounts()->clearCustomerUsageHistoryById($id),
+            self::DISCOUNT_COUNTER_TYPE_TOTAL => Plugin::getInstance()->getDiscounts()->clearDiscountUsesById($id),
+        };
 
         return $this->asSuccess();
     }
@@ -678,8 +671,8 @@ private function _populateVariables(array &$variables): void
         foreach ($purchasableIds as $purchasableId) {
             $purchasable = Craft::$app->getElements()->getElementById((int)$purchasableId);
             if ($purchasable instanceof PurchasableInterface) {
-                $class = get_class($purchasable);
-                $purchasables[$class] = $purchasables[$class] ?? [];
+                $class = $purchasable::class;
+                $purchasables[$class] ??= [];
                 $purchasables[$class][] = $purchasable;
             }
         }

src/controllers/DiscountsController.php

@@ -97,15 +97,15 @@ public function actionEdit(int $id = null, ?GatewayInterface $gateway = null): R
         $allGatewayTypes = $gatewayService->getAllGatewayTypes();
 
         // Make sure the selected gateway class is in there
-        if ($gateway && !in_array(get_class($gateway), $allGatewayTypes, true)) {
-            $allGatewayTypes[] = get_class($gateway);
+        if ($gateway && !in_array($gateway::class, $allGatewayTypes, true)) {
+            $allGatewayTypes[] = $gateway::class;
         }
 
         $gatewayInstances = [];
         $gatewayOptions = [];
 
         foreach ($allGatewayTypes as $class) {
-            if (($gateway && $class === get_class($gateway)) || $class::isSelectable()) {
+            if (($gateway && $class === $gateway::class) || $class::isSelectable()) {
                 $gatewayInstances[$class] = $gatewayService->createGateway($class);
 
                 $gatewayOptions[] = [