Completed
Pull Request — master (#2165)
by Basil
27s
created
core/console/Command.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     {
41 41
         if ($this->verbose) {
42 42
             $message = $this->printableMessage($message);
43
-            $this->output(!empty($section) ? $section . ': ' . $message : $message);
43
+            $this->output(!empty($section) ? $section.': '.$message : $message);
44 44
         }
45 45
     }
46 46
     
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
             $name = substr($name, 0, -(strlen($suffix)));
119 119
         }
120 120
     
121
-        return $name . $suffix;
121
+        return $name.$suffix;
122 122
     }
123 123
     
124 124
     /**
Please login to merge, or discard this patch.
core/widgets/SubmitButtonWidget.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -89,10 +89,10 @@
 block discarded – undo
89 89
             $(document).on('beforeSubmit', function (e) {                
90 90
                 var buttonSelector = $(e.target).find(':submit');
91 91
                 var formSelector = $(e.target);
92
-                if (formSelector.find('div." . $this->_activeForm->errorCssClass . "').length === 0) {
92
+                if (formSelector.find('div." . $this->_activeForm->errorCssClass."').length === 0) {
93 93
                     buttonSelector.attr('disabled', true);
94
-                    var newButtonLabel = '" . $this->pushed . "';
95
-                    if (newButtonLabel) { buttonSelector.html('" . $this->pushed . "'); }                            
94
+                    var newButtonLabel = '" . $this->pushed."';
95
+                    if (newButtonLabel) { buttonSelector.html('" . $this->pushed."'); }                            
96 96
                 }
97 97
                 return true;});");
98 98
         } else {
Please login to merge, or discard this patch.
core/texttospeech/TextToSpeechWidget.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@
 block discarded – undo
139 139
             var tts = $.textToSpeech({$config});
140 140
             var playButton = $('{$this->playButtonSelector}');
141 141
             var pauseButton = $('{$this->pauseButtonSelector}');
142
-            " . ($this->targetSelector ? "tts.setText($('{$this->targetSelector}').text());" : "") . "
142
+            ".($this->targetSelector ? "tts.setText($('{$this->targetSelector}').text());" : "")."
143 143
             var applyPlayClasses = function () {
144 144
                 playButton.addClass('{$this->playButtonActiveClass}');
145 145
                 pauseButton.removeClass('{$this->pauseButtonActiveClass}');
Please login to merge, or discard this patch.
core/web/Asset.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 
30 30
         if ($this->sourcePath === null) {
31 31
             $class = new ReflectionClass($this);
32
-            $this->sourcePath = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $this->defaultSourcePathFolder . DIRECTORY_SEPARATOR . Inflector::camel2id($class->getShortName());
32
+            $this->sourcePath = dirname($class->getFileName()).DIRECTORY_SEPARATOR.$this->defaultSourcePathFolder.DIRECTORY_SEPARATOR.Inflector::camel2id($class->getShortName());
33 33
         }
34 34
     }
35 35
 }
Please login to merge, or discard this patch.
core/theme/ThemeManager.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             $dir = $basePath;
56 56
         } else {
57 57
             // relative path
58
-            throw new InvalidConfigException('Theme base path have to be absolute or alias: ' . $basePath);
58
+            throw new InvalidConfigException('Theme base path have to be absolute or alias: '.$basePath);
59 59
         }
60 60
 
61 61
         // $basePath is an absolute path = /VENDOR/NAME/theme.json
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
65 65
             $basePath = pathinfo($basePath, PATHINFO_DIRNAME);
66 66
         } else {
67 67
             if (!is_dir($dir) || !is_readable($dir)) {
68
-                throw new Exception('Theme directory not exists or readable: ' . $dir);
68
+                throw new Exception('Theme directory not exists or readable: '.$dir);
69 69
             }
70 70
 
71
-            $themeFile = $dir . DIRECTORY_SEPARATOR . 'theme.json';
71
+            $themeFile = $dir.DIRECTORY_SEPARATOR.'theme.json';
72 72
             if (!file_exists($themeFile)) {
73
-                throw new InvalidConfigException('Theme config file missing at: ' . $themeFile);
73
+                throw new InvalidConfigException('Theme config file missing at: '.$themeFile);
74 74
             }
75 75
         }
76 76
         
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
         
173 173
         if (file_exists(Yii::getAlias('@app/themes'))) {
174 174
             foreach (glob(Yii::getAlias('@app/themes/*')) as $dirPath) {
175
-                $themeDefinitions[] = "@app/themes/" . basename($dirPath);
175
+                $themeDefinitions[] = "@app/themes/".basename($dirPath);
176 176
             }
177 177
         }
178 178
         
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
         
227 227
         $this->_themes[$basePath] = $themeConfig;
228 228
         
229
-        Yii::setAlias('@' . basename($basePath) . 'Theme', $basePath);
229
+        Yii::setAlias('@'.basename($basePath).'Theme', $basePath);
230 230
     }
231 231
     
232 232
     /**
Please login to merge, or discard this patch.
core/lazyload/LazyLoad.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -184,18 +184,18 @@  discard block
 block discarded – undo
184 184
     public function run()
185 185
     {
186 186
         if ($this->placeholderSrc && $this->placeholderAsBase64) {
187
-            $this->placeholderSrc = 'data:image/jpg;base64,' . base64_encode(file_get_contents($this->placeholderSrc));
187
+            $this->placeholderSrc = 'data:image/jpg;base64,'.base64_encode(file_get_contents($this->placeholderSrc));
188 188
         }
189 189
 
190 190
         if ($this->attributesOnly && !$this->placeholderSrc) {
191 191
             return "class=\"js-lazyimage $this->extraClass\" data-src=\"$this->src\" data-width=\"$this->width\" data-height=\"$this->height\" data-as-background=\"1\"";
192 192
         }
193 193
 
194
-        $tag = '<div class="lazyimage-wrapper ' . $this->extraClass . '">';
194
+        $tag = '<div class="lazyimage-wrapper '.$this->extraClass.'">';
195 195
         $tag .= Html::tag('img', '', array_merge(
196 196
             $this->options,
197 197
             [
198
-                'class' => 'js-lazyimage lazyimage' . ($this->replacePlaceholder ? (' ' . $this->extraClass) : ''),
198
+                'class' => 'js-lazyimage lazyimage'.($this->replacePlaceholder ? (' '.$this->extraClass) : ''),
199 199
                 'data-src' => $this->src,
200 200
                 'data-width' => $this->width,
201 201
                 'data-height' => $this->height,
@@ -205,9 +205,9 @@  discard block
 block discarded – undo
205 205
         if ($this->placeholderSrc) {
206 206
             $tag .= Html::tag('img', '', ['class' => 'lazyimage-placeholder', 'src' => $this->placeholderSrc]);
207 207
         } else {
208
-            $tag .= '<div class="lazyimage-placeholder"><div style="display: block; height: 0px; padding-bottom: ' . $this->generateAspectRation() . '%;"></div><div class="loader"></div></div>';
208
+            $tag .= '<div class="lazyimage-placeholder"><div style="display: block; height: 0px; padding-bottom: '.$this->generateAspectRation().'%;"></div><div class="loader"></div></div>';
209 209
         }
210
-        $tag .= '<noscript><img class="loaded ' . $this->extraClass . '" src="'.$this->src.'" /></noscript>';
210
+        $tag .= '<noscript><img class="loaded '.$this->extraClass.'" src="'.$this->src.'" /></noscript>';
211 211
         $tag .= '</div>';
212 212
 
213 213
         return $tag;
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
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
      */
