@@ -33,14 +33,14 @@ |
||
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 | } |
@@ -100,25 +100,25 @@ discard block |
||
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 |
||
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 | } |
@@ -255,6 +255,6 @@ |
||
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 | } |