php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 06:37:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust changelog, correct phpdoc, minor code style fixes

Browse Source
This commit is contained in:
Alexander Makarov
2020-07-07 14:40:16 +03:00
parent d62590807d
commit 38f038175f
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
framework/CHANGELOG.md
View File

@ -4,32 +4,32 @@ Yii Framework 2 Change Log
2.0.36 under development 2.0.36 under development
------------------------ ------------------------
- Bug #18127: Add resolving DI references inside of arrays in dependencies (hiqsol) - Bug #18127: Resolve DI references inside of arrays in dependencies (hiqsol)
- Bug #18047: Fix colorization markers output in Table.php (cheeseq) - Bug #18047: Fix colorization markers output in console `Table` (cheeseq)
- Bug #18028: Fix division by zero exception in Table.php::calculateRowHeight (fourhundredfour) - Bug #18028: Fix division by zero exception in console `Table::calculateRowHeight()` (fourhundredfour)
- Enh #18019: Allow jQuery 3.5.0 to be installed (wouter90) - Enh #18019: Allow jQuery 3.5.0 to be installed (wouter90)
- Bug #18026: Fix `ArrayHelper::getValue()` did not work with `ArrayAccess` objects (mikk150) - Bug #18026: Fix `ArrayHelper::getValue()` did not work with `ArrayAccess` objects (mikk150)
- Enh #18048: Use `Instance::ensure()` to set `User::$accessChecker` (lav45) - Enh #18048: Use `Instance::ensure()` to set `User::$accessChecker` (lav45)
- Bug #18051: Fix missing support for custom validation method in EachValidator (bizley) - Bug #18051: Fix missing support for custom validation method in EachValidator (bizley)
- Enh #17722: Add action injection support (SamMousa, samdark, erickskrauch) - Enh #17722: Add action injection support (SamMousa, samdark, erickskrauch)
- Bug #18041: Fix RBAC migration for MSSQL (darkdef) - Bug #18041: Fix RBAC migration for MSSQL (darkdef)
- Bug #18081: Fix for PDO_DBLIB/MSSQL. Set flag ANSI_NULL_DFLT_ON to ON for current connect to DB (darkdef) - Bug #18081: Fix for PDO_DBLIB/MSSQL. Set flag `ANSI_NULL_DFLT_ON` to ON for current DB connection (darkdef)
- Bug #13828: Fix retrieving inserted data for a primary key of type uniqueidentifier for SQL Server 2005 or later (darkdef) - Bug #13828: Fix retrieving inserted data for a primary key of type uniqueidentifier for SQL Server 2005 or later (darkdef)
- Bug #17474: Fix retrieving inserted data for a primary key of type trigger for SQL Server 2005 or later (darkdef) - Bug #17474: Fix retrieving inserted data for a primary key of type trigger for SQL Server 2005 or later (darkdef)
- Bug #18001: Fix getting table metadata for tables `(` in their name (floor12) - Bug #18001: Fix getting table metadata for tables `(` in their name (floor12)
- Bug #18096: Fix InlineValidator with anonymous inline function not working well from EachValidator (trombipeti) - Bug #18096: Fix `InlineValidator` with anonymous inline function not working well from `EachValidator` (trombipeti)
- Enh #18083: Add `Controller::$request` and `$response` (brandonkelly) - Enh #18083: Add `Controller::$request` and `$response` (brandonkelly)
- Bug #18101: Fix behavior of OUTPUT INSERTED.* for SQL Server query: "insert default values"; correct MSSQL unit tests; turn off profiling echo message in migration test (darkdef) - Bug #18101: Fix behavior of `OUTPUT INSERTED.*` for SQL Server query: "insert default values"; correct MSSQL unit tests; turn off profiling echo message in migration test (darkdef)
- Bug #18105: Fix for old trigger in RBAC migration with/without prefixTable (darkdef) - Bug #18105: Fix for old trigger in RBAC migration with/without `prefixTable` (darkdef)
- Enh #18120: Include path to the log file into error message if `FileTarget::export` fails (uaoleg) - Enh #18120: Include the path to the log file into error message if `FileTarget::export` fails (uaoleg)
- Enh #15202: Add optional param `--silent-exit-on-exception` in `yii\console\Controller` (egorrishe) - Enh #15202: Add optional param `--silent-exit-on-exception` in `yii\console\Controller` (egorrishe)
- Bug #18110: Add quotes to return value of viewName in MSSQL schema. It is `[someView]` now (darkdef) - Bug #18110: Add quotes to return value of viewName in MSSQL schema. It is `[someView]` now (darkdef)
- Bug #17985: Convert migrationNamespaces to array if needed (darkdef) - Bug #17985: Convert migrationNamespaces to array if needed (darkdef)
- Bug #18031: HttpBasicAuth with auth callback now triggers login events same was as other authentication methods (samdark) - Bug #18031: `HttpBasicAuth` with auth callback now triggers login events same was as other authentication methods (samdark)
- Bug #18134: Expression as columnName should not be quoted in likeCondition (darkdef) - Bug #18134: `Expression` as `columnName` should not be quoted in `likeCondition` (darkdef)
- Bug #18147: Fixed parameters binding for MySQL when prepare emulation is off (rskrzypczak) - Bug #18147: Fix parameters binding for MySQL when prepare emulation is off (rskrzypczak)
- Enh #18151: Added `Mutex::isAcquired()` to check if lock is currently acquired (rhertogh) - Enh #18151: Add `Mutex::isAcquired()` to check if lock is currently acquired (rhertogh)
- Bug #18094: Support for composite file extension validation (darkdef) - Bug #18094: Add support for composite file extension validation (darkdef)
- Bug #18086: Fix accessing public properties of `ArrayAccess` via `ArrayHelper::getValue()` (samdark) - Bug #18086: Fix accessing public properties of `ArrayAccess` via `ArrayHelper::getValue()` (samdark)
- Bug #18051: Fix using `EachValidator` with custom validation function (bizley) - Bug #18051: Fix using `EachValidator` with custom validation function (bizley)

