Merge branch '4.next' into 4.next-documentation

cakephp · Sep 26, 2021 · 1b06807 · 1b06807
2 parents 9e19697 + 7577655
commit 1b06807
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/MergeVariablesTrait.php b/MergeVariablesTrait.php
@@ -99,7 +99,7 @@ protected function _mergeProperty(string $property, array $parentClasses, array
      * @param array $current The current merged value.
      * @param array $parent The parent class' value.
      * @param bool $isAssoc Whether the merging should be done in associative mode.
-     * @return mixed The updated value.
+     * @return array The updated value.
      */
     protected function _mergePropertyData(array $current, array $parent, bool $isAssoc)
     {

diff --git a/Text.php b/Text.php
@@ -441,8 +441,8 @@ public static function wordWrap(string $text, int $width = 72, string $break = "
      */
     protected static function _wordWrap(string $text, int $width = 72, string $break = "\n", bool $cut = false): string
     {
+        $parts = [];
         if ($cut) {
-            $parts = [];
             while (mb_strlen($text) > 0) {
                 $part = mb_substr($text, 0, $width);
                 $parts[] = trim($part);
@@ -452,7 +452,6 @@ protected static function _wordWrap(string $text, int $width = 72, string $break
             return implode($break, $parts);
         }
 
-        $parts = [];
         while (mb_strlen($text) > 0) {
             if ($width >= mb_strlen($text)) {
                 $parts[] = trim($text);