php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-01 03:26:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19949 from uaoleg/patch-2

Browse Source 
PHP 8.1 trim(): Passing null to parameter #1 ($string) of type string is deprecated
This commit is contained in:
Bizley
2023-09-20 11:31:00 +02:00
committed by GitHub
parent 2995696db9 fd5c1bbf27
commit 7ae255cbd2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -7,6 +7,7 @@ Yii Framework 2 Change Log
- Bug #19925: Improved PHP version check when handling MIME types (schmunk42) - Bug #19925: Improved PHP version check when handling MIME types (schmunk42)
- Bug #19940: File Log writer without newline (terabytesoftw) - Bug #19940: File Log writer without newline (terabytesoftw)
- Bug #19951: Removed unneeded MIME file tests (schmunk42) - Bug #19951: Removed unneeded MIME file tests (schmunk42)
- Bug #19950: Fix `Query::groupBy(null)` causes error for PHP 8.1: `trim(): Passing null to parameter #1 ($string) of type string is deprecated`
2.0.49 August 29, 2023 2.0.49 August 29, 2023

4
framework/db/Query.php
View File

@ -1049,7 +1049,7 @@ PATTERN;
/** /**
* Sets the GROUP BY part of the query. * Sets the GROUP BY part of the query.
* @param string|array|ExpressionInterface $columns the columns to be grouped by. * @param string|array|ExpressionInterface|null $columns the columns to be grouped by.
* Columns can be specified in either a string (e.g. "id, name") or an array (e.g. ['id', 'name']). * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. ['id', 'name']).
* The method will automatically quote the column names unless a column contains some parenthesis * The method will automatically quote the column names unless a column contains some parenthesis
* (which means the column contains a DB expression). * (which means the column contains a DB expression).
@ -1067,7 +1067,7 @@ PATTERN;
{ {
if ($columns instanceof ExpressionInterface) { if ($columns instanceof ExpressionInterface) {
$columns = [$columns]; $columns = [$columns];
} elseif (!is_array($columns)) { } elseif (!is_array($columns) && !is_null($columns)) {
$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY); $columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
} }
$this->groupBy = $columns; $this->groupBy = $columns;