|
@@ -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
|
} |