Merge pull request #2622 branch 'ext-codestyle-fix' of https://github.com/AlexGx/yii2 into code-style

* 'ext-codestyle-fix' of https://github.com/AlexGx/yii2:
  fix php5.4 array syntax
  many phpcs fixes
  fix phpDoc LuaScriptBuilder build @throws

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/templates/BaseRenderer.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/Renderer.php
	extensions/apidoc/templates/offline/assets/AssetBundle.php
	extensions/apidoc/templates/offline/views/index.php

extensions/apidoc/templates/bootstrap/assets/AssetBundle.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\apidoc\templates\bootstrap\assets;
+
 use yii\web\View;
 
 /**

extensions/apidoc/templates/bootstrap/views/index.php

@@ -3,6 +3,7 @@
 use yii\apidoc\models\ClassDoc;
 use yii\apidoc\models\InterfaceDoc;
 use yii\apidoc\models\TraitDoc;
+
 /**
  * @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types
  * @var yii\web\View $this

extensions/apidoc/templates/html/views/type.php

@@ -4,6 +4,7 @@ use yii\apidoc\helpers\ApiMarkdown;
 use yii\apidoc\models\ClassDoc;
 use yii\apidoc\models\InterfaceDoc;
 use yii\apidoc\models\TraitDoc;
+
 /**
  * @var ClassDoc|InterfaceDoc|TraitDoc $type
  * @var yii\web\View $this

extensions/apidoc/templates/online/ApiRenderer.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\apidoc\templates\online;
+
 use yii\apidoc\models\Context;
 use yii\apidoc\models\TypeDoc;
 use yii\console\Controller;

extensions/apidoc/templates/online/views/index.php

@@ -3,6 +3,7 @@
 use yii\apidoc\models\ClassDoc;
 use yii\apidoc\models\InterfaceDoc;
 use yii\apidoc\models\TraitDoc;
+
 /**
  * @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types
  * @var yii\web\View $this

extensions/authclient/OAuthToken.php

@@ -58,14 +58,16 @@ class OAuthToken extends Object
 	/**
 	 * @param string $expireDurationParamKey expire duration param key.
 	 */
