PHP 8.1 trim(): Passing null to parameter yiisoft#1 ($string) of type…

… string is deprecated
uaoleg · Jan 8, 2023 · c91b9e1 · c91b9e1
1 parent 7ed855c
commit c91b9e1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/framework/db/QueryTrait.php b/framework/db/QueryTrait.php
@@ -305,7 +305,7 @@ protected function isEmpty($value)
 
     /**
      * Sets the ORDER BY part of the query.
-     * @param string|array|ExpressionInterface $columns the columns (and the directions) to be ordered by.
+     * @param string|array|ExpressionInterface|null $columns the columns (and the directions) to be ordered by.
      * Columns can be specified in either a string (e.g. `"id ASC, name DESC"`) or an array
      * (e.g. `['id' => SORT_ASC, 'name' => SORT_DESC]`).
      *
@@ -358,12 +358,14 @@ public function addOrderBy($columns)
     /**
      * Normalizes format of ORDER BY data.
      *
-     * @param array|string|ExpressionInterface $columns the columns value to normalize. See [[orderBy]] and [[addOrderBy]].
+     * @param array|string|ExpressionInterface|null $columns the columns value to normalize. See [[orderBy]] and [[addOrderBy]].
      * @return array
      */
     protected function normalizeOrderBy($columns)
     {
-        if ($columns instanceof ExpressionInterface) {
+        if (empty($columns)) {
+            return [];
+        } elseif ($columns instanceof ExpressionInterface) {
             return [$columns];
         } elseif (is_array($columns)) {
             return $columns;