Merge branch 'release/4.4.16' into main

craftcms · Jul 18, 2023 · 7a89c83 · 7a89c83
2 parents 273dfd3 + 3841d61
commit 7a89c83
Show file tree

Hide file tree

Showing 92 changed files with 1,056 additions and 391 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/packages/craftcms-sass/_mixins.scss b/packages/craftcms-sass/_mixins.scss
@@ -273,7 +273,7 @@ $radioSize: 16px;
 @mixin modal {
   border-radius: $largeBorderRadius;
   background-color: $white;
-  box-shadow: 0 25px 100px transparentize($grey900, 0.5);
+  box-shadow: 0 25px 100px transparentize($grey900, 0.5) !important;
 }
 
 @mixin light-on-dark-text() {

diff --git a/src/base/Element.php b/src/base/Element.php
@@ -2163,11 +2163,7 @@ public function __get($name)
 
         // If this is a field, make sure the value has been normalized before returning the CustomFieldBehavior value
         if ($this->fieldByHandle($name) !== null) {
-            $value = $this->getFieldValue($name);
-            if (is_object($value) && (!interface_exists(UnitEnum::class) || !$value instanceof UnitEnum)) {
-                $value = clone $value;
-            }
-            return $value;
+            return $this->clonedFieldValue($name);
         }
 
         return parent::__get($name);
@@ -2297,7 +2293,7 @@ public function fields(): array
             foreach ($fieldLayout->getCustomFieldElements() as $layoutElement) {
                 $field = $layoutElement->getField();
                 if (!isset($fields[$field->handle])) {
-                    $fields[$field->handle] = fn() => $this->getFieldValue($field->handle);
+                    $fields[$field->handle] = fn() => $this->clonedFieldValue($field->handle);
                 }
             }
         }
@@ -4023,6 +4019,15 @@ public function setFieldValues(array $values): void
         }
     }
 
+    private function clonedFieldValue(string $fieldHandle): mixed
+    {
+        $value = $this->getFieldValue($fieldHandle);
+        if (is_object($value) && (!interface_exists(UnitEnum::class) || !$value instanceof UnitEnum)) {
+            return clone $value;
+        }
+        return $value;
+    }
+
     /**
      * @inheritdoc
      */

diff --git a/src/base/ElementInterface.php b/src/base/ElementInterface.php
@@ -487,8 +487,11 @@ public static function defaultTableAttributes(string $source): array;
      * This method aids in the eager-loading of elements when performing an element query. The returned array should
      * contain the following keys:
      * - `elementType` – the fully qualified class name of the element type that should be eager-loaded
-     * - `map` – an array of element ID mappings, where each element is a sub-array with `source` and `target` keys.
-     * - `criteria` *(optional)* – Any criteria parameters that should be applied to the element query when fetching the eager-loaded elements.
+     * - `map` – an array of element ID mappings, where each element is a sub-array with `source` and `target` keys
+     * - `criteria` *(optional)* – any criteria parameters that should be applied to the element query when fetching the
+     *   eager-loaded elements
+     * - `createElement` *(optional)* - an element factory function, which will be passed the element query, the current
+     *   query result data, and the first source element that the result was eager-loaded for
      *
      * ```php
      * use craft\db\Query;

diff --git a/src/config/GeneralConfig.php b/src/config/GeneralConfig.php
@@ -228,9 +228,9 @@ class GeneralConfig extends BaseConfig
      *
      * ```php Static Config
      * // Nothing bug GIFs!
-     * 'allowedFileExtensions' => [
+     * ->allowedFileExtensions([
      *     'gif',
-     * ],
+     * ])
      * ```
      *
      * @see extraAllowedFileExtensions
@@ -393,7 +393,7 @@ class GeneralConfig extends BaseConfig
      *
      * ::: code
      * ```php Static Config
-     * 'autosaveDrafts' => false,
+     * ->autosaveDrafts(false)
      * ```
      * ```shell Environment Override
      * CRAFT_AUTOSAVE_DRAFTS=false
@@ -827,7 +827,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // One week
-     * 'defaultTokenDuration' => 604800,
+     * ->defaultTokenDuration(604800)
      * ```
      * ```shell Environment Override
      * # One week
@@ -1232,7 +1232,7 @@ class GeneralConfig extends BaseConfig
      *
      * ::: code
      * ```php Static Config
-     * 'extraLastNamePrefixes' => ['Dal', 'Van Der'],
+     * ->extraLastNamePrefixes(['Dal', 'Van Der'])
      * ```
      * ```shell Environment Override
      * CRAFT_EXTRA_LAST_NAME_PREFIXES="Dal,Van Der"
@@ -1249,7 +1249,7 @@ class GeneralConfig extends BaseConfig
      *
      * ::: code
      * ```php Static Config
-     * 'extraNameSalutations' => ['Lady', 'Sire'],
+     * ->extraNameSalutations(['Lady', 'Sire'])
      * ```
      * ```shell Environment Override
      * CRAFT_EXTRA_NAME_SALUTATIONS=Lady,Sire
