Completed
Pull Request — master (#2042)
by Marc
02:11
created
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/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/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/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.