65 65
     public function prependCruft($content)
66 66
     {
67
-        return $this->cruft . trim($content);
67
+        return $this->cruft.trim($content);
68 68
     }
69 69
     
70 70
     /**
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     {
75 75
         if (Yii::$app->response->format == Response::FORMAT_JSON && !in_array(Yii::$app->response->statusCode, $this->ignoreStatusCodes)) {
76 76
             Yii::$app->response->headers->set(self::CRUFT_HEADER_NAME, $this->getCruftLength());
77
-            Yii::$app->response->on(Response::EVENT_AFTER_PREPARE, function ($event) {
77
+            Yii::$app->response->on(Response::EVENT_AFTER_PREPARE, function($event) {
78 78
                 $event->sender->content = $this->prependCruft($event->sender->content);
79 79
             });
80 80
         }
Please login to merge, or discard this patch.
core/base/BaseBootstrap.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
             // see if the module has a registerComponents method
107 107
             foreach ($module->registerComponents() as $componentId => $definition) {
108 108
                 if (!$app->has($componentId)) {
109
-                    Yii::debug('Register component ' . $componentId, __METHOD__);
109
+                    Yii::debug('Register component '.$componentId, __METHOD__);
110 110
                     $app->set($componentId, $definition);
111 111
                 }
112 112
             }
Please login to merge, or discard this patch.
core/TagParser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@
 block discarded – undo
139 139
     {
140 140
         if (!is_object($this->tags[$tag])) {
141 141
             $this->tags[$tag] = Yii::createObject($this->tags[$tag]);
142
-            Yii::debug('tag parser object generated for:'. $tag, __CLASS__);
142
+            Yii::debug('tag parser object generated for:'.$tag, __CLASS__);
143 143
         }
144 144
     }
145 145
     
Please login to merge, or discard this patch.