Completed
Pull Request — master (#1246)
by Martin
03:44
created
core/Yii.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,5 +18,5 @@
 block discarded – undo
18 18
 }
19 19
 
20 20
 spl_autoload_register(['Yii', 'autoload'], true, true);
21
-Yii::$classMap = require(LUYA_YII_VENDOR . '/classes.php');
21
+Yii::$classMap = require(LUYA_YII_VENDOR.'/classes.php');
22 22
 Yii::$container = new yii\di\Container();
Please login to merge, or discard this patch.
core/traits/ApplicationTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
                 case 'en':
116 116
                     return 'en_US';
117 117
                 default:
118
-                    return strtolower($lang) . '_' . strtoupper($lang);
118
+                    return strtolower($lang).'_'.strtoupper($lang);
119 119
             }
120 120
         }
121 121
         
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
     public function getWebroot()
146 146
     {
147 147
         if ($this->_webroot === null) {
148
-            $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory);
148
+            $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory);
149 149
         }
150 150
         
151 151
         return $this->_webroot;
Please login to merge, or discard this patch.
core/console/commands/views/crud/create_model.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
  * 
13 13
  * <?=$luyaVersion; ?> 
14 14
  *
15
-<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name . PHP_EOL; ?>
16
-<?php endforeach;?>
15
+<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name.PHP_EOL; ?>
16
+<?php endforeach; ?>
17 17
  */
18 18
 class <?= $className; ?> extends NgRestModel
19 19
 {
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
      */
24 24
     public $i18n = ['<?= implode("', '", $textFields); ?>'];
25 25
 
26
-<?php endif;?>
26
+<?php endif; ?>
27 27
     /**
28 28
      * @inheritdoc
29 29
      */
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     {
78 78
         return [
79 79
         <?php foreach ($ngrestFieldConfig as $name => $type): ?>
80
-    '<?=$name; ?>' => '<?= $type;?>',
80
+    '<?=$name; ?>' => '<?= $type; ?>',
81 81
         <?php endforeach; ?>];
82 82
     }
83 83
 
Please login to merge, or discard this patch.
core/traits/CacheableTrait.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -79,34 +79,34 @@
 block discarded – undo
79 79
         return $this->_cachable;
80 80
     }
81 81
     
82
-     /**
83
-     * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key,
84
-     * or to store the result of $closure execution if there is no cache available for the $key.
85
-     *
86
-     * Usage example:
87
-     *
88
-     * ```php
89
-     * use CacheableTrait;
90
-     *
91
-     * public function getTopProducts($count = 10)
92
-     * {
93
-     *     return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) {
94
-     *         return Products::find()->mostPopular()->limit(10)->all();
95
-     *     }, 1000);
96
-     * }
97
-     * ```
98
-     *
99
-     * @param mixed $key a key identifying the value to be cached. This can be a simple string or
100
-     * a complex data structure consisting of factors representing the key.
101
-     * @param \Closure $closure the closure that will be used to generate a value to be cached.
102
-     * In case $closure returns `false`, the value will not be cached.
103
-     * @param int $duration default duration in seconds before the cache will expire. If not set,
104
-     * [[defaultDuration]] value will be used.
105
-     * @param Dependency $dependency dependency of the cached item. If the dependency changes,
106
-     * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
107
-     * This parameter is ignored if [[serializer]] is `false`.
108
-     * @return mixed result of $closure execution
109
-     */
82
+        /**
83
+         * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key,
84
+         * or to store the result of $closure execution if there is no cache available for the $key.
85
+         *
86
+         * Usage example:
87
+         *
88
+         * ```php
89
+         * use CacheableTrait;
90
+         *
91
+         * public function getTopProducts($count = 10)
92
+         * {
93
+         *     return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) {
94
+         *         return Products::find()->mostPopular()->limit(10)->all();
95
+         *     }, 1000);
96
+         * }
97
+         * ```
98
+         *
99
+         * @param mixed $key a key identifying the value to be cached. This can be a simple string or
100
+         * a complex data structure consisting of factors representing the key.
101
+         * @param \Closure $closure the closure that will be used to generate a value to be cached.
102
+         * In case $closure returns `false`, the value will not be cached.
103
+         * @param int $duration default duration in seconds before the cache will expire. If not set,
104
+         * [[defaultDuration]] value will be used.
105
+         * @param Dependency $dependency dependency of the cached item. If the dependency changes,
106
+         * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
107
+         * This parameter is ignored if [[serializer]] is `false`.
108
+         * @return mixed result of $closure execution
109
+         */
110 110
     public function getOrSetHasCache($key, \Closure $closure, $duration = null, $dependency = null)
111 111
     {
112 112
         if (($value = $this->getHasCache($key)) !== false) {
Please login to merge, or discard this patch.
core/web/Element.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
     {
276 276
         if ($this->renderEngine == 'php') {
277 277
             $view = new View();
278
-            return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args);
278
+            return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args);
279 279
         } elseif ($this->renderEngine == 'twig') {
280 280
             // @deprecated 1.0.0-RC2 Marked as deprecated and will be removed on 1.0.0 release.
281 281
             trigger_error('twig render engine is not supported anymore.', E_USER_DEPRECATED);
@@ -283,6 +283,6 @@  discard block
 block discarded – undo
283 283
             return $twig->render(FileHelper::ensureExtension($file, 'twig'), $args);
284 284
         }
285 285
         
286
-        throw new Exception('Not supported render engine: ' . $this->renderEngine);
286
+        throw new Exception('Not supported render engine: '.$this->renderEngine);
287 287
     }
288 288
 }
Please login to merge, or discard this patch.
core/console/Bootstrap.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,15 +36,15 @@
 block discarded – undo
36 36
     public function run($app)
37 37
     {
38 38
         foreach ($app->getApplicationModules() as $id => $module) {
39
-            $folder = $module->basePath . DIRECTORY_SEPARATOR . 'commands';
39
+            $folder = $module->basePath.DIRECTORY_SEPARATOR.'commands';
40 40
             if (file_exists($folder) && is_dir($folder)) {
41 41
                 foreach (FileHelper::findFiles($folder) as $file) {
42 42
                     
43
-                    $module->controllerNamespace = $module->namespace . '\commands';
43
+                    $module->controllerNamespace = $module->namespace.'\commands';
44 44
                     
45
-                    $className = '\\'.$module->getNamespace().'\\commands\\' . pathinfo($file, PATHINFO_FILENAME);
45
+                    $className = '\\'.$module->getNamespace().'\\commands\\'.pathinfo($file, PATHINFO_FILENAME);
46 46
 
47
-                    $command = str_replace('-controller', '', $module->id . '/' . Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME)));
47
+                    $command = str_replace('-controller', '', $module->id.'/'.Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME)));
48 48
                     
49 49
                     Yii::$app->controllerMap[$command] = ['class' => $className];
50 50
                 }
Please login to merge, or discard this patch.