From 5f313372e94eb95f8dfd49764528eb979765bf02 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Thu, 4 Apr 2024 14:12:45 +0300 Subject: [PATCH] use new Yii Arrays --- composer.json | 2 +- src/Column/Base/HeaderContext.php | 2 +- src/GridView.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f966e11dc..03a704cee 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "ext-json": "*", "ext-mbstring": "*", "psr/container": "^1.0|^2.0", - "yiisoft/arrays": "^2.0|^3.0", + "yiisoft/arrays": "^3.1", "yiisoft/data": "dev-master", "yiisoft/factory": "^1.0", "yiisoft/friendly-exception": "^1.0", diff --git a/src/Column/Base/HeaderContext.php b/src/Column/Base/HeaderContext.php index e777a8585..b59b625ba 100644 --- a/src/Column/Base/HeaderContext.php +++ b/src/Column/Base/HeaderContext.php @@ -157,7 +157,7 @@ private function getLinkSortValue( } return OrderHelper::arrayToString( - ArrayHelper::replaceKey($resultOrder, $property, $originalProperty) + ArrayHelper::renameKey($resultOrder, $property, $originalProperty) ); } diff --git a/src/GridView.php b/src/GridView.php index d61b6b2c4..8cbcd65e2 100644 --- a/src/GridView.php +++ b/src/GridView.php @@ -682,7 +682,7 @@ protected function prepareOrder(array &$order): void foreach ($columns as $i => $column) { if ($renderers[$i] instanceof OverrideOrderFieldsColumnInterface) { foreach ($renderers[$i]->getOverrideOrderFields($column) as $from => $to) { - $order = ArrayHelper::replaceKey($order, $from, $to); + $order = ArrayHelper::renameKey($order, $from, $to); } } }