nextcloud / server

apps/cloud_federation_api/composer/composer/InstalledVersions.php

Spacing +7 added lines, -7 removed lines

@@ -156,7 +156,7 @@ 
             return implode(' || ', $ranges);
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -177,7 +177,7 @@ 
             return $installed['versions'][$packageName]['version'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -198,7 +198,7 @@ 
             return $installed['versions'][$packageName]['pretty_version'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -219,7 +219,7 @@ 
             return $installed['versions'][$packageName]['reference'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -236,7 +236,7 @@ 
             return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -265,7 +265,7 @@ 
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
+                self::$installed = include __DIR__.'/installed.php';
             } else {
                 self::$installed = array();
             }
@@ -338,7 +338,7 @@ 
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                self::$installed = require __DIR__.'/installed.php';
             } else {
                 self::$installed = array();
             }

apps/contactsinteraction/composer/composer/InstalledVersions.php

Spacing +7 added lines, -7 removed lines

@@ -156,7 +156,7 @@ 
             return implode(' || ', $ranges);
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -177,7 +177,7 @@ 
             return $installed['versions'][$packageName]['version'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -198,7 +198,7 @@ 
             return $installed['versions'][$packageName]['pretty_version'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -219,7 +219,7 @@ 
             return $installed['versions'][$packageName]['reference'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -236,7 +236,7 @@ 
             return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -265,7 +265,7 @@ 
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
+                self::$installed = include __DIR__.'/installed.php';
             } else {
                 self::$installed = array();
             }
@@ -338,7 +338,7 @@ 
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                self::$installed = require __DIR__.'/installed.php';
             } else {
                 self::$installed = array();
             }

apps/dav/lib/Connector/Sabre/MtimeSanitizer.php

Spacing +2 added lines, -2 removed lines

@@ -33,10 +33,10 @@
 		}
 
 		// Prevent writing invalid mtime (timezone-proof)
-		if ((int)$mtimeFromRequest <= 24 * 60 * 60) {
+		if ((int) $mtimeFromRequest <= 24 * 60 * 60) {
 			throw new \InvalidArgumentException('X-OC-MTime header must be a valid positive integer');
 		}
 
-		return (int)$mtimeFromRequest;
+		return (int) $mtimeFromRequest;
 	}
 }

lib/public/IDBConnection.php

Spacing +6 added lines, -6 removed lines

@@ -48,32 +48,32 @@
 	/**
 	 * @deprecated 22.0.0 this is an internal event
 	 */
-	public const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES';
+	public const ADD_MISSING_INDEXES_EVENT = self::class.'::ADD_MISSING_INDEXES';
 
 	/**
 	 * @deprecated 22.0.0 this is an internal event
 	 */
-	public const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES';
+	public const CHECK_MISSING_INDEXES_EVENT = self::class.'::CHECK_MISSING_INDEXES';
 
 	/**
 	 * @deprecated 22.0.0 this is an internal event
 	 */
-	public const ADD_MISSING_PRIMARY_KEYS_EVENT = self::class . '::ADD_MISSING_PRIMARY_KEYS';
+	public const ADD_MISSING_PRIMARY_KEYS_EVENT = self::class.'::ADD_MISSING_PRIMARY_KEYS';
 
 	/**
 	 * @deprecated 22.0.0 this is an internal event
 	 */
-	public const CHECK_MISSING_PRIMARY_KEYS_EVENT = self::class . '::CHECK_MISSING_PRIMARY_KEYS';
+	public const CHECK_MISSING_PRIMARY_KEYS_EVENT = self::class.'::CHECK_MISSING_PRIMARY_KEYS';
 
 	/**
 	 * @deprecated 22.0.0 this is an internal event
 	 */
-	public const ADD_MISSING_COLUMNS_EVENT = self::class . '::ADD_MISSING_COLUMNS';
+	public const ADD_MISSING_COLUMNS_EVENT = self::class.'::ADD_MISSING_COLUMNS';
 
 	/**
 	 * @deprecated 22.0.0 this is an internal event
 	 */
