Completed
Pull Request — master (#1852)
by Marc
03:23
created
core/web/CompositionResolver.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
      * Get a value for a given resolved pattern key.
93 93
      *
94 94
      * @param string $key
95
-     * @return boolean|mixed
95
+     * @return string
96 96
      */
97 97
     public function getResolvedKeyValue($key)
98 98
     {
Please login to merge, or discard this patch.
core/helpers/StringHelper.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
      * @param string $search Search string to look for.
112 112
      * @param string $replace Replacement value for the first found occurrence.
113 113
      * @param string $subject The string you want to look up to replace the first element.
114
-     * @return mixed Replaced string
114
+     * @return string Replaced string
115 115
      */
116 116
     public static function replaceFirst($search, $replace, $subject)
117 117
     {
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
      * @param string $content The content to minify.
165 165
      * @param array $options Optional arguments to provide for minification:
166 166
      * - comments: boolean, where html comments should be removed or not. defaults to false
167
-     * @return mixed Returns the minified content.
167
+     * @return string Returns the minified content.
168 168
      * @since 1.0.7
169 169
      */
170 170
     public static function minify($content, array $options = [])
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             return true;
97 97
         }
98 98
         
99
-        return ($value == (string)(float) $value);
99
+        return ($value == (string) (float) $value);
100 100
     }
101 101
     
102 102
     /**
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 
209 209
         // string before
210 210
         $before = (count($left) > $length) ? $affix.implode("", array_slice($left, -$length)) : implode("", $left);
211
-        $after = (count($right) > $length) ? implode("", array_slice($right, 0, $length)) . $affix : implode("", $right);
211
+        $after = (count($right) > $length) ? implode("", array_slice($right, 0, $length)).$affix : implode("", $right);
212 212
 
213
-        return $before . $word . $after;
213
+        return $before.$word.$after;
214 214
     }
215 215
 
216 216
     /**
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
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
         
125 125
         // generate from `de` the locale `de_DE` or from `en` `en_EN` only if $lang is 2 chars.
126 126
         if (strlen($lang) == 2) {
127
-            return strtolower($lang) . '_' . strtoupper($lang);
127
+            return strtolower($lang).'_'.strtoupper($lang);
128 128
         }
129 129
         
130 130
         return $lang;
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
     public function getWebroot()
187 187
     {
188 188
         if ($this->_webroot === null) {
189
-            $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory);
189
+            $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory);
190 190
         }
191 191
         
192 192
         return $this->_webroot;
Please login to merge, or discard this patch.
core/web/filters/JsonCruftFilter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
      */
59 59
     public function prependCruft($content)
60 60
     {
61
-        return $this->cruft . trim($content);
61
+        return $this->cruft.trim($content);
62 62
     }
63 63
     
64 64
     /**
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     {
69 69
         if (Yii::$app->response->format == Response::FORMAT_JSON) {
70 70
             Yii::$app->response->headers->set(self::CRUFT_HEADER_NAME, $this->getCruftLength());
71
-            Yii::$app->response->on(Response::EVENT_AFTER_PREPARE, function ($event) {
71
+            Yii::$app->response->on(Response::EVENT_AFTER_PREPARE, function($event) {
72 72
                 $event->sender->content = $this->prependCruft($event->sender->content);
73 73
             });
74 74
         }
Please login to merge, or discard this patch.
core/console/commands/ImportController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 
176 176
         foreach ($queue as $pos => $object) {
177 177
             $this->verbosePrint("Run importer object '{$object->className()}' on position '{$pos}'.", __METHOD__);
178
-            $this->verbosePrint('Module context id: ' . $object->module->id);
178
+            $this->verbosePrint('Module context id: '.$object->module->id);
179 179
             $object->run();
180 180
         }
181 181
 
@@ -185,10 +185,10 @@  discard block
 block discarded – undo
185 185
             Yii::$app->db->createCommand()->update('admin_user', ['force_reload' => 1])->execute();
186 186
         }
187 187
         
188
-        $this->output('LUYA import command (based on LUYA ' . Boot::VERSION . ')');
188
+        $this->output('LUYA import command (based on LUYA '.Boot::VERSION.')');
189 189
         
190 190
         foreach ($this->getLog() as $section => $value) {
191
-            $this->outputInfo(PHP_EOL . $section . ":");
191
+            $this->outputInfo(PHP_EOL.$section.":");
192 192
             $this->logValueToTable($value);
193 193
         }
194 194
         
Please login to merge, or discard this patch.
core/web/TelephoneLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
         if (!empty($this->getTelephone())) {
79 79
             // Remove all chars expect digits and "+"
80 80
             $number = preg_replace('#[^\d+]#', '', $this->getTelephone());
81
-            $href = 'tel:' . $number;
81
+            $href = 'tel:'.$number;
82 82
         }
83 83
 
84 84
         return $href;
Please login to merge, or discard this patch.
core/traits/CacheableTrait.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -74,33 +74,33 @@
 block discarded – undo
74 74
     }
75 75
     
76 76
     /**
77
-    * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key,
78
-    * or to store the result of $closure execution if there is no cache available for the $key.
79
-    *
80
-    * Usage example:
81
-    *
82
-    * ```php
83
-    * use CacheableTrait;
84
-    *
85
-    * public function getTopProducts($count = 10)
86
-    * {
87
-    *     return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) {
88
-    *         return Products::find()->mostPopular()->limit(10)->all();
89
-    *     }, 1000);
90
-    * }
91
-    * ```
92
-    *
93
-    * @param mixed $key a key identifying the value to be cached. This can be a simple string or
94
-    * a complex data structure consisting of factors representing the key.
95
-    * @param \Closure $closure the closure that will be used to generate a value to be cached.
96
-    * In case $closure returns `false`, the value will not be cached.
97
-    * @param int $duration default duration in seconds before the cache will expire. If not set,
98
-    * [[defaultDuration]] value will be used. 0 means never expire.
99
-    * @param \yii\caching\Dependency $dependency dependency of the cached item. If the dependency changes,
100
-    * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
101
-    * This parameter is ignored if [[serializer]] is `false`.
102
-    * @return mixed result of $closure execution
103
-    */
77
+     * Method combines both [[setHasCache()]] and [[getHasCache()]] methods to retrieve value identified by a $key,
78
+     * or to store the result of $closure execution if there is no cache available for the $key.
79
+     *
80
+     * Usage example:
81
+     *
82
+     * ```php
83
+     * use CacheableTrait;
84
+     *
85
+     * public function getTopProducts($count = 10)
86
+     * {
87
+     *     return $this->getOrSetHasCache(['top-n-products', 'n' => $count], function ($cache) use ($count) {
88
+     *         return Products::find()->mostPopular()->limit(10)->all();
89
+     *     }, 1000);
90
+     * }
91
+     * ```
92
+     *
93
+     * @param mixed $key a key identifying the value to be cached. This can be a simple string or
94
+     * a complex data structure consisting of factors representing the key.
95
+     * @param \Closure $closure the closure that will be used to generate a value to be cached.
96
+     * In case $closure returns `false`, the value will not be cached.
97
+     * @param int $duration default duration in seconds before the cache will expire. If not set,
98
+     * [[defaultDuration]] value will be used. 0 means never expire.
99
+     * @param \yii\caching\Dependency $dependency dependency of the cached item. If the dependency changes,
100
+     * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
101
+     * This parameter is ignored if [[serializer]] is `false`.
102
+     * @return mixed result of $closure execution
103
+     */
104 104
     public function getOrSetHasCache($key, \Closure $closure, $duration = null, $dependency = null)
105 105
     {
106 106
         if (($value = $this->getHasCache($key)) !== false) {
Please login to merge, or discard this patch.
core/web/filters/RobotsFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
     {
87 87
         if (Yii::$app->request->isPost) {
88 88
             if ($this->getElapsedProcessTime() < $this->delay) {
89
-                throw new InvalidCallException("Robots Filter has detected an invalid Request: " . VarDumper::export(ArrayHelper::coverSensitiveValues(Yii::$app->request->post())));
89
+                throw new InvalidCallException("Robots Filter has detected an invalid Request: ".VarDumper::export(ArrayHelper::coverSensitiveValues(Yii::$app->request->post())));
90 90
             }
91 91
         }
92 92
         
Please login to merge, or discard this patch.
core/web/Bootstrap.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
         
89 89
         // generate the rules from apiRules defintions as they are own entries:
90 90
         foreach ($rules as $api => $rule) {
91
-            $rule['controller'] = 'admin/' . $api;
91
+            $rule['controller'] = 'admin/'.$api;
92 92
             $result[] = $rule;
93 93
         }
94 94
         
Please login to merge, or discard this patch.