luyadev / luya

core/web/ExternalLink.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
     public function setHref($href)
     {
         if (StringHelper::startsWith($href, '//')) {
-            $this->_href = Url::base(true) . str_replace('//', '/', $href);
+            $this->_href = Url::base(true).str_replace('//', '/', $href);
         } else {
             $this->_href = Url::ensureHttp($href);
         }

core/base/Boot.php

Spacing +2 added lines, -2 removed lines

@@ -210,9 +210,9 @@
         if (file_exists($this->_baseYiiFile)) {
             defined('LUYA_YII_VENDOR') ?: define('LUYA_YII_VENDOR', dirname($this->_baseYiiFile));
             
-            $require = require_once(dirname($this->_baseYiiFile) . DIRECTORY_SEPARATOR . 'BaseYii.php');
+            $require = require_once(dirname($this->_baseYiiFile).DIRECTORY_SEPARATOR.'BaseYii.php');
             
-            require_once($this->getCoreBasePath() . '/Yii.php');
+            require_once($this->getCoreBasePath().'/Yii.php');
             
             Yii::setAlias('@luya', $this->getCoreBasePath());
             return $require;

core/Yii.php

Spacing +1 added lines, -1 removed lines

@@ -18,5 +18,5 @@
 }
 
 spl_autoload_register(['Yii', 'autoload'], true, true);
-Yii::$classMap = require(LUYA_YII_VENDOR . '/classes.php');
+Yii::$classMap = require(LUYA_YII_VENDOR.'/classes.php');
 Yii::$container = new yii\di\Container();

core/traits/ApplicationTrait.php

Spacing +2 added lines, -2 removed lines

@@ -115,7 +115,7 @@ 
                 case 'en':
                     return 'en_US';
                 default:
-                    return strtolower($lang) . '_' . strtoupper($lang);
+                    return strtolower($lang).'_'.strtoupper($lang);
             }
         }
         
@@ -145,7 +145,7 @@ 
     public function getWebroot()
     {
         if ($this->_webroot === null) {
-            $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory);
+            $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory);
         }
         
         return $this->_webroot;

Indentation +7 added lines, -7 removed lines

@@ -202,14 +202,14 @@
      */
     public function getAdminModules()
     {
-    	$modules = [];
+        $modules = [];
     	
-    	foreach ($this->getModules() as $id => $obj) {
-    		if ($obj instanceof Module && $obj instanceof AdminModuleInterface) {
-    			$modules[$id] = $obj;
-    		}
-    	}
+        foreach ($this->getModules() as $id => $obj) {
+            if ($obj instanceof Module && $obj instanceof AdminModuleInterface) {
+                $modules[$id] = $obj;
+            }
+        }
     	
-    	return $modules;
+        return $modules;
     }
 }

core/traits/CacheableTrait.php

Indentation +28 added lines, -28 removed lines

@@ -79,34 +79,34 @@
         return $this->_cachable;
     }
     
