Merge pull request #5766 from mongosoft/feature

apps/advanced/common/models/LoginForm.php

@@ -15,6 +15,7 @@ class LoginForm extends Model
 
     private $_user = false;
 
+
     /**
      * @inheritdoc
      */

apps/advanced/frontend/models/ResetPasswordForm.php

@@ -18,6 +18,7 @@ class ResetPasswordForm extends Model
      */
     private $_user;
 
+
     /**
      * Creates a form model given a token.
      *

apps/basic/models/LoginForm.php

@@ -16,6 +16,7 @@ class LoginForm extends Model
 
     private $_user = false;
 
+
     /**
      * @return array the validation rules.
      */

build/controllers/TranslationController.php

@@ -128,14 +128,11 @@ class TranslationController extends Controller
         foreach ($lines as $key => $val) {
             if (mb_substr($val, 0, 1, 'utf-8') === '@') {
                 $lines[$key] = '<span class="info">' . Html::encode($val) . '</span>';
-            }
-            else if (mb_substr($val, 0, 1, 'utf-8') === '+') {
+            } elseif (mb_substr($val, 0, 1, 'utf-8') === '+') {
                 $lines[$key] = '<ins>' . Html::encode($val) . '</ins>';
-            }
-            else if (mb_substr($val, 0, 1, 'utf-8') === '-') {
+            } elseif (mb_substr($val, 0, 1, 'utf-8') === '-') {
                 $lines[$key] = '<del>' . Html::encode($val) . '</del>';
-            }
-            else {
+            } else {
                 $lines[$key] = Html::encode($val);
             }
         }

docs/internals/core-code-style.md

