Merge branch '4.x' of https://github.com/craftcms/cms into 5.x

# Conflicts: # .github/workflows/ci.yml # CHANGELOG.md
craftcms · Sep 5, 2024 · c7fe6c5 · c7fe6c5
2 parents 46c547f + 8f049c9
commit c7fe6c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft CMS 5
 
+## Unreleased
+
+- Fixed a bug where `craft\helpers\StringHelper::lines()` was returning an array of `Stringy\Stringy` objects, rather than strings.
+- Fixed styling issues with Template field layout UI elements’ selector labels.
+
 ## 5.4.1 - 2024-09-04
 
 - Fixed a bug where element chips within thumbnail views weren’t getting light gray backgrounds. ([#15649](https://github.com/craftcms/cms/issues/15649))

diff --git a/src/fieldlayoutelements/BaseUiElement.php b/src/fieldlayoutelements/BaseUiElement.php
@@ -55,7 +55,7 @@ public function selectorHtml(): string
             Html::endTag('div') . // .fld-element-icon
             Html::beginTag('div', ['class' => 'field-name']) .
             Html::beginTag('div', ArrayHelper::merge(
-                ['class' => 'fld-element-label'],
+                ['class' => ['fld-element-label']],
                 $this->selectorLabelAttributes(),
             )) .
             Html::tag('h4', Html::encode($label)) .

diff --git a/src/helpers/StringHelper.php b/src/helpers/StringHelper.php
@@ -915,13 +915,7 @@ public static function lineWrapAfterWord(string $str, int $limit): string
     public static function lines(string $str): array
     {
         $lines = BaseStringy::create($str)->lines();
-
-        foreach ($lines as $i => $line) {
-            $lines[$i] = $line;
-        }
-
-        /** @var string[] $lines */
-        return $lines;
+        return array_map(fn(BaseStringy $line) => (string)$line, $lines);
     }
 
     /**