Hacky fix for #15154 until yiisoft/yii2#20191 is fixed

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fixed a bug where element indexes’ “Date Created” columns were mislabeled as “Date Uploaded”. ([#15155](https://github.com/craftcms/cms/issues/15155))
 - Fixed a bug where the content pane had extra padding on pages without a meta sidebar.
+- Fixed a bug where reordered field layout tabs/elements weren’t getting saved. ([#15154](https://github.com/craftcms/cms/issues/15154))
 
 ## 5.2.0-beta.3 - 2024-06-04
 

bootstrap/bootstrap.php

@@ -193,6 +193,7 @@
 $regularIconsPath = $iconsPath . DIRECTORY_SEPARATOR . 'regular';
 $solidIconsPath = $iconsPath . DIRECTORY_SEPARATOR . 'solid';
 require $libPath . DIRECTORY_SEPARATOR . 'yii2' . DIRECTORY_SEPARATOR . 'Yii.php';
+require $libPath . DIRECTORY_SEPARATOR . 'yii2' . DIRECTORY_SEPARATOR . 'helpers' . DIRECTORY_SEPARATOR . 'ArrayHelper.php';
 require $srcPath . DIRECTORY_SEPARATOR . 'Craft.php';
 
 // Set aliases

lib/yii2/helpers/ArrayHelper.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * @link https://craftcms.com/
+ * @copyright Copyright (c) Pixel & Tonic, Inc.
+ * @license https://craftcms.github.io/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * @inheritdoc
+ */
+class ArrayHelper extends BaseArrayHelper
+{
+    public static function recursiveSort(array &$array, $sorter = null)
+    {
+        foreach ($array as &$value) {
+            if (is_array($value)) {
+                static::recursiveSort($value, $sorter);
+            }
+        }
+        unset($value);
+
+        if ($sorter === null) {
+            if (static::isIndexed($array)) {
+                // leave it alone for now, until https://github.com/yiisoft/yii2/issues/20191 is fixed
+                return $array;
+            }
+            $sorter = 'ksort';
+        }
+
+        call_user_func_array($sorter, [&$array]);
+
+        return $array;
+    }
+}

src/test/TestSetup.php

@@ -341,6 +341,7 @@ public static function configureCraft(): bool
         $srcPath = $repoRoot . '/src';
 
         require $libPath . '/yii2/Yii.php';
+        require $libPath . '/yii2/helpers/ArrayHelper.php';
         require $srcPath . '/Craft.php';
 
         // Set aliases