-	public function setExpireDurationParamKey($expireDurationParamKey) {
+	public function setExpireDurationParamKey($expireDurationParamKey)
+	{
 		$this->_expireDurationParamKey = $expireDurationParamKey;
 	}
 
 	/**
 	 * @return string expire duration param key.
 	 */
-	public function getExpireDurationParamKey() {
+	public function getExpireDurationParamKey()
+	{
 		if ($this->_expireDurationParamKey === null) {
 			$this->_expireDurationParamKey = $this->defaultExpireDurationParamKey();
 		}
@@ -75,14 +77,16 @@ class OAuthToken extends Object
 	/**
 	 * @return array
 	 */
-	public function getParams() {
+	public function getParams()
+	{
 		return $this->_params;
 	}
 
 	/**
 	 * @param array $params
 	 */
-	public function setParams(array $params) {
+	public function setParams(array $params)
+	{
 		$this->_params = $params;
 	}
 
@@ -91,7 +95,8 @@ class OAuthToken extends Object
 	 * @param string $name param name.
 	 * @param mixed $value param value,
 	 */
-	public function setParam($name, $value) {
+	public function setParam($name, $value)
+	{
 		$this->_params[$name] = $value;
 	}
 
@@ -100,7 +105,8 @@ class OAuthToken extends Object
 	 * @param string $name param name.
 	 * @return mixed param value.
 	 */
-	public function getParam($name) {
+	public function getParam($name)
+	{
 		return isset($this->_params[$name]) ? $this->_params[$name] : null;
 	}
 
@@ -109,7 +115,8 @@ class OAuthToken extends Object
 	 * @param string $token token value.
 	 * @return static self reference.
 	 */
-	public function setToken($token) {
+	public function setToken($token)
+	{
 		$this->setParam($this->tokenParamKey, $token);
 	}
 
@@ -117,7 +124,8 @@ class OAuthToken extends Object
 	 * Returns token value.
 	 * @return string token value.
 	 */
-	public function getToken() {
+	public function getToken()
+	{
 		return $this->getParam($this->tokenParamKey);
 	}
 
@@ -125,7 +133,8 @@ class OAuthToken extends Object
 	 * Sets the token secret value.
 	 * @param string $tokenSecret token secret.
 	 */
-	public function setTokenSecret($tokenSecret) {
+	public function setTokenSecret($tokenSecret)
+	{
 		$this->setParam($this->tokenSecretParamKey, $tokenSecret);
 	}
 
@@ -133,7 +142,8 @@ class OAuthToken extends Object
 	 * Returns the token secret value.
 	 * @return string token secret value.
 	 */
-	public function getTokenSecret() {
+	public function getTokenSecret()
+	{
 		return $this->getParam($this->tokenSecretParamKey);
 	}
 
@@ -141,7 +151,8 @@ class OAuthToken extends Object
 	 * Sets token expire duration.
 	 * @param string $expireDuration token expiration duration.
 	 */
-	public function setExpireDuration($expireDuration) {
+	public function setExpireDuration($expireDuration)
+	{
 		$this->setParam($this->getExpireDurationParamKey(), $expireDuration);
 	}
 
@@ -149,7 +160,8 @@ class OAuthToken extends Object
 	 * Returns the token expiration duration.
 	 * @return integer token expiration duration.
 	 */
-	public function getExpireDuration() {
+	public function getExpireDuration()
+	{
 		return $this->getParam($this->getExpireDurationParamKey());
 	}
 
@@ -157,7 +169,8 @@ class OAuthToken extends Object
 	 * Fetches default expire duration param key.
 	 * @return string expire duration param key.
 	 */
-	protected function defaultExpireDurationParamKey() {
+	protected function defaultExpireDurationParamKey()
+	{
 		$expireDurationParamKey = 'expires_in';
 		foreach ($this->getParams() as $name => $value) {
 			if (strpos($name, 'expir') !== false) {
@@ -172,7 +185,8 @@ class OAuthToken extends Object
 	 * Checks if token has expired.
 	 * @return boolean is token expired.
 	 */
-	public function getIsExpired() {
+	public function getIsExpired()
+	{
 		$expirationDuration = $this->getExpireDuration();
 		if (empty($expirationDuration)) {
 			return false;
@@ -184,7 +198,8 @@ class OAuthToken extends Object
 	 * Checks if token is valid.
 	 * @return boolean is token valid.
 	 */
-	public function getIsValid() {
+	public function getIsValid()
+	{
 		$token = $this->getToken();
 		return (!empty($token) && !$this->getIsExpired());
 	}

extensions/authclient/clients/LinkedIn.php

@@ -147,7 +147,8 @@ class LinkedIn extends OAuth2
 	 * Generates the auth state value.
 	 * @return string auth state value.
 	 */
-	protected function generateAuthState() {
+	protected function generateAuthState()
+	{
 		return sha1(uniqid(get_class($this), true));
 	}
 

extensions/debug/LogTarget.php

@@ -168,5 +168,4 @@ class LogTarget extends Target
 		# / 2 because messages are in couple (begin/end)
 		return count($profileLogs) / 2;
 	}
-
 }

extensions/debug/components/search/matchers/Base.php

@@ -37,5 +37,4 @@ abstract class Base extends Component implements MatcherInterface
 	{
 		return !empty($this->baseValue) || ($this->baseValue === '0');
 	}
-
 }

extensions/debug/panels/DbPanel.php

@@ -175,5 +175,4 @@ class DbPanel extends Panel
 	{
 		return (($this->criticalQueryThreshold !== null) && ($count > $this->criticalQueryThreshold));
 	}
-
 }

extensions/debug/panels/MailPanel.php

@@ -102,5 +102,4 @@ class MailPanel extends Panel
 		}
 		return $attr;
 	}
-
 }

extensions/debug/views/default/panels/config/detail.php

@@ -35,4 +35,3 @@ echo $this->render('panels/config/table', [
 ]);
 
 echo $panel->getPhpInfo();
-?>

extensions/debug/views/default/panels/db/detail.php

@@ -67,4 +67,3 @@ echo GridView::widget([
 		]
 	],
 ]);
-?>

extensions/debug/views/default/panels/log/detail.php

@@ -70,4 +70,3 @@ echo GridView::widget([
 		],
 	],
 ]);
-?>

extensions/debug/views/default/panels/profile/detail.php

@@ -1,6 +1,7 @@
 <?php
 use yii\grid\GridView;
 use yii\helpers\Html;
+
 ?>
 <h1>Performance Profiling</h1>
 <p>Total processing time: <b><?= $time ?></b>; Peak memory: <b><?= $memory ?></b>.</p>
@@ -50,4 +51,3 @@ echo GridView::widget([
 		],
 	],
 ]);
-?>

extensions/gii/Generator.php

@@ -13,7 +13,6 @@ use yii\base\InvalidConfigException;
 use yii\base\Model;
 use yii\web\View;
 
-
 /**
  * This is the base class for all generator classes.
  *

extensions/gii/generators/crud/Generator.php

@@ -499,5 +499,4 @@ class Generator extends \yii\gii\Generator
 			return $model->attributes();
 		}
 	}
-
 }

extensions/jui/AutoCompleteAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/ButtonAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/CoreAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/DatePickerAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/DatePickerRegionalAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/DialogAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/DraggableAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/DroppableAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/EffectAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/MenuAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/ProgressBarAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/ResizableAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/SelectableAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/SliderAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/SortableAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/SpinnerAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/TabsAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/ThemeAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/jui/TooltipAsset.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\jui;
+
 use yii\web\AssetBundle;
 
 /**

extensions/mongodb/Collection.php

@@ -626,7 +626,8 @@ class Collection extends Object
 	 * @return array the highest scoring documents, in descending order by score.
 	 * @throws Exception on failure.
 	 */
-	public function fullTextSearch($search, $condition = [], $fields = [], $options = []) {
+	public function fullTextSearch($search, $condition = [], $fields = [], $options = [])
+	{
 		$command = [
 			'search' => $search
 		];

extensions/redis/LuaScriptBuilder.php

@@ -133,6 +133,7 @@ class LuaScriptBuilder extends \yii\base\Object
 	 * @param ActiveQuery $query the query used to build the script
 	 * @param string $buildResult the lua script for building the result
 	 * @param string $return the lua variable that should be returned
+	 * @throws yii\base\NotSupportedException when query contains unsupported order by condition
 	 * @return string
 	 */
 	private function build($query, $buildResult, $return)

extensions/sphinx/Connection.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\sphinx;
+
 use yii\base\NotSupportedException;
 
 /**

extensions/sphinx/QueryBuilder.php

@@ -422,7 +422,7 @@ class QueryBuilder extends Object
 				if (strpos($column, '(') === false) {
 					$column = $this->db->quoteColumnName($column);
 				}
-				$columns[$i] = "$column AS " . $this->db->quoteColumnName($i);;
+				$columns[$i] = "$column AS " . $this->db->quoteColumnName($i);
 			} elseif (strpos($column, '(') === false) {
 				if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)([\w\-_\.]+)$/', $column, $matches)) {
 					$columns[$i] = $this->db->quoteColumnName($matches[1]) . ' AS ' . $this->db->quoteColumnName($matches[2]);
@@ -907,7 +907,8 @@ class QueryBuilder extends Object
 	 * @param array $params the binding parameters to be populated
 	 * @return string SQL expression, which represents column value
 	 */
-	protected function composeColumnValue($indexes, $columnName, $value, &$params) {
+	protected function composeColumnValue($indexes, $columnName, $value, &$params)
+	{
 		if ($value === null) {
 			return 'NULL';
 		} elseif ($value instanceof Expression) {

extensions/twig/TwigSimpleFileLoader.php

@@ -68,7 +68,8 @@ class TwigSimpleFileLoader implements \Twig_LoaderInterface
 	 * @param string $name file name
 	 * @return string absolute path of file
 	 */
-	protected  function getFilePath($name){
+	protected function getFilePath($name)
+	{
 		return $this->_dir . '/' . $name;
 	}
 }

extensions/twig/ViewRendererStaticClassProxy.php

@@ -19,7 +19,8 @@ class ViewRendererStaticClassProxy
 {
 	private $_staticClassName;
 
-    public function __construct($staticClassName) {
+	public function __construct($staticClassName)
+	{
 		$this->_staticClassName = $staticClassName;
 	}