@@ -1266,7 +1266,7 @@ class GeneralConfig extends BaseConfig
      *
      * ::: code
      * ```php Static Config
-     * 'extraNameSuffixes' => ['CCNA', 'OBE'],
+     * ->extraNameSuffixes(['CCNA', 'OBE'])
      * ```
      * ```shell Environment Override
      * CRAFT_EXTRA_NAME_SUFFIXES=CCNA,OBE
@@ -1471,7 +1471,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // 1 day
-     * 'invalidLoginWindowDuration' => 86400,
+     * ->invalidLoginWindowDuration(86400)
      * ```
      * ```shell Environment Override
      * # 1 day
@@ -1493,7 +1493,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // 1 day
-     * 'invalidUserTokenPath' => 'nope',
+     * ->invalidUserTokenPath('nope')
      * ```
      * ```shell Environment Override
      * # 1 day
@@ -1752,7 +1752,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // 25MB
-     * 'maxUploadFileSize' => 26214400,
+     * ->maxUploadFileSize(26214400)
      * ```
      * ```shell Environment Override
      * # 25MB
@@ -2128,7 +2128,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // 1 hour
-     * 'previewTokenDuration' => 3600,
+     * ->previewTokenDuration(3600)
      * ```
      * ```shell Environment Override
      * # 1 hour
@@ -2177,7 +2177,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // 2 weeks
-     * 'purgePendingUsersDuration' => 1209600,
+     * ->purgePendingUsersDuration(1209600)
      * ```
      * ```shell Environment Override
      * # 2 weeks
@@ -2199,7 +2199,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // 1 week
-     * 'purgeStaleUserSessionDuration' => 604800,
+     * ->purgeStaleUserSessionDuration(604800)
      * ```
      * ```shell Environment Override
      * # 1 week
@@ -3011,7 +3011,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // 3 hours
-     * 'userSessionDuration' => 10800,
+     * ->userSessionDuration(10800)
      * ```
      * ```shell Environment Override
      * # 3 hours
@@ -3053,7 +3053,7 @@ class GeneralConfig extends BaseConfig
      * ::: code
      * ```php Static Config
      * // 1 hour
-     * 'verificationCodeDuration' => 3600,
+     * ->verificationCodeDuration(3600)
      * ```
      * ```shell Environment Override
      * # 1 hour

