Completed
Pull Request — master (#2047)
by
unknown
02:03
created
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/web/Svg.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -100,25 +100,25 @@  discard block
 block discarded – undo
100 100
     public function run()
101 101
     {
102 102
         // Cache generated code
103
-        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function () {
103
+        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function() {
104 104
 
105 105
             // Check if file ends with .svg, if not add the extension
106
-            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file . '.svg';
106
+            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file.'.svg';
107 107
 
108 108
             if ($this->symbolMode) {
109
-                $svgPath = Yii::$app->view->publicHtml . '/' . $svgFile;
109
+                $svgPath = Yii::$app->view->publicHtml.'/'.$svgFile;
110 110
 
111
-                return '<svg class="symbol symbol--' . $this->symbolName . '' . ($this->cssClass ? ' ' . $this->cssClass : '') . '"><use class="symbol__use" xlink:href="' . $svgPath . '#' . $this->symbolName . '" /></svg>';
111
+                return '<svg class="symbol symbol--'.$this->symbolName.''.($this->cssClass ? ' '.$this->cssClass : '').'"><use class="symbol__use" xlink:href="'.$svgPath.'#'.$this->symbolName.'" /></svg>';
112 112
             } else {
113 113
                 // Build the full svg file path
114
-                $svgPath = $this->folder . DIRECTORY_SEPARATOR . $svgFile;
114
+                $svgPath = $this->folder.DIRECTORY_SEPARATOR.$svgFile;
115 115
 
116 116
                 // Get the svg contents
117 117
                 $content = FileHelper::getFileContent($svgPath);
118 118
 
119 119
                 // If a cssClass string is given, add it to the <svg> tag
120 120
                 if ($this->cssClass && is_string($this->cssClass)) {
121
-                    $content = preg_replace('/<svg/', '<svg class="' . $this->cssClass . '"', $content);
121
+                    $content = preg_replace('/<svg/', '<svg class="'.$this->cssClass.'"', $content);
122 122
                 }
123 123
 
124 124
                 if ($content) {
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
                 }
127 127
             }
128 128
 
129
-            throw new Exception('Unable to access SVG File: ' . $svgPath);
129
+            throw new Exception('Unable to access SVG File: '.$svgPath);
130 130
         });
131 131
     }
132 132
 }
Please login to merge, or discard this patch.
core/web/Element.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -255,6 +255,6 @@
 block discarded – undo
255 255
     {
256 256
         $view = new View();
257 257
         $view->autoRegisterCsrf = false;
258
-        return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args);
258
+        return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args);
259 259
     }
260 260
 }
Please login to merge, or discard this patch.
core/helpers/StringHelper.php 1 patch
Spacing   +4 added lines, -4 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
     /**
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
         // we could not find any match, therefore use casual truncate method.
206 206
         if ($first === false) {
207 207
             // as the length value in truncate middle stands for to the left and to the right, we multiple this value with 2
208
-            return self::truncate($content, ($length*2), $affix);
208
+            return self::truncate($content, ($length * 2), $affix);
209 209
         }
210 210
 
211 211
         $last = $first + mb_strlen($word);
@@ -217,9 +217,9 @@  discard block
 block discarded – undo
217 217
 
218 218
         // string before
219 219
         $before = (count($left) > $length) ? $affix.implode("", array_slice($left, -$length)) : implode("", $left);
220
-        $after = (count($right) > $length) ? implode("", array_slice($right, 0, $length)) . $affix : implode("", $right);
220
+        $after = (count($right) > $length) ? implode("", array_slice($right, 0, $length)).$affix : implode("", $right);
221 221
 
222
-        return $before . implode("", $middle) . $after;
222
+        return $before.implode("", $middle).$after;
223 223
     }
224 224
 
225 225
     /**
Please login to merge, or discard this patch.
core/base/ModuleReflection.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
         
217 217
         return [
218 218
             'module' => $this->module->id,
219
-            'route' => $this->module->id . '/' . $request['route'],
219
+            'route' => $this->module->id.'/'.$request['route'],
220 220
             'params' => $request['originalArgs'],
221 221
         ];
222 222
     }
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
             throw new NotFoundHttpException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id));
238 238
         }
239 239
         
240
-        Yii::debug('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__);
240
+        Yii::debug('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__);
241 241
         
242 242
         $this->controller = $controller[0];
243 243
         $originalController = Yii::$app->controller;
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
          *
249 249
          * @see https://github.com/luyadev/luya/issues/1730
250 250
          */
251
-        $this->controller->on(Controller::EVENT_BEFORE_ACTION, function ($event) {
251
+        $this->controller->on(Controller::EVENT_BEFORE_ACTION, function($event) {
252 252
             Yii::$app->controller = $this->controller;
253 253
         });
254 254
         /**
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
          *
257 257
          * @see https://github.com/luyadev/luya/issues/1768
258 258
          */
259
-        $this->controller->on(Controller::EVENT_AFTER_ACTION, function ($event) use ($originalController) {
259
+        $this->controller->on(Controller::EVENT_AFTER_ACTION, function($event) use ($originalController) {
260 260
             Yii::$app->controller = $originalController;
261 261
         });
262 262
         
Please login to merge, or discard this patch.
core/web/EmailLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
      */
62 62
     public function getHref()
63 63
     {
64
-        return empty($this->getEmail()) ? null : 'mailto:' . $this->getEmail();
64
+        return empty($this->getEmail()) ? null : 'mailto:'.$this->getEmail();
65 65
     }
66 66
 
67 67
     /**
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)) {
@@ -171,6 +171,6 @@  discard block
 block discarded – undo
171 171
             ], $item).$enclose;
172 172
         });
173 173
 
174
-        return implode($delimiter, $row) . PHP_EOL;
174
+        return implode($delimiter, $row).PHP_EOL;
175 175
     }
176 176
 }
Please login to merge, or discard this patch.
core/theme/Theme.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         }
75 75
     
76 76
         $pos = strpos($viewPath, '/');
77
-        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos) . '/views');
77
+        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos).'/views');
78 78
         $this->pathMap[$rootPath] = $pathMap;
79 79
     
80 80
         $this->pathMap['@app/views'] = $pathMap;
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
      */
110 110
     public function getLayoutPath()
111 111
     {
112
-        return $this->viewPath . '/' . self::LAYOUTS_PATH;
112
+        return $this->viewPath.'/'.self::LAYOUTS_PATH;
113 113
     }
114 114
     
115 115
     /**
Please login to merge, or discard this patch.