Completed
Pull Request — master (#6303)
by Jan-Christoph
44:22 queued 29:14
created
apps/theming/lib/ThemingDefaults.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
119 119
 
120 120
 	public function getShortFooter() {
121 121
 		$slogan = $this->getSlogan();
122
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
123
-			' rel="noreferrer">' .$this->getEntity() . '</a>'.
124
-			($slogan !== '' ? ' – ' . $slogan : '');
122
+		$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
123
+			' rel="noreferrer">'.$this->getEntity().'</a>'.
124
+			($slogan !== '' ? ' – '.$slogan : '');
125 125
 
126 126
 		return $footer;
127 127
 	}
@@ -153,16 +153,16 @@  discard block
 block discarded – undo
153 153
 
154 154
 		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
155 155
 
156
-		if(!$logo || !$logoExists) {
157
-			if($useSvg) {
156
+		if (!$logo || !$logoExists) {
157
+			if ($useSvg) {
158 158
 				$logo = $this->urlGenerator->imagePath('core', 'logo.svg');
159 159
 			} else {
160 160
 				$logo = $this->urlGenerator->imagePath('core', 'logo.png');
161 161
 			}
162
-			return $logo . '?v=' . $cacheBusterCounter;
162
+			return $logo.'?v='.$cacheBusterCounter;
163 163
 		}
164 164
 
165
-		return $this->urlGenerator->linkToRoute('theming.Theming.getLogo') . '?v=' . $cacheBusterCounter;
165
+		return $this->urlGenerator->linkToRoute('theming.Theming.getLogo').'?v='.$cacheBusterCounter;
166 166
 	}
167 167
 
168 168
 	/**
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 * @return string
172 172
 	 */
173 173
 	public function getBackground() {
174
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime',false);
174
+		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
175 175
 
176 176
 		$backgroundExists = true;
177 177
 		try {
@@ -182,11 +182,11 @@  discard block
 block discarded – undo
182 182
 
183 183
 		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
184 184
 
185
-		if(!$backgroundLogo || !$backgroundExists) {
186
-			return $this->urlGenerator->imagePath('core','background.png') . '?v=' . $cacheBusterCounter;
185
+		if (!$backgroundLogo || !$backgroundExists) {
186
+			return $this->urlGenerator->imagePath('core', 'background.png').'?v='.$cacheBusterCounter;
187 187
 		}
188 188
 
189
-		return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground') . '?v=' . $cacheBusterCounter;
189
+		return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground').'?v='.$cacheBusterCounter;
190 190
 	}
191 191
 
192 192
 	/**
@@ -221,9 +221,9 @@  discard block
 block discarded – undo
221 221
 		}
222 222
 
223 223
 		$variables = [
224
-			'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
225
-			'theming-logo-mime' => "'" . $this->config->getAppValue('theming', 'logoMime', '') . "'",
226
-			'theming-background-mime' => "'" . $this->config->getAppValue('theming', 'backgroundMime', '') . "'"
224
+			'theming-cachebuster' => "'".$this->config->getAppValue('theming', 'cachebuster', '0')."'",
225
+			'theming-logo-mime' => "'".$this->config->getAppValue('theming', 'logoMime', '')."'",
226
+			'theming-background-mime' => "'".$this->config->getAppValue('theming', 'backgroundMime', '')."'"
227 227
 		];
228 228
 
229 229
 		$variables['image-logo'] = "'".$this->urlGenerator->getAbsoluteURL($this->getLogo())."'";
@@ -255,11 +255,11 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	public function shouldReplaceIcons() {
257 257
 		$cache = $this->cacheFactory->create('theming');
258
-		if($value = $cache->get('shouldReplaceIcons')) {
259
-			return (bool)$value;
258
+		if ($value = $cache->get('shouldReplaceIcons')) {
259
+			return (bool) $value;
260 260
 		}
261 261
 		$value = false;
262
-		if(extension_loaded('imagick')) {
262
+		if (extension_loaded('imagick')) {
263 263
 			$checkImagick = new \Imagick();
264 264
 			if (count($checkImagick->queryFormats('SVG')) >= 1) {
265 265
 				$value = true;
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 	 */
276 276
 	private function increaseCacheBuster() {
277 277
 		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
278
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
278
+		$this->config->setAppValue('theming', 'cachebuster', (int) $cacheBusterKey + 1);
279 279
 		$this->cacheFactory->create('theming')->clear('getScssVariables');
280 280
 	}
281 281
 
Please login to merge, or discard this patch.