Completed
Pull Request — master (#1868)
by Marc
21:29
created
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/helpers/ExportHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
     {
140 140
         $output = null;
141 141
         foreach ($input as $row) {
142
-            $output.= self::generateRow($row, $delimiter, '"');
142
+            $output .= self::generateRow($row, $delimiter, '"');
143 143
         }
144 144
 
145 145
         return $output;
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
      */
157 157
     protected static function generateRow(array $row, $delimiter, $enclose)
158 158
     {
159
-        array_walk($row, function (&$item) use ($enclose) {
159
+        array_walk($row, function(&$item) use ($enclose) {
160 160
             if (is_bool($item)) {
161 161
                 $item = (int) $item;
162 162
             } elseif (is_null($item)) {
@@ -167,6 +167,6 @@  discard block
 block discarded – undo
167 167
             $item = $enclose.Html::encode($item).$enclose;
168 168
         });
169 169
 
170
-        return implode($delimiter, $row) . PHP_EOL;
170
+        return implode($delimiter, $row).PHP_EOL;
171 171
     }
172 172
 }
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/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.
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.
core/helpers/StringHelper.php 1 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.