@@ -269,14 +269,14 @@ Use the following formatting for switch:
 ```php
 switch ($this->phpType) {
     case 'string':
-        $a = (string)$value;
+        $a = (string) $value;
         break;
     case 'integer':
     case 'int':
-        $a = (integer)$value;
+        $a = (int) $value;
         break;
     case 'boolean':
-        $a = (boolean)$value;
+        $a = (bool) $value;
         break;
     default:
         $a = null;

extensions/authclient/AuthAction.php

@@ -86,6 +86,12 @@ class AuthAction extends Action
      */
     public $successCallback;
     /**
+     * @var string name or alias of the view file, which should be rendered in order to perform redirection.
+     * If not set default one will be used.
+     */
+    public $redirectView;
+
+    /**
      * @var string the redirect url after successful authorization.
      */
     private $_successUrl = '';
@@ -96,12 +102,6 @@ class AuthAction extends Action
 
 
     /**
-     * @var string name or alias of the view file, which should be rendered in order to perform redirection.
-     * If not set default one will be used.
-     */
-    public $redirectView;
-
-    /**
      * @param string $url successful URL.
      */
     public function setSuccessUrl($url)

extensions/authclient/OAuthToken.php

@@ -35,6 +35,11 @@ class OAuthToken extends Object
      */
     public $tokenSecretParamKey = 'oauth_token_secret';
     /**
+     * @var integer object creation timestamp.
+     */
+    public $createTimestamp;
+
+    /**
      * @var string key in [[params]] array, which stores token expiration duration.
      * If not set will attempt to fetch its value automatically.
      */
@@ -45,11 +50,6 @@ class OAuthToken extends Object
     private $_params = [];
 
 
-    /**
-     * @var integer object creation timestamp.
-     */
-    public $createTimestamp;
-
     public function init()
     {
         if ($this->createTimestamp === null) {

extensions/authclient/OpenId.php

@@ -82,20 +82,6 @@ class OpenId extends BaseClient implements ClientInterface
      */
     public $cainfo;
     /**
-     * @var string authentication return URL.
-     */
-    private $_returnUrl;
-    /**
-     * @var string claimed identifier (identity)
-     */
-    private $_claimedId;
-    /**
-     * @var string client trust root (realm), by default [[\yii\web\Request::hostInfo]] value will be used.
-     */
-    private $_trustRoot;
-
-
-    /**
      * @var array data, which should be used to retrieve the OpenID response.
      * If not set combination of GET and POST will be used.
      */
@@ -116,6 +102,20 @@ class OpenId extends BaseClient implements ClientInterface
     ];
 
     /**
+     * @var string authentication return URL.
+     */
+    private $_returnUrl;
+    /**
+     * @var string claimed identifier (identity)
+     */
+    private $_claimedId;
+    /**
+     * @var string client trust root (realm), by default [[\yii\web\Request::hostInfo]] value will be used.
+     */
+    private $_trustRoot;
+
+
+    /**
      * @inheritdoc
      */
     public function init()

extensions/authclient/signature/RsaSha1.php

@@ -24,6 +24,15 @@ use yii\base\NotSupportedException;
 class RsaSha1 extends BaseMethod
 {
     /**
+     * @var string path to the file, which holds private key certificate.
+     */
+    public $privateCertificateFile = '';
+    /**
+     * @var string path to the file, which holds public key certificate.
+     */
+    public $publicCertificateFile = '';
+
+    /**
      * @var string OpenSSL private key certificate content.
      * This value can be fetched from file specified by [[privateCertificateFile]].
      */
@@ -36,15 +45,6 @@ class RsaSha1 extends BaseMethod
 
 
     /**
-     * @var string path to the file, which holds private key certificate.
-     */
-    public $privateCertificateFile = '';
-    /**
-     * @var string path to the file, which holds public key certificate.
-     */
-    public $publicCertificateFile = '';
-
-    /**
      * @inheritdoc
      */
     public function init()

extensions/bootstrap/ActiveField.php

@@ -92,7 +92,7 @@ use yii\helpers\ArrayHelper;
 class ActiveField extends \yii\widgets\ActiveField
 {
     /**
-     * @var bool whether to render [[checkboxList()]] and [[radioList()]] inline.
+     * @var boolean whether to render [[checkboxList()]] and [[radioList()]] inline.
      */
     public $inline = false;
     /**
@@ -137,11 +137,11 @@ class ActiveField extends \yii\widgets\ActiveField
      */
     public $inlineRadioListTemplate = "{label}\n{beginWrapper}\n{input}\n{error}\n{endWrapper}\n{hint}";
     /**
-     * @var bool whether to render the error. Default is `true` except for layout `inline`.
+     * @var boolean whether to render the error. Default is `true` except for layout `inline`.
      */
     public $enableError = true;
     /**
-     * @var bool whether to render the label. Default is `true`.
+     * @var boolean whether to render the label. Default is `true`.
      */
     public $enableLabel = true;
 
@@ -303,13 +303,13 @@ class ActiveField extends \yii\widgets\ActiveField
     }
 
     /**
-     * @param bool $value whether to render a inline list
+     * @param boolean $value whether to render a inline list
      * @return static the field object itself
      * Make sure you call this method before [[checkboxList()]] or [[radioList()]] to have any effect.
      */
     public function inline($value = true)
     {
-        $this->inline = (bool)$value;
+        $this->inline = (bool) $value;
         return $this;
     }
 

extensions/debug/LogTarget.php

@@ -139,7 +139,7 @@ class LogTarget extends Target
         $summary = [
             'tag' => $this->tag,
             'url' => $request->getAbsoluteUrl(),
-            'ajax' => (int)$request->getIsAjax(),
+            'ajax' => (int) $request->getIsAjax(),
             'method' => $request->getMethod(),
             'ip' => $request->getUserIP(),
             'time' => time(),

extensions/faker/FixtureController.php

@@ -138,7 +138,6 @@ use yii\helpers\VarDumper;
  */
 class FixtureController extends \yii\console\controllers\FixtureController
 {
-
     /**
      * @var string Alias to the template path, where all tables templates are stored.
      */

extensions/gii/console/GenerateAction.php

@@ -102,7 +102,7 @@ class GenerateAction extends \yii\base\Action
             return;
         }
 
-        if ($this->generator->save($files, (array)$answers, $results)) {
+        if ($this->generator->save($files, (array) $answers, $results)) {
             $this->controller->stdout("\nFiles were generated successfully!\n", Console::FG_GREEN);
         } else {
             $this->controller->stdout("\nSome errors occurred while generating the files.", Console::FG_RED);

extensions/mongodb/Migration.php

@@ -89,7 +89,7 @@ abstract class Migration extends Component implements MigrationInterface
      */
     public function createIndex($collection, $columns, $options = [])
     {
-        echo "    > create index on " . $this->composeCollectionLogName($collection) . " (" . Json::encode((array)$columns) . empty($options) ? "" : ", " . Json::encode($options) . ") ...";
+        echo "    > create index on " . $this->composeCollectionLogName($collection) . " (" . Json::encode((array) $columns) . empty($options) ? "" : ", " . Json::encode($options) . ") ...";
         $time = microtime(true);
         $this->db->getCollection($collection)->createIndex($columns, $options);
         echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
@@ -102,7 +102,7 @@ abstract class Migration extends Component implements MigrationInterface
      */
     public function dropIndex($collection, $columns)
     {
-        echo "    > drop index on " . $this->composeCollectionLogName($collection) . " (" . Json::encode((array)$columns) . ") ...";
+        echo "    > drop index on " . $this->composeCollectionLogName($collection) . " (" . Json::encode((array) $columns) . ") ...";
         $time = microtime(true);
         $this->db->getCollection($collection)->dropIndex($columns);
         echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";

extensions/mongodb/README.md

@@ -81,7 +81,7 @@ To get actual Mongo ID string your should typecast [[\MongoId]] instance to stri
 $query = new Query;
 $row = $query->from('customer')->one();
 var_dump($row['_id']); // outputs: "object(MongoId)"
-var_dump((string)$row['_id']); // outputs "string 'acdfgdacdhcbdafa'"
+var_dump((string) $row['_id']); // outputs "string 'acdfgdacdhcbdafa'"
 ```
 
 Although this fact is very useful sometimes, it often produces some problems.