-	public const CHECK_MISSING_COLUMNS_EVENT = self::class . '::CHECK_MISSING_COLUMNS';
+	public const CHECK_MISSING_COLUMNS_EVENT = self::class.'::CHECK_MISSING_COLUMNS';
 
 	/**
 	 * Gets the QueryBuilder for the connection.

lib/private/DB/AdapterPgSql.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 		$result = $this->conn->executeQuery('SELECT lastval()');
 		$val = $result->fetchOne();
 		$result->free();
-		return (int)$val;
+		return (int) $val;
 	}
 
 	public const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
@@ -55,7 +55,7 @@ 
 		foreach ($values as $key => $value) {
 			$builder->setValue($key, $builder->createNamedParameter($value));
 		}
-		$queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
+		$queryString = $builder->getSQL().' ON CONFLICT DO NOTHING';
 		return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
 	}
 

lib/private/AppFramework/Http/Request.php

Spacing +6 added lines, -6 removed lines

@@ -304,8 +304,8 @@ 
 	 */
 	public function getHeader(string $name): string {
 		$name = strtoupper(str_replace('-', '_', $name));
-		if (isset($this->server['HTTP_' . $name])) {
-			return $this->server['HTTP_' . $name];
+		if (isset($this->server['HTTP_'.$name])) {
+			return $this->server['HTTP_'.$name];
 		}
 
 		// There's a few headers that seem to end up in the top-level
@@ -665,7 +665,7 @@ 
 	 * @return bool
 	 */
 	private function isOverwriteCondition(string $type = ''): bool {
-		$regex = '/' . $this->config->getSystemValue('overwritecondaddr', '')  . '/';
+		$regex = '/'.$this->config->getSystemValue('overwritecondaddr', '').'/';
 		$remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
 		return $regex === '//' || preg_match($regex, $remoteAddr) === 1
 		|| $type !== 'protocol';
@@ -738,7 +738,7 @@ 
 	public function getRequestUri(): string {
 		$uri = isset($this->server['REQUEST_URI']) ? $this->server['REQUEST_URI'] : '';
 		if ($this->config->getSystemValue('overwritewebroot') !== '' && $this->isOverwriteCondition()) {
-			$uri = $this->getScriptName() . substr($uri, \strlen($this->server['SCRIPT_NAME']));
+			$uri = $this->getScriptName().substr($uri, \strlen($this->server['SCRIPT_NAME']));
 		}
 		return $uri;
 	}
@@ -820,7 +820,7 @@ 
 			// FIXME: This code is untestable due to __DIR__, also that hardcoded path is really dangerous
 			$serverRoot = str_replace('\\', '/', substr(__DIR__, 0, -\strlen('lib/private/appframework/http/')));
 			$suburi = str_replace('\\', '/', substr(realpath($this->server['SCRIPT_FILENAME']), \strlen($serverRoot)));
-			$name = '/' . ltrim($overwriteWebRoot . $suburi, '/');
+			$name = '/'.ltrim($overwriteWebRoot.$suburi, '/');
 		}
 		return $name;
 	}
@@ -895,7 +895,7 @@ 
 			return $host;
 		}
 
-		$trustedList = (array)$this->config->getSystemValue('trusted_domains', []);
+		$trustedList = (array) $this->config->getSystemValue('trusted_domains', []);
 		if (count($trustedList) > 0) {
 			return reset($trustedList);
 		}

lib/private/Installer.php

Spacing +16 added lines, -16 removed lines

@@ -109,8 +109,8 @@ 
 
 		$basedir = $app['path'].'/'.$appId;
 