-     /**
-     * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key,
-     * or to store the result of $closure execution if there is no cache available for the $key.
-     *
-     * Usage example:
-     *
-     * ```php
-     * use CacheableTrait;
-     *
-     * public function getTopProducts($count = 10)
-     * {
-     *     return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) {
-     *         return Products::find()->mostPopular()->limit(10)->all();
-     *     }, 1000);
-     * }
-     * ```
-     *
-     * @param mixed $key a key identifying the value to be cached. This can be a simple string or
-     * a complex data structure consisting of factors representing the key.
-     * @param \Closure $closure the closure that will be used to generate a value to be cached.
-     * In case $closure returns `false`, the value will not be cached.
-     * @param int $duration default duration in seconds before the cache will expire. If not set,
-     * [[defaultDuration]] value will be used.
-     * @param Dependency $dependency dependency of the cached item. If the dependency changes,
-     * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
-     * This parameter is ignored if [[serializer]] is `false`.
-     * @return mixed result of $closure execution
-     */
+        /**
+         * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key,
+         * or to store the result of $closure execution if there is no cache available for the $key.
+         *
+         * Usage example:
+         *
+         * ```php
+         * use CacheableTrait;
+         *
+         * public function getTopProducts($count = 10)
+         * {
+         *     return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) {
+         *         return Products::find()->mostPopular()->limit(10)->all();
+         *     }, 1000);
+         * }
+         * ```
+         *
+         * @param mixed $key a key identifying the value to be cached. This can be a simple string or
+         * a complex data structure consisting of factors representing the key.
+         * @param \Closure $closure the closure that will be used to generate a value to be cached.
+         * In case $closure returns `false`, the value will not be cached.
+         * @param int $duration default duration in seconds before the cache will expire. If not set,
+         * [[defaultDuration]] value will be used.
+         * @param Dependency $dependency dependency of the cached item. If the dependency changes,
+         * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
+         * This parameter is ignored if [[serializer]] is `false`.
+         * @return mixed result of $closure execution
+         */
     public function getOrSetHasCache($key, \Closure $closure, $duration = null, $dependency = null)
     {
         if (($value = $this->getHasCache($key)) !== false) {

core/console/Bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -36,15 +36,15 @@
     public function run($app)
     {
         foreach ($app->getApplicationModules() as $id => $module) {
-            $folder = $module->basePath . DIRECTORY_SEPARATOR . 'commands';
+            $folder = $module->basePath.DIRECTORY_SEPARATOR.'commands';
             if (file_exists($folder) && is_dir($folder)) {
                 foreach (FileHelper::findFiles($folder) as $file) {
                     
-                    $module->controllerNamespace = $module->namespace . '\commands';
+                    $module->controllerNamespace = $module->namespace.'\commands';
                     
-                    $className = '\\'.$module->getNamespace().'\\commands\\' . pathinfo($file, PATHINFO_FILENAME);
+                    $className = '\\'.$module->getNamespace().'\\commands\\'.pathinfo($file, PATHINFO_FILENAME);
 
-                    $command = str_replace('-controller', '', $module->id . '/' . Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME)));
+                    $command = str_replace('-controller', '', $module->id.'/'.Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME)));
                     
                     Yii::$app->controllerMap[$command] = ['class' => $className];
                 }

core/base/Module.php

Spacing +1 added lines, -1 removed lines

@@ -278,6 +278,6 @@
      */
     public function getControllerPath()
     {
-        return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false);
+        return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false);
     }
 }

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace luya\base;
 
 use yii;
-
 use luya\helpers\FileHelper;
 use yii\helpers\Inflector;
 use luya\console\interfaces\ImportControllerInterface;

core/console/commands/ImportController.php

Spacing +3 added lines, -3 removed lines

@@ -164,18 +164,18 @@
         }
         
         foreach ($this->getLog() as $section => $value) {
-            $this->outputInfo(PHP_EOL . $section . ":");
+            $this->outputInfo(PHP_EOL.$section.":");
             foreach ($value as $k => $v) {
                 if (is_array($v)) {
                     foreach ($v as $kk => $kv) {
                         if (is_array($kv)) {
-                            $this->output(" - {$kk}: " . print_r($kv, true));
+                            $this->output(" - {$kk}: ".print_r($kv, true));
                         } else {
                             $this->output(" - {$kk}: {$kv}");
                         }
                     }
                 } else {
-                    $this->output(" - " . $v);
+                    $this->output(" - ".$v);
                 }
             }
         }

core/helpers/ArrayHelper.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
     public static function search(array $array, $searchText, $sensitive = false)
     {
         $function = ($sensitive) ? 'strpos' : 'stripos';
-        return array_filter($array, function ($item) use ($searchText, $function) {
+        return array_filter($array, function($item) use ($searchText, $function) {
             $response = false;
             foreach ($item as $key => $value) {
                 if ($response) {
@@ -136,7 +136,7 @@ 
     {
         $key = array_search($search, array_column($array, $column));
         
-        return ($key !== false) ?  $array[$key] : false;
+        return ($key !== false) ? $array[$key] : false;
     }
     
     /**