Completed
Pull Request — master (#1868)
by Marc
13:11
created
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/lazyload/LazyLoad.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -142,10 +142,10 @@  discard block
 block discarded – undo
142 142
      */
143 143
     public function run()
144 144
     {
145
-        $class = ($this->placeholderSrc ? 'lazyimage-wrapper' : 'lazy-image') . ' ' . $this->extraClass;
145
+        $class = ($this->placeholderSrc ? 'lazyimage-wrapper' : 'lazy-image').' '.$this->extraClass;
146 146
 
147 147
         if ($this->placeholderSrc && $this->placeholderAsBase64) {
148
-            $this->placeholderSrc = 'data:image/jpg;base64,' . base64_encode(file_get_contents($this->placeholderSrc));
148
+            $this->placeholderSrc = 'data:image/jpg;base64,'.base64_encode(file_get_contents($this->placeholderSrc));
149 149
         }
150 150
 
151 151
         if ($this->attributesOnly && !$this->placeholderSrc) {
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
         }
154 154
 
155 155
         if ($this->placeholderSrc) {
156
-            $tag = '<div class="' . $class . '">';
156
+            $tag = '<div class="'.$class.'">';
157 157
             $tag .= Html::tag('img', '', ['class' => 'lazy-image lazyimage', 'data-src' => $this->src]);
158 158
             $tag .= Html::tag('img', '', ['class' => 'lazyimage-placeholder-image', 'src' => $this->placeholderSrc]);
159
-            $tag .= '<noscript><img class="lazyimage-image" src="' . $this->src . '" /></noscript>';
159
+            $tag .= '<noscript><img class="lazyimage-image" src="'.$this->src.'" /></noscript>';
160 160
             $tag .= '</div>';
161 161
         } else {
162 162
             $tag = Html::tag('img', '', ['class' => $class, 'data-src' => $this->src, 'data-width' => $this->width, 'data-height' => $this->height]);
Please login to merge, or discard this patch.