9
framework/base/Controller.php
View File

@ -9,6 +9,7 @@ namespace yii\base;
use Yii; use Yii;
use yii\di\Instance; use yii\di\Instance;
use yii\di\NotInstantiableException;
/** /**
* Controller is the base class for classes containing controller logic. * Controller is the base class for classes containing controller logic.
@ -65,12 +66,12 @@ class Controller extends Component implements ViewContextInterface
*/ */
public $action; public $action;
/** /**
* @var Request|array|string The request * @var Request|array|string The request.
* @since 2.0.36 * @since 2.0.36
*/ */
public $request = 'request'; public $request = 'request';
/** /**
* @var Response|array|string * @var Response|array|string The response.
* @since 2.0.36 * @since 2.0.36
*/ */
public $response = 'response'; public $response = 'response';
@ -553,8 +554,8 @@ class Controller extends Component implements ViewContextInterface
* @param array &$args The array of arguments for the action, this function may append items to it. * @param array &$args The array of arguments for the action, this function may append items to it.
* @param array &$requestedParams The array with requested params, this function may write specific keys to it. * @param array &$requestedParams The array with requested params, this function may write specific keys to it.
* @throws ErrorException when we cannot load a required service. * @throws ErrorException when we cannot load a required service.
* @throws \yii\base\InvalidConfigException Thrown when there is an error in the DI configuration. * @throws InvalidConfigException Thrown when there is an error in the DI configuration.
* @throws \yii\di\NotInstantiableException Thrown when a definition cannot be resolved to a concrete class * @throws NotInstantiableException Thrown when a definition cannot be resolved to a concrete class
* (for example an interface type hint) without a proper definition in the container. * (for example an interface type hint) without a proper definition in the container.
* @since 2.0.36 * @since 2.0.36
*/ */

4
framework/base/ErrorHandler.php
View File

@ -42,8 +42,8 @@ abstract class ErrorHandler extends Component
*/ */
public $exception; public $exception;
/** /**
* @var bool if TRUE - `handleException()` will finish script with `ExitCode::OK`. * @var bool if true - `handleException()` will finish script with `ExitCode::OK`.
* FALSE - `ExitCode::UNSPECIFIED_ERROR`. * false - `ExitCode::UNSPECIFIED_ERROR`.
* @since 2.0.36 * @since 2.0.36
*/ */
public $silentExitOnException; public $silentExitOnException;

4
framework/console/Controller.php
View File

@ -66,8 +66,8 @@ class Controller extends \yii\base\Controller
*/ */
public $help; public $help;
/** /**
* @var bool if TRUE - script finish with `ExitCode::OK` in case of exception. * @var bool if true - script finish with `ExitCode::OK` in case of exception.
* FALSE - `ExitCode::UNSPECIFIED_ERROR`. * false - `ExitCode::UNSPECIFIED_ERROR`.
* Default: `YII_ENV_TEST` * Default: `YII_ENV_TEST`
* @since 2.0.36 * @since 2.0.36
*/ */

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

@ -768,8 +768,8 @@ SQL;
return false; return false;
} }
$version2005orLater = version_compare($this->db->getSchema()->getServerVersion(), '9', '>='); $isVersion2005orLater = version_compare($this->db->getSchema()->getServerVersion(), '9', '>=');
$inserted = $version2005orLater ? $command->pdoStatement->fetch() : []; $inserted = $isVersion2005orLater ? $command->pdoStatement->fetch() : [];
$tableSchema = $this->getTableSchema($table); $tableSchema = $this->getTableSchema($table);
$result = []; $result = [];
@ -779,8 +779,13 @@ SQL;
break; break;
} }
// @see https://github.com/yiisoft/yii2/issues/13828 & https://github.com/yiisoft/yii2/issues/17474 // @see https://github.com/yiisoft/yii2/issues/13828 & https://github.com/yiisoft/yii2/issues/17474
$result[$name] = isset($inserted[$name]) ? $inserted[$name] : if (isset($inserted[$name])) {
(isset($columns[$name]) ? $columns[$name] : $tableSchema->columns[$name]->defaultValue); $result[$name] = $inserted[$name];
} elseif (isset($columns[$name])) {
$result[$name] = $columns[$name];
} else {
$result[$name] = $tableSchema->columns[$name]->defaultValue;
}
} }
return $result; return $result;

3
framework/mutex/Mutex.php
View File

@ -104,7 +104,8 @@ abstract class Mutex extends Component
* @return bool Returns true if currently acquired * @return bool Returns true if currently acquired
* @since 2.0.36 * @since 2.0.36
*/ */
public function isAcquired($name) { public function isAcquired($name)
{
return in_array($name, $this->_locks, true); return in_array($name, $this->_locks, true);
} }