php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-10-30 18:17:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #20619: Fix @return annotation for yii\db\Query::prepare()

Browse Source
This commit is contained in:
Maksim Spirkov
2025-10-15 19:58:30 +03:00
committed by GitHub
parent 63fc248912
commit 3f445ad30e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/CHANGELOG.md
View File

@ -40,7 +40,7 @@ Yii Framework 2 Change Log
- Enh #20539: Update minimum PHP version requirement from `7.3` to `7.4` (terabytesoftw)
- Bug #20541: Remove deprecated caching components: `XCache` and `ZendDataCache`, and update related tests and documentation (terabytesoftw)
- Bug #20548: Fix PHP `8.5` `null` array offset deprecation warnings (terabytesoftw)
- Enh #19526: Add the `convertIniSizeToBytes` method to `BaseStringHelper` (mspirkov)
- New #19526: Add the `convertIniSizeToBytes` method to `BaseStringHelper` (mspirkov)
- Bug #20570: Fix `@var` annotation for `UrlManager::$cache` (mspirkov)
- Bug #20571: Fix `@var` annotation for `yii\web\Response::$stream` (mspirkov)
- Bug #20569: Fix `@param` annotation for `$default` in `HeaderCollection::get` (mspirkov)
@ -61,6 +61,7 @@ Yii Framework 2 Change Log
- Bug #20608: Fix `@return` annotations for `yii\rest\Serializer` methods (mspirkov)
- Bug #20610: Fix `@var` annotation for `ActiveQueryTrait::$with` (mspirkov)
- Bug #20611: Fix `@return` annotations for `yii\i18n\GettextMoFile` methods (mspirkov)
- Bug #20619: Fix `@return` annotation for `yii\db\Query::prepare()` (mspirkov)
- Bug #20618: Fix `@var` annotation for `yii\web\Response::$acceptMimeType` (mspirkov)
- Bug #20617: Fix `@return` annotation for `DataColumn::getDataCellValue()` (mspirkov)

2
framework/db/Query.php
View File

@ -167,7 +167,7 @@ class Query extends Component implements QueryInterface, ExpressionInterface
* This method is called by [[QueryBuilder]] when it starts to build SQL from a query object.
* You may override this method to do some final preparation work when converting a query into a SQL statement.
* @param QueryBuilder $builder
* @return $this a prepared query instance which will be used by [[QueryBuilder]] to build the SQL
* @return self a prepared query instance which will be used by [[QueryBuilder]] to build the SQL
*/
public function prepare($builder)
{