-		if (is_file($basedir . '/appinfo/database.xml')) {
-			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+		if (is_file($basedir.'/appinfo/database.xml')) {
+			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in '.$appId);
 		}
 
 		$l = \OC::$server->getL10N('core');
@@ -160,7 +160,7 @@ 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
 		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
+		self::includeAppScript($basedir.'/appinfo/install.php');
 
 		OC_App::executeRepairSteps($appId, $info['repair-steps']['install']);
 
@@ -232,7 +232,7 @@ 
 			if ($app['id'] === $appId) {
 				// Load the certificate
 				$certificate = new X509();
-				$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
+				$rootCrt = file_get_contents(__DIR__.'/../../resources/codesigning/root.crt');
 				$rootCrts = $this->splitCerts($rootCrt);
 				foreach ($rootCrts as $rootCrt) {
 					$certificate->loadCA($rootCrt);
@@ -244,7 +244,7 @@ 
 				foreach ($rootCrts as $rootCrt) {
 					$crl->loadCA($rootCrt);
 				}
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+				$crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl'));
 				if ($crl->validateSignature() !== true) {
 					throw new \Exception('Could not validate CRL signature');
 				}
@@ -297,7 +297,7 @@ 
 
 				// Check if the signature actually matches the downloaded content
 				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+				$verified = (bool) openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
 				// PHP 8+ deprecates openssl_free_key and automatically destroys the key instance when it goes out of scope
 				if ((PHP_VERSION_ID < 80000)) {
 					openssl_free_key($certificate);
@@ -309,11 +309,11 @@ 
 					$archive = new TAR($tempFile);
 
 					if (!$archive->extract($extractDir)) {
-						$errorMessage = 'Could not extract app ' . $appId;
+						$errorMessage = 'Could not extract app '.$appId;
 
 						$archiveError = $archive->getError();
 						if ($archiveError instanceof \PEAR_Error) {
-							$errorMessage .= ': ' . $archiveError->getMessage();
+							$errorMessage .= ': '.$archiveError->getMessage();
 						}
 
 						throw new \Exception($errorMessage);
@@ -334,24 +334,24 @@ 
 					// Check if appinfo/info.xml has the same app ID as well
 					if ((PHP_VERSION_ID < 80000)) {
 						$loadEntities = libxml_disable_entity_loader(false);
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+						$xml = simplexml_load_file($extractDir.'/'.$folders[0].'/appinfo/info.xml');
 						libxml_disable_entity_loader($loadEntities);
 					} else {
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+						$xml = simplexml_load_file($extractDir.'/'.$folders[0].'/appinfo/info.xml');
 					}
-					if ((string)$xml->id !== $appId) {
+					if ((string) $xml->id !== $appId) {
 						throw new \Exception(
 							sprintf(
 								'App for id %s has a wrong app ID in info.xml: %s',
 								$appId,
-								(string)$xml->id
+								(string) $xml->id
 							)
 						);
 					}
 
 					// Check if the version is lower than before
 					$currentVersion = OC_App::getAppVersion($appId);
-					$newVersion = (string)$xml->version;
+					$newVersion = (string) $xml->version;
 					if (version_compare($currentVersion, $newVersion) === 1) {
 						throw new \Exception(
 							sprintf(
@@ -363,12 +363,12 @@ 
 						);
 					}
 
-					$baseDir = OC_App::getInstallPath() . '/' . $appId;
+					$baseDir = OC_App::getInstallPath().'/'.$appId;
 					// Remove old app with the ID if existent
 					OC_Helper::rmdirr($baseDir);
 					// Move to app folder
 					if (@mkdir($baseDir)) {
-						$extractDir .= '/' . $folders[0];
+						$extractDir .= '/'.$folders[0];
 						OC_Helper::copyr($extractDir, $baseDir);
 					}
 					OC_Helper::copyr($extractDir, $baseDir);
@@ -497,7 +497,7 @@ 
 			if (\OC::$server->getAppManager()->isShipped($appId)) {
 				return false;
 			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
+			$appDir = OC_App::getInstallPath().'/'.$appId;
 			OC_Helper::rmdirr($appDir);
 			return true;
 		} else {

lib/private/Security/TrustedDomainHelper.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 		}
 
 		if (isset($parsedUrl['port']) && $parsedUrl['port']) {
-			return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
+			return $this->isTrustedDomain($parsedUrl['host'].':'.$parsedUrl['port']);
 		}
 
 		return $this->isTrustedDomain($parsedUrl['host']);
@@ -106,9 +106,9 @@ 
 			if (gettype($trusted) !== 'string') {
 				break;
 			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
+			$regex = '/^'.implode('[-\.a-zA-Z0-9]*', array_map(function($v) {
 				return preg_quote($v, '/');
-			}, explode('*', $trusted))) . '$/i';
+			}, explode('*', $trusted))).'$/i';
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
 				return true;
 			}

lib/private/Preview/MarkDown.php

Spacing +7 added lines, -7 removed lines

@@ -76,12 +76,12 @@ 
 		imagecolorallocate($image, 255, 255, 255);
 		$textColor = imagecolorallocate($image, 0, 0, 0);
 
-		$fontFile = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
-		$fontFileBold = __DIR__ . '/../../../core/fonts/NotoSans-Bold.ttf';
+		$fontFile = __DIR__.'/../../../core/fonts/NotoSans-Regular.ttf';
+		$fontFileBold = __DIR__.'/../../../core/fonts/NotoSans-Bold.ttf';
 
 		$canUseTTF = function_exists('imagettftext');
 
-		$textOffset = (int)min($maxX * 0.05, $maxY * 0.05);
+		$textOffset = (int) min($maxX * 0.05, $maxY * 0.05);
 		$nextLineStart = 0;
 		$y = $textOffset;
 		foreach ($lines as $line) {
@@ -107,14 +107,14 @@ 
 
 			// Add spacing before headlines
 			if ($actualFontSize !== $fontSize && $y !== $textOffset) {
-				$y += (int)($actualFontSize * 2);
+				$y += (int) ($actualFontSize * 2);
 			}
 
 			$x = $textOffset;
-			$y += (int)($nextLineStart + $actualFontSize);
+			$y += (int) ($nextLineStart + $actualFontSize);
 
 			if ($canUseTTF === true) {
-				$wordWrap = (int)((1 / $actualFontSize * 1.3) * $maxX);
+				$wordWrap = (int) ((1 / $actualFontSize * 1.3) * $maxX);
 
 				// Get rid of markdown symbols that we still needed for the font size
 				$line = preg_replace('/^#*\s/', '', $line);
@@ -122,7 +122,7 @@ 
 				$wrappedText = wordwrap($line, $wordWrap, "\n");
 				$linesWrapped = count(explode("\n", $wrappedText));
 				imagettftext($image, $actualFontSize, 0, $x, $y, $textColor, $actualFontSize === $fontSize ? $fontFile : $fontFileBold, $wrappedText);
-				$nextLineStart = (int)($linesWrapped * ceil($actualFontSize * 2));
+				$nextLineStart = (int) ($linesWrapped * ceil($actualFontSize * 2));
 				if ($actualFontSize !== $fontSize && $y !== $textOffset) {
 					$nextLineStart -= $actualFontSize;
 				}