Skip to content

Commit c32d24c

Browse files
samdarksamdark
committed
Revert "release version 2.0.54"
This reverts commit 00363cb.
1 parent 454874e commit c32d24c

File tree

5 files changed

+39
-45
lines changed

5 files changed

+39
-45
lines changed

‎framework/BaseYii.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BaseYii
9999
*/
100100
public static function getVersion()
101101
{
102-
return '2.0.54';
102+
return '2.0.54-dev';
103103
}
104104

105105
/**

‎framework/CHANGELOG.md‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,89 @@
11
Yii Framework 2 Change Log
22
==========================
33

4-
2.0.54 November 23, 2025
4+
2.0.54 under development
55
------------------------
66

7-
- Bug #19506: Fix `@property` annotations in `yii\console\widgets\Table`, `yii\di\Container` and `yii\web\Session` (mspirkov)
8-
- Bug #19655: Fix `LinkPager::getPageRange` when `maxButtons` is 2 (mspirkov)
7+
- Bug #20542: Fix `Formatter` working with more complex ICU unit data structure (OndrejVasicek)
8+
- Bug #20483: Fix `CompositeAuth` making bad assumptions on `AuthInterface` implementations (sammousa)
99
- Bug #20432: Fix PHPStan/Psalm annotations for `ActiveQuery::asArray` (mspirkov)
1010
- Bug #20437: Fix PHPStan/Psalm annotations for `BaseArrayHelper::merge` (mspirkov)
11-
- Bug #20447: Fix behavior for `yii\web\Controller::bindActionParams` around `mixed` type (chriscpty)
11+
- Enh #20434: Add PHPStan/Psalm annotations for `hasMany` and `hasOne` methods (mspirkov)
12+
- Enh #20433: Add PHPStan/Psalm annotations for some controllers methods: `beforeAction`, `afterAction` and `bindActionParams` (mspirkov)
13+
- Enh #20442: Add PHPStan/Psalm annotations for `yii\base\Controller` methods: `runAction`, `run`, `render`, `renderPartial` and `renderFile` (mspirkov)
1214
- Bug #20453: Fix PHPStan/Psalm types in `yii\web\View` (mspirkov)
15+
- Enh #20461: Add PHPStan/Psalm annotations for `yii\filters\auth\AuthInterface` (mspirkov)
1316
- Bug #20459: Fix return type in `RequestParserInterface::parse` (mspirkov)
1417
- Bug #20475: Fix `Formatter` class `asScientific()` method for PHP `8.5` `sprintf` precision change (`6` to `0`) (terabytesoftw)
15-
- Bug #20479: Fix issue with MSSQL related to char and nchar (craiglondon)
1618
- Bug #20482: Fix deprecation of `ReflectionMethod::setAccessible()` in PHP `8.5` (terabytesoftw)
17-
- Bug #20483: Fix `CompositeAuth` making bad assumptions on `AuthInterface` implementations (sammousa)
18-
- Bug #20485: Fix error `Cannot unset string offsets` in `yii\di\Instance:ensure(['__class' => ...], 'some\class\name')` (mspirkov)
19-
- Bug #20489: Replace deprecated `strftime` with `date` in `YiiRequirementChecker` (mspirkov)
19+
- Enh #20480: Add PHPStan/Psalm annotations for `ServiceLocator::get` (mspirkov)
20+
- Bug #20447: Fix behavior for `yii\web\Controller::bindActionParams` around `mixed` type (chriscpty)
21+
- Bug #20479: Fix issue with MSSQL related to char and nchar (craiglondon)
2022
- Bug #20492: Fix deprecation of `finfo_close()` in PHP `8.5` by conditionally closing the resource (terabytesoftw)
21-
- Bug #20494: Fix `PHPdoc`, add `PHPStan/Psalm` annotations for `authMethods` property in `CompositeAuth` class (terabytesoftw)
2223
- Bug #20495: Fix behavior when resetting sequence in `QueryBuilder` for `MSSQL` (achretien)
24+
- Bug #20489: Replace deprecated `strftime` with `date` in `YiiRequirementChecker` (mspirkov)
25+
- Bug #20494: Fix `PHPdoc`, add `PHPStan/Psalm` annotations for `authMethods` property in `CompositeAuth` class (terabytesoftw)
26+
- Bug #20485: Fix error `Cannot unset string offsets` in `yii\di\Instance:ensure(['__class' => ...], 'some\class\name')` (mspirkov)
27+
- Enh #20047: Throw exception when fixture not found rather than ignoring (borgou)
28+
- Enh #20505: `ArrayDataProvider` key handling with flexible path support (fetus-hina)
2329
- Bug #20508: Fix PHPDoc, add PHPStan/Psalm annotations for `yii\web\CookieCollection::getIterator`. Add missing `@property` annotation in `yii\base\Model` (mspirkov)
2430
- Bug #20513: Fix code examples in PHPDoc (mspirkov)
31+
- Enh #20514: Add `@property` annotations for `yii\console\Controller` (mspirkov)
2532
- Bug #20515: Fix `@param` annotations in `BetweenColumnsCondition`, `InCondition` and `LikeCondition` (mspirkov)
2633
- Bug #20516: Fix `@template` annotations in `ActiveRecord` (mspirkov)
34+
- Bug #19506: Fix `@property` annotations in `yii\console\widgets\Table`, `yii\di\Container` and `yii\web\Session` (mspirkov)
35+
- Enh #20525, #20529, #20629: Add `@template` annotations for all actions (mspirkov)
2736
- Bug #20524: Fix PHPStan/Psalm annotations in `Yii::createObject` (mspirkov)
2837
- Bug #20530: Fix notice "Object of class DateTimeImmutable could not be converted to int" in `CookieCollection::has` (mspirkov)
2938
- Bug #20532: Add missing `return` statements in `CacheController::actionFlushSchema`, `FixtureController::actionUnload`, `HelpController::actionIndex` and `ServeController::actionIndex` (mspirkov)
39+
- Bug #19655: Fix `LinkPager::getPageRange` when `maxButtons` is 2 (mspirkov)
40+
- Enh #20539: Update minimum PHP version requirement from `7.3` to `7.4` (terabytesoftw)
3041
- Bug #20541: Remove deprecated caching components: `XCache` and `ZendDataCache`, and update related tests and documentation (terabytesoftw)
31-
- Bug #20542: Fix `Formatter` working with more complex ICU unit data structure (OndrejVasicek)
3242
- Bug #20548: Fix PHP `8.5` `null` array offset deprecation warnings (terabytesoftw)
33-
- Bug #20569: Fix `@param` annotation for `$default` in `HeaderCollection::get` (mspirkov)
43+
- New #19526: Add the `convertIniSizeToBytes` method to `BaseStringHelper` (mspirkov)
3444
- Bug #20570: Fix `@var` annotation for `UrlManager::$cache` (mspirkov)
3545
- Bug #20571: Fix `@var` annotation for `yii\web\Response::$stream` (mspirkov)
46+
- Bug #20569: Fix `@param` annotation for `$default` in `HeaderCollection::get` (mspirkov)
3647
- Bug #20576: Fix `@var` annotation for `StringValidator::$length` (mspirkov)
48+
- Enh #20579: Add PHPStan/Psalm annotations for `HeaderCollection::get` (mspirkov)
3749
- Bug #20583: Fix return value in `Request::getServerPort` (mspirkov)
3850
- Bug #20585: Fix `@return` annotation for `CompositeUrlRule::createRules()` (mspirkov)
3951
- Bug #20587: Fix `@var` annotation for `yii\rbac\Item::$ruleName` (mspirkov)
4052
- Bug #20589: Fix `@var` annotations for `yii\rbac\DbManager` properties (mspirkov)
53+
- Bug #20599: Fix `@return` annotation for `ConditionInterface::fromArrayDefinition()` (mspirkov)
54+
- Enh #20591: Add PHPStan/Psalm annotations for `yii\rbac\BaseManager::getItems()` (mspirkov)
4155
- Bug #20594: Fix `@return` annotation for `Instance::get()` (mspirkov)
4256
- Bug #20595: Fix `@return` annotation for `BaseHtml::getAttributeValue()` (mspirkov)
43-
- Bug #20599: Fix `@return` annotation for `ConditionInterface::fromArrayDefinition()` (mspirkov)
44-
- Bug #20600: Fix `@var` annotation for `yii\test\FileFixtureTrait::$dataFile` (mspirkov)
45-
- Bug #20604: Fix `@var` annotation for `yii\db\Command::$pdoStatement` (mspirkov)
4657
- Bug #20605: Fix return value in `SerialColumn::renderDataCellContent()` (mspirkov)
58+
- Bug #20604: Fix `@var` annotation for `yii\db\Command::$pdoStatement` (mspirkov)
59+
- Bug #20600: Fix `@var` annotation for `yii\test\FileFixtureTrait::$dataFile` (mspirkov)
60+
- Enh #20607: Add PHPStan/Psalm annotations for DB schemas (mspirkov)
4761
- Bug #20608: Fix `@return` annotations for `yii\rest\Serializer` methods (mspirkov)
4862
- Bug #20610: Fix `@var` annotation for `ActiveQueryTrait::$with` (mspirkov)
4963
- Bug #20611: Fix `@return` annotations for `yii\i18n\GettextMoFile` methods (mspirkov)
50-
- Bug #20617: Fix `@return` annotation for `DataColumn::getDataCellValue()` (mspirkov)
51-
- Bug #20618: Fix `@var` annotation for `yii\web\Response::$acceptMimeType` (mspirkov)
52-
- Bug #20619: Fix `@return` annotation for `yii\db\Query::prepare()` (mspirkov)
5364
- Bug #20620: Fix `@var` annotation for `RateLimiter::$user` (mspirkov)
65+
- Bug #20619: Fix `@return` annotation for `yii\db\Query::prepare()` (mspirkov)
66+
- Bug #20618: Fix `@var` annotation for `yii\web\Response::$acceptMimeType` (mspirkov)
67+
- Bug #20617: Fix `@return` annotation for `DataColumn::getDataCellValue()` (mspirkov)
5468
- Bug #20628: Fix `@return` annotations for `lastInsertId` methods in `yii\db\mssql` namespace (mspirkov)
5569
- Bug #20630: Fix `@var` annotations for `yii\web\CompositeUrlRule::$rules` and `yii\web\GroupUrlRule::$rules` (mspirkov)
5670
- Bug #20634: Fix PHPDoc annotations in `yii\db` namespace. Add PHPStan/Psalm annotations for `yii\db\SqlTokenizer::startsWithAnyLongest()` (mspirkov)
5771
- Bug #20636: Fix `@param` annotations for `$message` in logging methods (mspirkov)
5872
- Bug #20637: Fix PHPDoc annotations in `ActiveRelationTrait`. Add PHPStan/Psalm annotations for `$modelClass` in `ActiveQuery`, `ActiveQueryTrait` and `ActiveRelationTrait` (mspirkov)
5973
- Bug #20639: Add missing generics in `yii\web` namespace (mspirkov)
60-
- Bug #20640: Fix `@param` annotation for `$block` in `yii\console\Markdown::renderParagraph()` (mspirkov)
6174
- Bug #20645: Add missing generics in `yii\helpers` and `yii\test` namespaces. Fix PHPDoc annotations in `ArrayAccessTrait` (mspirkov)
62-
- Bug #20651: Add missing generics in `yii\filters` namespace (mspirkov)
75+
- Bug #20640: Fix `@param` annotation for `$block` in `yii\console\Markdown::renderParagraph()` (mspirkov)
76+
- Enh #20642: Pass `$model` and `$attribute` in Compare Validator's compareValue property closure (samuelrajan747)
77+
- Enh #20650: Add PHPStan/Psalm annotations for `yii\di\Container` (mspirkov)
6378
- Bug #20654: Add missing generics in `yii\db` namespace. Fix PHPDoc annotations in `yii\db\ArrayExpression` (mspirkov)
64-
- Bug #20658: Add missing generics in `yii\console`, `yii\captcha`, `yii\caching` and `yii\behaviors` namespaces (mspirkov)
79+
- Bug #20651: Add missing generics in `yii\filters` namespace (mspirkov)
6580
- Bug #20659: Fix PHP `8.5` `null` array offset deprecation warnings in `MariaDB` driver (terabytesoftw)
6681
- Bug #20665: Fix PHP `8.5` `null` array offset deprecation warnings in `yii\build\controllers\ReleaseController` class (terabytesoftw)
82+
- Bug #20658: Add missing generics in `yii\console`, `yii\captcha`, `yii\caching` and `yii\behaviors` namespaces (mspirkov)
6783
- Bug #20666: Add missing generics in `yii\base`, `yii\console`, `yii\filters` and `yii\web` namespaces (mspirkov)
68-
- Bug #20671: Fix PHPDoc annotations in `yii\base`, `yii\console`, `yii\web` and `yii\widgets` namespaces (mspirkov)
6984
- Bug #20673: Sanitize `null` bytes before `quoteValue()` on PHP 8.5+ in SQLite (terabytesoftw)
85+
- Bug #20671: Fix PHPDoc annotations in `yii\base`, `yii\console`, `yii\web` and `yii\widgets` namespaces (mspirkov)
7086
- Bug #20675: Add generics for all controllers (mspirkov)
71-
- Enh #20047: Throw exception when fixture not found rather than ignoring (borgou)
72-
- Enh #20433: Add PHPStan/Psalm annotations for some controllers methods: `beforeAction`, `afterAction` and `bindActionParams` (mspirkov)
73-
- Enh #20434: Add PHPStan/Psalm annotations for `hasMany` and `hasOne` methods (mspirkov)
74-
- Enh #20442: Add PHPStan/Psalm annotations for `yii\base\Controller` methods: `runAction`, `run`, `render`, `renderPartial` and `renderFile` (mspirkov)
75-
- Enh #20461: Add PHPStan/Psalm annotations for `yii\filters\auth\AuthInterface` (mspirkov)
76-
- Enh #20480: Add PHPStan/Psalm annotations for `ServiceLocator::get` (mspirkov)
77-
- Enh #20505: `ArrayDataProvider` key handling with flexible path support (fetus-hina)
78-
- Enh #20514: Add `@property` annotations for `yii\console\Controller` (mspirkov)
79-
- Enh #20525, #20529, #20629: Add `@template` annotations for all actions (mspirkov)
80-
- Enh #20539: Update minimum PHP version requirement from `7.3` to `7.4` (terabytesoftw)
81-
- Enh #20579: Add PHPStan/Psalm annotations for `HeaderCollection::get` (mspirkov)
82-
- Enh #20591: Add PHPStan/Psalm annotations for `yii\rbac\BaseManager::getItems()` (mspirkov)
83-
- Enh #20607: Add PHPStan/Psalm annotations for DB schemas (mspirkov)
84-
- Enh #20642: Pass `$model` and `$attribute` in Compare Validator's compareValue property closure (samuelrajan747)
85-
- Enh #20650: Add PHPStan/Psalm annotations for `yii\di\Container` (mspirkov)
86-
- New #19526: Add the `convertIniSizeToBytes` method to `BaseStringHelper` (mspirkov)
8787

8888

8989
2.0.53 June 27, 2025

‎framework/helpers/mimeExtensions.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -575,10 +575,6 @@
575575
],
576576
'application/vnd.spotfire.dxp' => 'dxp',
577577
'application/vnd.spotfire.sfs' => 'sfs',
578-
'application/vnd.sqlite3' => [
579-
'sqlite',
580-
'sqlite3',
581-
],
582578
'application/vnd.stardivision.calc' => 'sdc',
583579
'application/vnd.stardivision.draw' => 'sda',
584580
'application/vnd.stardivision.impress' => 'sdd',

‎framework/helpers/mimeTypes.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,6 @@
759759
'spq' => 'application/scvp-vp-request',
760760
'spx' => 'audio/ogg',
761761
'sql' => 'application/x-sql',
762-
'sqlite' => 'application/vnd.sqlite3',
763-
'sqlite3' => 'application/vnd.sqlite3',
764762
'src' => 'application/x-wais-source',
765763
'srt' => 'application/x-subrip',
766764
'sru' => 'application/sru+xml',

‎framework/validators/CompareValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class CompareValidator extends Validator
5757
*/
5858
public $compareAttribute;
5959
/**
60-
* @var mixed the constant value to be compared with or an anonymous function
60+
* @var mixed the constant value to be compared with or an anonymous function
6161
* that returns the constant value. When both this property and
6262
* [[compareAttribute]] are set, this property takes precedence.
6363
* The signature of the anonymous function should be as follows,

0 commit comments

Comments
 (0)