Completed
Pull Request — master (#2070)
by Basil
02:17
created
core/web/Composition.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -417,7 +417,7 @@
 block discarded – undo
417 417
      *
418 418
      * @see \ArrayAccess::offsetGet()
419 419
      * @param string $offset The key to get from the array.
420
-     * @return mixed The value for the offset key from the array.
420
+     * @return string|boolean The value for the offset key from the array.
421 421
      */
422 422
     public function offsetGet($offset)
423 423
     {
Please login to merge, or discard this patch.
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/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/helpers/ArrayHelper.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
      * ```
54 54
      *
55 55
      * @param array $data The input data to cover given sensitive key values. `['username' => 'foo', 'password' => 'bar']`.
56
-     * @param array $key The keys which can contain sensitive data inside the $data array. `['password', 'pwd', 'pass']` if no keys provided the {{luya\helpers\ArrayHelper::$sensitiveDefaultKeys}} is used.
56
+     * @param array $keys The keys which can contain sensitive data inside the $data array. `['password', 'pwd', 'pass']` if no keys provided the {{luya\helpers\ArrayHelper::$sensitiveDefaultKeys}} is used.
57 57
      * @since 1.0.6
58 58
      */
59 59
     public static function coverSensitiveValues(array $data, array $keys = [])
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
     public static function search(array $array, $searchText, $sensitive = false, array $keys = [])
159 159
     {
160 160
         $function = $sensitive ? 'strpos' : 'stripos';
161
-        return array_filter($array, function ($item) use ($searchText, $function, $keys) {
161
+        return array_filter($array, function($item) use ($searchText, $function, $keys) {
162 162
             $response = false;
163 163
             foreach ($item as $key => $value) {
164 164
                 if ($response) {
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
         $array = array_values($array); // align array keys
207 207
         $columns = array_column($array, $column);
208 208
         $key = array_search($search, $columns);
209
-        return ($key !== false) ?  $array[$key] : false;
209
+        return ($key !== false) ? $array[$key] : false;
210 210
     }
211 211
     
212 212
     /**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
      */
239 239
     public static function searchColumns(array $array, $column, $search)
240 240
     {
241
-        $keys = array_filter($array, function ($var) use ($column, $search) {
241
+        $keys = array_filter($array, function($var) use ($column, $search) {
242 242
             return strcasecmp($search, $var[$column]) == 0 ? true : false;
243 243
         });
244 244
         
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
         $array = array_combine($range, $range);
279 279
         
280 280
         if ($text) {
281
-            array_walk($array, function (&$item, $key) use ($text) {
281
+            array_walk($array, function(&$item, $key) use ($text) {
282 282
                 if (is_array($text)) {
283 283
                     list($singular, $plural) = $text;
284 284
                     if ($key == 1) {
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.
core/messages/pl/luya.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
- return [
2
+    return [
3 3
     '{attribute} must have a minimum length of {length} characters.' => '{attribute} musi mieć co najmniej {length} znaków.',
4 4
     '{attribute} must include at least one special character.' => '{attribute} musi zawierać przynajmniej jeden znak specjalny.',
5 5
     '{attribute} must include at least one digit.' => '{attribute} musi zawierać co najmniej jedną cyfrę.',
Please login to merge, or discard this patch.
dev/TranslationController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
         $messageFiles = glob("$repoPath/src/**/messages/$language/$filename.php") ?: glob("$repoPath/src/messages/$language/$filename.php");
42 42
 
43 43
         $this->outputInfo('Following files will be affected:');
44
-        $this->output(implode("\n", $messageFiles) . "\n");
44
+        $this->output(implode("\n", $messageFiles)."\n");
45 45
 
46 46
         $key = $this->prompt('Insert translation key:');
47 47
         $text = $this->prompt('Insert translation text:');
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
         if (!$this->dry) {
61 61
             if (exec("[ -d $repoPath/.git ] && command -v git")) {
62
-                $diffCommand = "git --git-dir=$repoPath/.git --work-tree=$repoPath diff -- " . str_replace($repoPath . '/', '', implode(" ", $messageFiles));
62
+                $diffCommand = "git --git-dir=$repoPath/.git --work-tree=$repoPath diff -- ".str_replace($repoPath.'/', '', implode(" ", $messageFiles));
63 63
                 exec($diffCommand, $diff);
64 64
                 $this->output(implode("\n", $diff));
65 65
             }
Please login to merge, or discard this patch.
core/web/Controller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,14 +33,14 @@
 block discarded – undo
33 33
     {
34 34
         if ($this->module instanceof Module) {
35 35
             if ($this->module->useAppViewPath) {
36
-                return '@app/views/' . $this->module->id . '/' . $this->id;
36
+                return '@app/views/'.$this->module->id.'/'.$this->id;
37 37
             } elseif (is_array($this->module->viewMap)) {
38
-                $currentAction = $this->id . '/' . ($this->action ? $this->action->id : $this->defaultAction);
38
+                $currentAction = $this->id.'/'.($this->action ? $this->action->id : $this->defaultAction);
39 39
                 foreach ($this->module->viewMap as $action => $viewPath) {
40 40
 
41 41
                     // Special case for map all views of controller
42 42
                     if ($action === '*') {
43
-                        return $viewPath . '/' . $this->id;
43
+                        return $viewPath.'/'.$this->id;
44 44
                     } elseif (fnmatch($action, $currentAction)) {
45 45
                         return $viewPath;
46 46
                     }
Please login to merge, or discard this patch.