@@ -90,7 +90,7 @@ In these cases, ensure you have converted [[\MongoId]] into the string:
 
 ```php
 /* @var $this yii\web\View */
-echo $this->createUrl(['item/update', 'id' => (string)$row['_id']]);
+echo $this->createUrl(['item/update', 'id' => (string) $row['_id']]);
 ```
 
 While building condition, values for the key '_id' will be automatically cast to [[\MongoId]] instance,

extensions/redis/ActiveRecord.php

@@ -124,7 +124,7 @@ class ActiveRecord extends BaseActiveRecord
             // only insert attributes that are not null
             if ($value !== null) {
                 if (is_bool($value)) {
-                    $value = (int)$value;
+                    $value = (int) $value;
                 }
                 $setArgs[] = $attribute;
                 $setArgs[] = $value;
@@ -175,7 +175,7 @@ class ActiveRecord extends BaseActiveRecord
                 }
                 if ($value !== null) {
                     if (is_bool($value)) {
-                        $value = (int)$value;
+                        $value = (int) $value;
                     }
                     $setArgs[] = $attribute;
                     $setArgs[] = $value;

extensions/redis/LuaScriptBuilder.php

@@ -270,7 +270,7 @@ EOF;
                 $parts[] = $this->buildInCondition('in', [$column, $value], $columns);
             } else {
                 if (is_bool($value)) {
-                    $value = (int)$value;
+                    $value = (int) $value;
                 }
                 if ($value === null) {
                     $parts[] = "redis.call('HEXISTS',key .. ':a:' .. pk, ".$this->quoteValue($column).")==0";

extensions/smarty/Extension.php

@@ -26,7 +26,6 @@ class Extension
      * @var ViewRenderer
      */
     protected $viewRenderer;
-
     /**
      * @var Smarty
      */

extensions/smarty/ViewRenderer.php

@@ -32,7 +32,6 @@ class ViewRenderer extends BaseViewRenderer
      * @var string the directory or path alias pointing to where Smarty compiled templates will be stored.
      */
     public $compilePath = '@runtime/Smarty/compile';
-
     /**
      * @var array Add additional directories to Smarty's search path for plugins.
      */
@@ -46,21 +45,20 @@ class ViewRenderer extends BaseViewRenderer
      */
     public $widgets = ['functions' => [], 'blocks' => []];
     /**
-     * @var Smarty The Smarty object used for rendering
-     */
-    protected $smarty;
-
-    /**
      * @var array additional Smarty options
      * @see http://www.smarty.net/docs/en/api.variables.tpl
      */
     public $options = [];
-
     /**
      * @var string extension class name
      */
     public $extensionClass = '\yii\smarty\Extension';
 
+    /**
+     * @var Smarty The Smarty object used for rendering
+     */
+    protected $smarty;
+
 
     /**
      * Instantiates and configures the Smarty object.

extensions/sphinx/ColumnSchema.php

@@ -73,9 +73,9 @@ class ColumnSchema extends Object
             case 'string':
                 return is_resource($value) ? $value : (string) $value;
             case 'integer':
-                return (integer) $value;
+                return (int) $value;
             case 'boolean':
-                return (boolean) $value;
+                return (bool) $value;
             case 'double':
                 return (double) $value;
         }

extensions/sphinx/QueryBuilder.php

@@ -822,7 +822,7 @@ class QueryBuilder extends Object
         if ($values instanceof Query) {
             // sub-query
             list($sql, $params) = $this->build($values, $params);
-            $column = (array)$column;
+            $column = (array) $column;
             if (is_array($column)) {
                 foreach ($column as $i => $col) {
                     if (strpos($col, '(') === false) {

extensions/sphinx/Schema.php

@@ -43,6 +43,7 @@ class Schema extends Object
      * @var Connection the Sphinx connection
      */
     public $db;
+
     /**
      * @var array list of ALL index names in the Sphinx
      */

extensions/twig/Extension.php

@@ -159,7 +159,7 @@ class Extension extends \Twig_Extension
 
     public function addUses($args)
     {
-        foreach ((array)$args as $key => $value) {
+        foreach ((array) $args as $key => $value) {
             $value = str_replace('/', '\\', $value);
             if (is_int($key)) {
                 // namespace or class import

framework/base/Security.php

@@ -176,7 +176,7 @@ class Security extends Component
     /**
      * Encrypts data.
      * @param string $data data to be encrypted
-     * @param bool $passwordBased set true to use password-based key derivation
+     * @param boolean $passwordBased set true to use password-based key derivation
      * @param string $secret the encryption password or key
      * @param string $info context/application specific information, e.g. a user ID
      * See [RFC 5869 Section 3.2](https://tools.ietf.org/html/rfc5869#section-3.2) for more details.
@@ -217,7 +217,7 @@ class Security extends Component
     /**
      * Decrypts data.
      * @param string $data encrypted data to be decrypted.
-     * @param bool $passwordBased set true to use password-based key derivation
+     * @param boolean $passwordBased set true to use password-based key derivation
      * @param string $secret the decryption password or key
      * @param string $info context/application specific information, @see encrypt()
      * @return bool|string the decrypted data or false on authentication failure
@@ -290,7 +290,7 @@ class Security extends Component
      * @param string $info optional info to bind the derived key material to application-
      * and context-specific information, e.g. a user ID or API version, see
      * [RFC 5869](https://tools.ietf.org/html/rfc5869)
-     * @param int $length length of the output key in bytes. If 0, the output key is
+     * @param integer $length length of the output key in bytes. If 0, the output key is
      * the length of the hash algorithm output.
      * @throws InvalidParamException when HMAC generation fails.
      * @return string the derived key
@@ -335,9 +335,9 @@ class Security extends Component
      * @param string $algo a hash algorithm supported by `hash_hmac()`, e.g. 'SHA-256'
      * @param string $password the source password
      * @param string $salt the random salt
-     * @param int $iterations the number of iterations of the hash algorithm. Set as high as
+     * @param integer $iterations the number of iterations of the hash algorithm. Set as high as
      * possible to hinder dictionary password attacks.
-     * @param int $length length of the output key in bytes. If 0, the output key is
+     * @param integer $length length of the output key in bytes. If 0, the output key is
      * the length of the hash algorithm output.
      * @return string the derived key
      * @throws InvalidParamException when hash generation fails due to invalid params given.
@@ -595,7 +595,7 @@ class Security extends Component
      */
     protected function generateSalt($cost = 13)
     {
-        $cost = (int)$cost;
+        $cost = (int) $cost;
         if ($cost < 4 || $cost > 31) {
             throw new InvalidParamException('Cost must be between 4 and 31.');
         }

framework/behaviors/SluggableBehavior.php

@@ -128,7 +128,7 @@ class SluggableBehavior extends AttributeBehavior
         $isNewSlug = true;
 
         if ($this->attribute !== null) {
-            $attributes = (array)$this->attribute;
+            $attributes = (array) $this->attribute;
             /* @var $owner BaseActiveRecord */
             $owner = $this->owner;
             if (!$owner->getIsNewRecord() && !empty($owner->{$this->slugAttribute})) {

framework/caching/TagDependency.php

@@ -65,7 +65,7 @@ class TagDependency extends Dependency
     public static function invalidate($cache, $tags)
     {
         $keys = [];
-        foreach ((array)$tags as $tag) {
+        foreach ((array) $tags as $tag) {
             $keys[] = $cache->buildKey([__CLASS__, $tag]);
         }
         static::touchKeys($cache, $keys);

framework/console/controllers/AssetController.php

@@ -601,7 +601,7 @@ EOD;
     /**
      * Creates template of configuration file for [[actionCompress]].
      * @param string $configFile output file name.
-     * @return int CLI exit code
+     * @return integer CLI exit code
      * @throws \yii\console\Exception on failure.
      */
     public function actionTemplate($configFile)

framework/console/controllers/BaseMigrateController.php

@@ -302,7 +302,7 @@ abstract class BaseMigrateController extends Controller
      *
      * @param string $version the version at which the migration history should be marked.
      * This can be either the timestamp or the full name of the migration.
-     * @return int CLI exit code
+     * @return integer CLI exit code
      * @throws Exception if the version argument is invalid or the version cannot be found.
      */
     public function actionMark($version)
@@ -562,7 +562,7 @@ abstract class BaseMigrateController extends Controller
     /**
      * Migrates to the certain version.
      * @param string $version name in the full format.
-     * @return int CLI exit code
+     * @return integer CLI exit code
      * @throws Exception if the provided version cannot be found.
      */
     protected function migrateToVersion($version)

framework/console/controllers/FixtureController.php

@@ -55,7 +55,7 @@ class FixtureController extends Controller
      */
     public $namespace = 'tests\unit\fixtures';
     /**
-     * @var bool whether to append new fixture data to the existing ones.
+     * @var boolean whether to append new fixture data to the existing ones.
      * Defaults to false, meaning if there is any existing fixture data, it will be removed.
      */
     public $append = false;

framework/console/controllers/MessageController.php

@@ -50,7 +50,7 @@ class MessageController extends Controller
      * you may use this configuration file with the "extract" command.
      *
      * @param string $filePath output file name or alias.
-     * @return int CLI exit code
+     * @return integer CLI exit code
      * @throws Exception on failure.
      */
     public function actionConfig($filePath)

framework/db/ActiveQuery.php

@@ -152,7 +152,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
         }
 
         if (empty($this->select) && !empty($this->join)) {
-            foreach ((array)$this->from as $alias => $table) {
+            foreach ((array) $this->from as $alias => $table) {
                 if (is_string($alias)) {
                     $this->select = ["$alias.*"];
                 } elseif (is_string($table)) {

framework/db/ColumnSchema.php

@@ -98,9 +98,9 @@ class ColumnSchema extends Object
             case 'string':
                 return is_resource($value) ? $value : (string) $value;
             case 'integer':
-                return (integer) $value;
+                return (int) $value;
             case 'boolean':
-                return (boolean) $value;
+                return (bool) $value;
             case 'double':
                 return (double) $value;
         }

framework/db/Connection.php

@@ -531,7 +531,7 @@ class Connection extends Component
             Yii::endProfile($token, __METHOD__);
         } catch (\PDOException $e) {
             Yii::endProfile($token, __METHOD__);
-            throw new Exception($e->getMessage(), $e->errorInfo, (int)$e->getCode(), $e);
+            throw new Exception($e->getMessage(), $e->errorInfo, (int) $e->getCode(), $e);
         }
     }
 

framework/db/QueryBuilder.php

@@ -680,7 +680,7 @@ class QueryBuilder extends \yii\base\Object
             }
             // 0:join type, 1:join table, 2:on-condition (optional)
             list ($joinType, $table) = $join;
-            $tables = $this->quoteTableNames((array)$table, $params);
+            $tables = $this->quoteTableNames((array) $table, $params);
             $table = reset($tables);
             $joins[$i] = "$joinType $table";
             if (isset($join[2])) {
@@ -1055,7 +1055,7 @@ class QueryBuilder extends \yii\base\Object
         if ($values instanceof Query) {
             // sub-query
             list($sql, $params) = $this->build($values, $params);
-            $column = (array)$column;
+            $column = (array) $column;
             if (is_array($column)) {
                 foreach ($column as $i => $col) {
                     if (strpos($col, '(') === false) {

framework/db/pgsql/Schema.php

@@ -425,7 +425,7 @@ SQL;
         $column->name = $info['column_name'];
         $column->precision = $info['numeric_precision'];
         $column->scale = $info['numeric_scale'];
-        $column->size = $info['size'] === null ? null : (int)$info['size'];
+        $column->size = $info['size'] === null ? null : (int) $info['size'];
         if (isset($this->typeMap[$column->dbType])) {
             $column->type = $this->typeMap[$column->dbType];
         } else {

framework/db/sqlite/QueryBuilder.php

@@ -150,7 +150,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
      */
     public function checkIntegrity($check = true, $schema = '', $table = '')
     {
-        return 'PRAGMA foreign_keys='.(int)$check;
+        return 'PRAGMA foreign_keys='.(int) $check;
     }
 
     /**

framework/grid/CheckboxColumn.php

@@ -50,7 +50,7 @@ class CheckboxColumn extends Column
      */
     public $checkboxOptions = [];
     /**
-     * @var bool whether it is possible to select multiple rows. Defaults to `true`.
+     * @var boolean whether it is possible to select multiple rows. Defaults to `true`.
      */
     public $multiple = true;
 

framework/grid/GridView.php

@@ -459,7 +459,7 @@ class GridView extends BaseListView
         } else {
             $options = $this->rowOptions;
         }
-        $options['data-key'] = is_array($key) ? json_encode($key) : (string)$key;
+        $options['data-key'] = is_array($key) ? json_encode($key) : (string) $key;
 
         return Html::tag('tr', implode('', $cells), $options);
     }

framework/helpers/BaseConsole.php

@@ -332,7 +332,7 @@ class BaseConsole
     /**
      * Returns the length of the string without ANSI color codes.
      * @param string $string the string to measure
-     * @return int the length of the string not counting ANSI format characters
+     * @return integer the length of the string not counting ANSI format characters
      */
     public static function ansiStrlen($string) {
         return mb_strlen(static::stripAnsiFormat($string));

framework/helpers/BaseFileHelper.php

@@ -33,6 +33,7 @@ class BaseFileHelper
      */
     public static $mimeMagicFile = '@yii/helpers/mimeTypes.php';
 
+
     /**
      * Normalizes a file/directory path.
      * The normalization does the following work:

framework/helpers/BaseHtml.php

@@ -636,7 +636,7 @@ class BaseHtml
      */
     public static function radio($name, $checked = false, $options = [])
     {
-        $options['checked'] = (boolean) $checked;
+        $options['checked'] = (bool) $checked;
         $value = array_key_exists('value', $options) ? $options['value'] : '1';
         if (isset($options['uncheck'])) {
             // add a hidden field so that if the radio button is not selected, it still submits a value
@@ -678,7 +678,7 @@ class BaseHtml
      */
     public static function checkbox($name, $checked = false, $options = [])
     {
-        $options['checked'] = (boolean) $checked;
+        $options['checked'] = (bool) $checked;
         $value = array_key_exists('value', $options) ? $options['value'] : '1';
         if (isset($options['uncheck'])) {
             // add a hidden field so that if the checkbox is not selected, it still submits a value

framework/helpers/BaseInflector.php

@@ -238,6 +238,7 @@ class BaseInflector
      */
     public static $transliterator = 'Any-Latin; NFKD';
 
+
     /**
      * Converts a word to its plural form.
      * Note that this is for English only!

framework/helpers/BaseUrl.php

@@ -81,7 +81,7 @@ class BaseUrl
      */
     public static function toRoute($route, $scheme = false)
     {
-        $route = (array)$route;
+        $route = (array) $route;
         $route[0] = static::normalizeRoute($route[0]);
 
         if ($scheme) {

framework/mutex/MysqlMutex.php

@@ -57,7 +57,7 @@ class MysqlMutex extends DbMutex
      */
     protected function acquireLock($name, $timeout = 0)
     {
-        return (boolean) $this->db
+        return (bool) $this->db
             ->createCommand('SELECT GET_LOCK(:name, :timeout)', [':name' => $name, ':timeout' => $timeout])
             ->queryScalar();
     }
@@ -70,7 +70,7 @@ class MysqlMutex extends DbMutex
      */
     protected function releaseLock($name)
     {
-        return (boolean) $this->db
+        return (bool) $this->db
             ->createCommand('SELECT RELEASE_LOCK(:name)', [':name' => $name])
             ->queryScalar();
     }

framework/rbac/DbManager.php

@@ -349,7 +349,7 @@ class DbManager extends BaseManager
         $query = (new Query)->select('b.*')
             ->from(['a' => $this->assignmentTable, 'b' => $this->itemTable])
             ->where('a.item_name=b.name')
-            ->andWhere(['a.user_id' => (string)$userId]);
+            ->andWhere(['a.user_id' => (string) $userId]);
 
         $roles = [];
         foreach ($query->all($this->db) as $row) {
@@ -391,7 +391,7 @@ class DbManager extends BaseManager
 
         $query = (new Query)->select('item_name')
             ->from($this->assignmentTable)
-            ->where(['user_id' => (string)$userId]);
+            ->where(['user_id' => (string) $userId]);
 
         $childrenList = $this->getChildrenList();
         $result = [];
@@ -482,7 +482,7 @@ class DbManager extends BaseManager
         }
 
         $row = (new Query)->from($this->assignmentTable)
-            ->where(['user_id' => (string)$userId, 'item_name' => $roleName])
+            ->where(['user_id' => (string) $userId, 'item_name' => $roleName])
             ->one($this->db);
 
         if ($row === false) {
@@ -507,7 +507,7 @@ class DbManager extends BaseManager
 
         $query = (new Query)
             ->from($this->assignmentTable)
-            ->where(['user_id' => (string)$userId]);
+            ->where(['user_id' => (string) $userId]);
 
         $assignments = [];
         foreach ($query->all($this->db) as $row) {
@@ -644,7 +644,7 @@ class DbManager extends BaseManager
         }
 
         return $this->db->createCommand()
-            ->delete($this->assignmentTable, ['user_id' => (string)$userId, 'item_name' => $role->name])
+            ->delete($this->assignmentTable, ['user_id' => (string) $userId, 'item_name' => $role->name])
             ->execute() > 0;
     }
 
@@ -658,7 +658,7 @@ class DbManager extends BaseManager
         }
 
         return $this->db->createCommand()
-            ->delete($this->assignmentTable, ['user_id' => (string)$userId])
+            ->delete($this->assignmentTable, ['user_id' => (string) $userId])
             ->execute() > 0;
     }
 

framework/requirements/YiiRequirementChecker.php

@@ -199,7 +199,7 @@ class YiiRequirementChecker
             return false;
         }
 
-        return ((integer) $value == 1 || strtolower($value) == 'on');
+        return ((int) $value == 1 || strtolower($value) == 'on');
     }
 
     /**
@@ -244,7 +244,7 @@ class YiiRequirementChecker
             return 0;
         }
         if (is_numeric($verboseSize)) {
-            return (integer) $verboseSize;
+            return (int) $verboseSize;
         }
         $sizeUnit = trim($verboseSize, '0123456789');
         $size = str_replace($sizeUnit, '', $verboseSize);

framework/web/UrlRule.php

@@ -84,7 +84,7 @@ class UrlRule extends Object implements UrlRuleInterface
      */
     public $mode;
     /**
-     * @var bool a value indicating if parameters should be url encoded.
+     * @var boolean a value indicating if parameters should be url encoded.
      */
     public $encodeParams = true;
 

framework/widgets/ActiveForm.php

@@ -157,6 +157,7 @@ class ActiveForm extends Widget
      * @internal
      */
     public $attributes = [];
+
     /**
      * @var ActiveField[] the ActiveField objects that are currently active
      */

tests/unit/data/ar/Type.php

@@ -5,9 +5,9 @@ namespace yiiunit\data\ar;
 /**
  * Model representing type table
  *
- * @property int $int_col
- * @property int $int_col2 DEFAULT 1
- * @property int $smallint_col DEFAULT 1
+ * @property integer $int_col
+ * @property integer $int_col2 DEFAULT 1
+ * @property integer $smallint_col DEFAULT 1
  * @property string $char_col
  * @property string $char_col2 DEFAULT 'something'
  * @property string $char_col3

tests/unit/framework/base/SecurityTest.php

@@ -215,8 +215,8 @@ class SecurityTest extends TestCase
      * @param string $hash
      * @param string $password
      * @param string $salt
-     * @param int $iterations
-     * @param int $length
+     * @param integer $iterations
+     * @param integer $length
      * @param string $okm
      */
     public function testPbkdf2($hash, $password, $salt, $iterations, $length, $okm)
@@ -303,7 +303,7 @@ class SecurityTest extends TestCase
      * @param string $ikm
      * @param string $salt
      * @param string $info
-     * @param int $l
+     * @param integer $l
      * @param string $prk
      * @param string $okm
      */

tests/unit/framework/caching/CacheTestCase.php

@@ -13,7 +13,7 @@ function time()
 
 /**
  * Mock for the microtime() function for caching classes
- * @param bool $float
+ * @param boolean $float
  * @return float
  */
 function microtime($float = false)

tests/unit/framework/db/CommandTest.php

@@ -189,7 +189,7 @@ class CommandTest extends DatabaseTestCase
         }
         $this->assertEquals($numericCol, $row['numeric_col']);
         if ($this->driverName === 'mysql' || defined('HHVM_VERSION') && $this->driverName === 'sqlite') {
-            $this->assertEquals($boolCol, (int)$row['bool_col']);
+            $this->assertEquals($boolCol, (int) $row['bool_col']);
         } else {
             $this->assertEquals($boolCol, $row['bool_col']);
         }