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

Merge branch 'master' into inflextor_fixes

Browse Source
This commit is contained in:
Alexander Makarov
2021-05-06 02:24:38 +03:00
committed by GitHub
parent 9c8f653554 3a58026359
commit 1646a135dc
16 changed files with 150 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/BaseYii.php
View File

@ -93,7 +93,7 @@ class BaseYii
*/
public static function getVersion()
{
return '2.0.42-dev';
return '2.0.43-dev';
}
/**

39
framework/CHANGELOG.md
View File

@ -1,31 +1,38 @@
Yii Framework 2 Change Log
==========================
2.0.42 under development
2.0.43 under development
------------------------
- Bug #18323: Fix client validation of RadioList when there are disabled items (toir427)
- Enh #18534: Added `prepareSearchQuery` property in `yii\rest\IndexAction` (programmis)
- Enh #18566: Throw the original exception when `yii\web\Controller::bindInjectedParams()` catches HttpException (pigochu)
- Bug #18585: Fix `yii\validators\EmailValidator` to handle an edge case where `IDN` is enabled, but fails ascii conversion for valid email addresses (ihitbuttons)
- Bug #18574: Fix `yii\web\DbSession` to use the correct db if strict mode is used (Mignar)
- no changes in this release.
2.0.42 May 05, 2021
-------------------
- Bug #14343: Fix `yii\test\ActiveFixture` to use model's DB connection instead of the default one (margori, bizley)
- Bug #17174: Fix `yii\db\BaseActiveRecord::unlink()` to not ignore `on` conditions in `via` relations (bizley)
- Bug #17203: Fix `yii\db\Connection` to persist customized `queryBuilder` configuration after the `close()` → `open()` cycle (silverfire)
- Bug #17479: Fix `yii\grid\ActionColumn` to render icons when no glyphicons are available (simialbi)
- Bug #17631: Fix `yii\widgets\BaseListView` to properly render custom summary (sjaakp, bizley)
- Bug #18323: Fix client validation of RadioList when there are disabled items (toir427)
- Bug #18325: Fix `yii\db\pgsql\Schema` to respect non-default PgSQL schema name for data types (theonedemon, silverfire)
- Bug #18526: Fix `yii\caching\DbCache` to work with MSSQL, add `normalizeTableRowData()` to `yii\db\mssql\QueryBuilder::upsert()` (darkdef)
- Bug #18544: Fix `yii\validators\NumberValidator` to disallow values with whitespaces (bizley)
- Bug #18552: Fix `yii\data\SqlDataProvider` to properly handle SQL with `ORDER BY` clause (bizley)
- Bug #17174: Fix `yii\db\BaseActiveRecord::unlink()` to not ignore `on` conditions in `via` relations (bizley)
- Bug #18557: Fix `yii\data\ActiveDataProvider` to handle DB connection configuration of different type than just `yii\db\Connection` (bizley)
- Bug #18526: Fix `yii\caching\DbCache` to work with MSSQL, add `normalizeTableRowData()` to `yii\db\mssql\QueryBuilder::upsert()` (darkdef)
- Bug #14343: Fix `yii\test\ActiveFixture` to use model's DB connection instead of the default one (margori, bizley)
- Bug #17631: Fix `yii\widgets\BaseListView` to properly render custom summary (sjaakp, bizley)
- Bug #17203: Fix `yii\db\Connection` to persist customized `queryBuilder` configuration after the `close()` → `open()` cycle (silverfire)
- Bug #18325: Fix `yii\db\pgsql\Schema` to respect non-default PgSQL schema name for data types (theonedemon, silverfire)
- Bug #18593: Fix setting the `maxlength` attribute for `Html::activeInput()` and `Html::activeTextArea()` based on `length` parameter of validator (BSCheshir)
- Bug #18592: Fix `yii\db\Command::getRawSql()` to not replace query params in invalid places (sartor)
- Bug #18574: Fix `yii\web\DbSession` to use the correct db if strict mode is used (Mignar)
- Bug #18585: Fix `yii\validators\EmailValidator` to handle an edge case where `IDN` is enabled, but fails ascii conversion for valid email addresses (ihitbuttons)
- Bug #18590: Fix `yii\web\UrlManager` to instantiate cache only when it's actually needed (bizley)
- Enh #18569: Add `NumberValidator::$allowArray` (raidkon)
- Bug #18592: Fix `yii\db\Command::getRawSql()` to not replace query params in invalid places (sartor)
- Bug #18593: Fix setting the `maxlength` attribute for `Html::activeInput()` and `Html::activeTextArea()` based on `length` parameter of validator (BSCheshir)
- Bug #18604: Function alterColumn for MSSQL build incorrect query with default values `NULL` and other expressions (darkdef)
- Bug #18613: Do not call static methods non-statically in `BaseActiveRecord` (samdark)
- Bug #18619: Do not modify `yii\web\Cookie::$path` on `yii\web\Response::sendCookies()` (mikk150)
- Bug #18604: Function alterColumn for MSSQL build incorrect query with default values `NULL` and other expressions (darkdef)
- Bug #18624: Fix `yii\di\Container` to properly resolve dependencies in case of PHP 8 union types (bizley)
- Enh #18534: Add `prepareSearchQuery` property in `yii\rest\IndexAction` (programmis)
- Enh #18566: Throw the original exception when `yii\web\Controller::bindInjectedParams()` catches HttpException (pigochu)
- Enh #18569: Add `NumberValidator::$allowArray` (raidkon)
2.0.41.1 March 04, 2021

16
framework/caching/DbCache.php
View File

@ -86,6 +86,7 @@ class DbCache extends Cache
protected $isVarbinaryDataField;
/**
* Initializes the DbCache component.
* This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
@ -297,9 +298,8 @@ class DbCache extends Cache
}
/**
* @return bool
*
* Checking Mssql: if field is varbinary - return true
* @return bool whether field is MSSQL varbinary
* @since 2.0.42
*/
protected function isVarbinaryDataField()
{
@ -311,8 +311,8 @@ class DbCache extends Cache
}
/**
* @return string
* Returning `data` field name with converting for usage in MSSQL (if needs)
* @return string `data` field name converted for usage in MSSQL (if needed)
* @since 2.0.42
*/
protected function getDataFieldName()
{
@ -320,10 +320,8 @@ class DbCache extends Cache
}
/**
* @param $value
* @return PdoValue
*
* Return PdoValue or direct $value for usage in MSSQL
* @return PdoValue PdoValue or direct $value for usage in MSSQL
* @since 2.0.42
*/
protected function getDataFieldValue($value)
{

1
framework/classes.php
View File

@ -174,6 +174,7 @@ return [
'yii\db\cubrid\Schema' => YII2_PATH . '/db/cubrid/Schema.php',
'yii\db\cubrid\conditions\LikeConditionBuilder' => YII2_PATH . '/db/cubrid/conditions/LikeConditionBuilder.php',
'yii\db\mssql\ColumnSchema' => YII2_PATH . '/db/mssql/ColumnSchema.php',
'yii\db\mssql\ColumnSchemaBuilder' => YII2_PATH . '/db/mssql/ColumnSchemaBuilder.php',
'yii\db\mssql\DBLibPDO' => YII2_PATH . '/db/mssql/DBLibPDO.php',
'yii\db\mssql\PDO' => YII2_PATH . '/db/mssql/PDO.php',
'yii\db\mssql\QueryBuilder' => YII2_PATH . '/db/mssql/QueryBuilder.php',

4
framework/db/Connection.php
View File

@ -429,10 +429,8 @@ class Connection extends Component
* Is used to restore a QueryBuilder configuration after the connection close/open cycle.
*
* @see restoreQueryBuilderConfiguration()
* @since 2.0.42
*/
private $_queryBuilderConfigurations = [];
/**
* @var Transaction the currently active transaction
*/
@ -892,8 +890,6 @@ class Connection extends Component
/**
* Restores custom QueryBuilder configuration after the connection close/open cycle
*
* @since 2.0.42
*/
private function restoreQueryBuilderConfiguration()
{

13
framework/db/mssql/ColumnSchemaBuilder.php
View File

@ -13,6 +13,10 @@ use yii\db\Expression;
/**
* ColumnSchemaBuilder is the schema builder for MSSQL databases.
*
* @property-read string|null $checkValue The `CHECK` constraint for the column. This property is read-only.
* @property-read string|Expression|null $defaultValue Default value of the column. This property is
* read-only.
*
* @author Valerii Gorbachev <darkdef@gmail.com>
* @since 2.0.42
*/
@ -20,6 +24,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
{
protected $format = '{type}{length}{notnull}{unique}{default}{check}{append}';
/**
* Builds the full string for the column's schema.
* @return string
@ -36,7 +41,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
}
/**
* Changes default format string to MSSQL ALTER COMMAND
* Changes default format string to MSSQL ALTER COMMAND.
*/
public function setAlterColumnFormat()
{
@ -45,7 +50,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
/**
* Getting the `Default` value for constraint
* @return string|Expression|null
* @return string|Expression|null default value of the column.
*/
public function getDefaultValue()
{
@ -58,7 +63,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
/**
* Get the `Check` value for constraint
* @return string|null
* @return string|null the `CHECK` constraint for the column.
*/
public function getCheckValue()
{
@ -66,7 +71,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
}
/**
* @return bool
* @return bool whether the column values should be unique. If this is `true`, a `UNIQUE` constraint will be added.
*/
public function isUnique()
{

5
framework/di/Container.php
View File

@ -524,7 +524,10 @@ class Container extends Component
if (PHP_VERSION_ID >= 80000) {
$c = $param->getType();
$isClass = $c !== null && !$param->getType()->isBuiltin();
$isClass = false;
if ($c instanceof ReflectionNamedType) {
$isClass = !$c->isBuiltin();
}
} else {
try {
$c = $param->getClass();

1
framework/validators/NumberValidator.php
View File

@ -29,7 +29,6 @@ class NumberValidator extends Validator
* @since 2.0.42
*/
public $allowArray = false;
/**
* @var bool whether the attribute value can only be an integer. Defaults to false.
*/

11
framework/web/IdentityInterface.php
View File

@ -43,6 +43,13 @@ namespace yii\web;
* }
* ```
*
* In some situations not all of these methods are required to be implemented.
* For example, if your application is a pure stateless RESTful application,
* you would only need to implement [[yii\web\IdentityInterface::findIdentityByAccessToken()|findIdentityByAccessToken()]]
* and [[yii\web\IdentityInterface::getId()|getId()]] while leaving all other methods with an empty body.
* Or if your application uses session only authentication, you would need to implement all the methods
* except [[yii\web\IdentityInterface::findIdentityByAccessToken()|findIdentityByAccessToken()]].
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
@ -87,7 +94,7 @@ interface IdentityInterface
* Make sure to invalidate earlier issued authKeys when you implement force user logout, password change and
* other scenarios, that require forceful access revocation for old sessions.
*
* @return string a key that is used to check the validity of a given identity ID.
* @return string|null a key that is used to check the validity of a given identity ID.
* @see validateAuthKey()
*/
public function getAuthKey();
@ -96,7 +103,7 @@ interface IdentityInterface
* Validates the given auth key.
*
* @param string $authKey the given auth key
* @return bool whether the given auth key is valid.
* @return bool|null whether the given auth key is valid.
* @see getAuthKey()
*/
public function validateAuthKey($authKey);

2
framework/web/Request.php
View File

@ -36,7 +36,7 @@ use yii\validators\IpValidator;
* is not given. This property is read-only.
* @property-read string|null $authUser The username sent via HTTP authentication, `null` if the username is
* not given. This property is read-only.
* @property string $baseUrl The relative URL for the application (usually with a leading slash).
* @property string $baseUrl The relative URL for the application.
* @property array $bodyParams The request parameters given in the request body.
* @property-read string $contentType Request content-type. Null is returned if this information is not
* available. This property is read-only.