diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index f5c3280..5c46bb5 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -5,7 +5,7 @@ Yii Framework 2 Change Log ------------------------ - Bug #18323: Fix client validation of RadioList when there are disabled items (toir427) -- Enh #18534: Added `prepareSearchQuery` property in `yii\rest\IndexAction` (programmis) +- Enh #18534: Add `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) diff --git a/framework/caching/DbCache.php b/framework/caching/DbCache.php index 1b82305..f45c0ad 100644 --- a/framework/caching/DbCache.php +++ b/framework/caching/DbCache.php @@ -297,9 +297,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 +310,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 +319,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) { diff --git a/framework/db/Connection.php b/framework/db/Connection.php index c8fa416..9ecb213 100644 --- a/framework/db/Connection.php +++ b/framework/db/Connection.php @@ -429,7 +429,6 @@ 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 = []; @@ -892,8 +891,6 @@ class Connection extends Component /** * Restores custom QueryBuilder configuration after the connection close/open cycle - * - * @since 2.0.42 */ private function restoreQueryBuilderConfiguration() { diff --git a/framework/db/mssql/ColumnSchemaBuilder.php b/framework/db/mssql/ColumnSchemaBuilder.php index 35a8ac1..7188e45 100644 --- a/framework/db/mssql/ColumnSchemaBuilder.php +++ b/framework/db/mssql/ColumnSchemaBuilder.php @@ -36,7 +36,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 +45,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 +58,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 +66,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() {