diff --git a/src/config/app.php b/src/config/app.php
@@ -3,7 +3,7 @@
 return [
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
-    'version' => '4.4.15',
+    'version' => '4.4.16',
     'schemaVersion' => '4.4.0.4',
     'minVersionRequired' => '3.7.11',
     'basePath' => dirname(__DIR__), // Defines the @app alias

diff --git a/src/console/controllers/SetupController.php b/src/console/controllers/SetupController.php
@@ -282,7 +282,7 @@ public function actionDbCreds(): int
 
         if (!$this->password && $this->interactive) {
             $envPassword = App::env('CRAFT_DB_PASSWORD');
-            if ($envPassword && $this->confirm('Use the password provided by $DB_PASSWORD?', true)) {
+            if ($envPassword && $this->confirm('Use the password provided by $CRAFT_DB_PASSWORD?', true)) {
                 $this->password = $envPassword;
             } else {
                 $this->stdout('Database password: ');

diff --git a/src/controllers/AssetsController.php b/src/controllers/AssetsController.php
@@ -1108,19 +1108,23 @@ public function actionGenerateTransform(?int $transformId = null): Response
             if ($transformId) {
                 $transformer = Craft::createObject(ImageTransformer::class);
                 $transformIndexModel = $transformer->getTransformIndexModelById($transformId);
-                $assetId = $transformIndexModel->assetId;
-                $transform = $transformIndexModel->getTransform();
+                $assetId = $transformIndexModel?->assetId;
+                $transform = $transformIndexModel?->getTransform();
             } else {
                 $assetId = $this->request->getRequiredBodyParam('assetId');
                 $handle = $this->request->getRequiredBodyParam('handle');
                 $transform = ImageTransforms::normalizeTransform($handle);
-                $transformer = $transform->getImageTransformer();
+                $transformer = $transform?->getImageTransformer();
             }
         } catch (\Exception $exception) {
             Craft::$app->getErrorHandler()->logException($exception);
             throw new ServerErrorHttpException('Image transform cannot be created.', 0, $exception);
         }
 
+        if (!$transform || !$transformer) {
+            throw new NotFoundHttpException();
+        }
+
         $asset = Asset::findOne(['id' => $assetId]);
 
         if (!$asset) {

diff --git a/src/controllers/LivePreviewController.php b/src/controllers/LivePreviewController.php
@@ -36,16 +36,12 @@ class LivePreviewController extends Controller
      */
     public function beforeAction($action): bool
     {
-        if (!parent::beforeAction($action)) {
-            return false;
-        }
-
         // Mark this as a Live Preview request
         if ($action->id === 'preview') {
             $this->request->setIsLivePreview(true);
         }
 
-        return true;
+        return parent::beforeAction($action);
     }
 
     /**

diff --git a/src/db/QueryBatcher.php b/src/db/QueryBatcher.php
@@ -43,10 +43,20 @@ public function __construct(
     public function count(): int
     {
         try {
-            return $this->query->count(db: $this->db);
+            $count = $this->query->count(db: $this->db);
         } catch (QueryAbortedException) {
             return 0;
         }
+
+        // Query::count() doesn't take the offset and limit into account
+        if (isset($this->query->offset)) {
+            $count = max($count - (int)$this->query->offset, 0);
+        }
+        if (isset($this->query->limit)) {
+            $count = min((int)$this->query->limit, $count);
+        }
+
+        return $count;
     }
 
     /**

diff --git a/src/elements/Address.php b/src/elements/Address.php
@@ -303,6 +303,18 @@ public function getOwner(): ?ElementInterface
         return $this->_owner;
     }
 
+    /**
+     * Sets the owner element.
+     *
+     * @param ElementInterface|null $owner
+     * @since 4.4.16
+     */
+    public function setOwner(?ElementInterface $owner): void
+    {
+        $this->_owner = $owner;
+        $this->ownerId = $owner?->id;
+    }
+
     /**
      * @inheritdoc
      */

diff --git a/src/elements/MatrixBlock.php b/src/elements/MatrixBlock.php
@@ -356,7 +356,7 @@ public function getOwner(): ElementInterface
     public function setOwner(?ElementInterface $owner = null): void
     {
         $this->_owner = $owner;
-        $this->ownerId = $owner->id;
+        $this->ownerId = $owner?->id;
     }
 
     /**

diff --git a/src/elements/User.php b/src/elements/User.php
@@ -18,6 +18,7 @@
 use craft\elements\actions\UnsuspendUsers;
 use craft\elements\conditions\ElementConditionInterface;
 use craft\elements\conditions\users\UserCondition;
+use craft\elements\db\AddressQuery;
 use craft\elements\db\ElementQueryInterface;
 use craft\elements\db\UserQuery;
 use craft\events\AuthenticateUserEvent;
@@ -474,6 +475,11 @@ public static function eagerLoadingMap(array $sourceElements, string $handle): a
             return [
                 'elementType' => Address::class,
                 'map' => $map,
+                'createElement' => function(AddressQuery $query, array $result, self $source) {
+                    // set the addresses' owners to the source user elements
+                    // (must get set before behaviors - see https://github.com/craftcms/cms/issues/13400)
+                    return $query->createElement(['owner' => $source] + $result);
+                },
             ];
         }
 

diff --git a/src/fields/Categories.php b/src/fields/Categories.php
@@ -130,13 +130,6 @@ protected function inputHtml(mixed $value, ?ElementInterface $element = null): s
         return parent::inputHtml($value, $element);
     }
 
-    public function getEagerLoadingMap(array $sourceElements): array|null|false
-    {
-        $map = parent::getEagerLoadingMap($sourceElements);
-        $map['criteria']['orderBy'] = ['structureelements.lft' => SORT_ASC];
-        return $map;
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/src/fields/Matrix.php b/src/fields/Matrix.php
@@ -801,27 +801,29 @@ public function validateBlocks(ElementInterface $element): void
             $blocks = $value->all();
         }
 
-        $allBlocksValidate = true;
-        $scenario = $element->getScenario();
+        if ($value instanceof MatrixBlockQuery) {
+            $allBlocksValidate = true;
+            $scenario = $element->getScenario();
 
-        foreach ($blocks as $i => $block) {
-            /** @var MatrixBlock $block */
-            if (
-                $scenario === Element::SCENARIO_ESSENTIALS ||
-                ($block->enabled && $scenario === Element::SCENARIO_LIVE)
-            ) {
-                $block->setScenario($scenario);
-            }
+            foreach ($blocks as $i => $block) {
+                /** @var MatrixBlock $block */
+                if (
+                    $scenario === Element::SCENARIO_ESSENTIALS ||
+                    ($block->enabled && $scenario === Element::SCENARIO_LIVE)
+                ) {
+                    $block->setScenario($scenario);
+                }
 
-            if (!$block->validate()) {
-                $element->addModelErrors($block, "$this->handle[$i]");
-                $allBlocksValidate = false;
+                if (!$block->validate()) {
+                    $element->addModelErrors($block, "$this->handle[$i]");
+                    $allBlocksValidate = false;
+                }
             }
-        }
 
-        if (!$allBlocksValidate) {
-            // Just in case the blocks weren't already cached
-            $value->setCachedResult($blocks);
+            if (!$allBlocksValidate) {
+                // Just in case the blocks weren't already cached
+                $value->setCachedResult($blocks);
+            }
         }
 
         if (

diff --git a/src/fields/conditions/EmptyFieldConditionRule.php b/src/fields/conditions/EmptyFieldConditionRule.php
@@ -22,14 +22,6 @@ class EmptyFieldConditionRule extends BaseConditionRule implements FieldConditio
      */
     public string $operator = self::OPERATOR_NOT_EMPTY;
 
-    /**
-     * @inheritdoc
-     */
-    public static function supportsProjectConfig(): bool
-    {
-        return true;
-    }
-
     /**
      * @inheritdoc
      */