nextcloud / server

lib/private/Mail/Message.php

Spacing +2 added lines, -2 removed lines

@@ -72,8 +72,8 @@
 
 		$convertedAddresses = [];
 
-		foreach($addresses as $email => $readableName) {
-			if(!is_numeric($email)) {
+		foreach ($addresses as $email => $readableName) {
+			if (!is_numeric($email)) {
 				list($name, $domain) = explode('@', $email, 2);
 				$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
 				$convertedAddresses[$name.'@'.$domain] = $readableName;

lib/private/Mail/EMailTemplate.php

Spacing +13 added lines, -13 removed lines

@@ -402,7 +402,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]);
 		if ($plainTitle !== false) {
-			$this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL;
+			$this->plainBody .= $plainTitle.PHP_EOL.PHP_EOL;
 		}
 	}
 
@@ -438,7 +438,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->bodyText, [$text]);
 		if ($plainText !== false) {
-			$this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
+			$this->plainBody .= $plainText.PHP_EOL.PHP_EOL;
 		}
 	}
 
@@ -468,18 +468,18 @@ 
 
 		$htmlText = $text;
 		if ($metaInfo) {
-			$htmlText = '<em style="color:#777;">' . $metaInfo . '</em><br>' . $htmlText;
+			$htmlText = '<em style="color:#777;">'.$metaInfo.'</em><br>'.$htmlText;
 		}
 		if ($icon !== '') {
-			$icon = '<img src="' . htmlspecialchars($icon) . '" alt="&bull;">';
+			$icon = '<img src="'.htmlspecialchars($icon).'" alt="&bull;">';
 		} else {
 			$icon = '&bull;';
 		}
 		$this->htmlBody .= vsprintf($this->listItem, [$icon, $htmlText]);
 		if ($plainText !== false) {
-			$this->plainBody .= '  * ' . $plainText;
+			$this->plainBody .= '  * '.$plainText;
 			if ($plainMetaInfo !== false) {
-				$this->plainBody .= ' (' . $plainMetaInfo . ')';
+				$this->plainBody .= ' ('.$plainMetaInfo.')';
 			}
 			$this->plainBody .= PHP_EOL;
 		}
@@ -540,8 +540,8 @@ 
 		$textColor = $this->themingDefaults->getTextColorPrimary();
 
 		$this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, $textColor, $textColor, $textLeft, $urlRight, $textRight]);
-		$this->plainBody .= $plainTextLeft . ': ' . $urlLeft . PHP_EOL;
-		$this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL;
+		$this->plainBody .= $plainTextLeft.': '.$urlLeft.PHP_EOL;
+		$this->plainBody .= $plainTextRight.': '.$urlRight.PHP_EOL.PHP_EOL;
 
 	}
 
@@ -573,10 +573,10 @@ 
 		$this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, $textColor, $textColor, $text]);
 
 		if ($plainText !== false) {
-			$this->plainBody .= $plainText . ': ';
+			$this->plainBody .= $plainText.': ';
 		}
 
-		$this->plainBody .=  $url . PHP_EOL;
+		$this->plainBody .= $url.PHP_EOL;
 
 	}
 
@@ -600,8 +600,8 @@ 
 	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
 	 */
 	public function addFooter(string $text = '') {
-		if($text === '') {
-			$text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically sent email, please do not reply.');
+		if ($text === '') {
+			$text = $this->themingDefaults->getName().' - '.$this->themingDefaults->getSlogan().'<br>'.$this->l10n->t('This is an automatically sent email, please do not reply.');
 		}
 
 		if ($this->footerAdded) {
@@ -613,7 +613,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->footer, [$text]);
 		$this->htmlBody .= $this->tail;
-		$this->plainBody .= PHP_EOL . '-- ' . PHP_EOL;
+		$this->plainBody .= PHP_EOL.'-- '.PHP_EOL;
 		$this->plainBody .= str_replace('<br>', PHP_EOL, $text);
 	}
 

lib/private/Http/Client/Client.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 		}
 		$this->configured = true;
 
-		$this->stack->push(Middleware::mapRequest(function (RequestInterface $request) {
+		$this->stack->push(Middleware::mapRequest(function(RequestInterface $request) {
 			return $request
 				->withHeader('User-Agent', 'Nextcloud Server Crawler');
 		}));
@@ -102,7 +102,7 @@ 
 			if ($this->config->getSystemValue('installed', false)) {
 				return $this->certificateManager->getAbsoluteBundlePath(null);
 			} else {
-				return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+				return \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 			}
 		}
 	}
@@ -118,7 +118,7 @@ 
 		$proxyUri = '';
 
 		if ($proxyUserPwd !== null) {
-			$proxyUri .= $proxyUserPwd . '@';
+			$proxyUri .= $proxyUserPwd.'@';
 		}
 		if ($proxyHost !== null) {
 			$proxyUri .= $proxyHost;

lib/private/Federation/CloudIdManager.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	 */
 	public function getCloudId(string $user, string $remote): ICloudId {
 		// TODO check what the correct url is for remote (asking the remote)
-		return new CloudId($user. '@' . $remote, $user, $remote);
+		return new CloudId($user.'@'.$remote, $user, $remote);
 	}
 
 	/**

lib/private/AppFramework/Http/Dispatcher.php

Spacing +6 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
 			// exception and creates a response. If no response is created, it is
 			// assumed that theres no middleware who can handle it and the error is
 			// thrown again
-		} catch(\Exception $exception){
+		} catch (\Exception $exception) {
 			$response = $this->middlewareDispatcher->afterException(
 				$controller, $methodName, $exception);
 		}
@@ -137,7 +137,7 @@ 
 		// valid types that will be casted
 		$types = ['int', 'integer', 'bool', 'boolean', 'float'];
 
-		foreach($this->reflector->getParameters() as $param => $default) {
+		foreach ($this->reflector->getParameters() as $param => $default) {
 
 			// try to get the parameter from the request object and cast
 			// it to the type annotated in the @param annotation
@@ -146,7 +146,7 @@ 
 
 			// if this is submitted using GET or a POST form, 'false' should be
 			// converted to false
-			if(($type === 'bool' || $type === 'boolean') &&
+			if (($type === 'bool' || $type === 'boolean') &&
 				$value === 'false' &&
 				(
 					$this->request->method === 'GET' ||
@@ -156,7 +156,7 @@ 
 			) {
 				$value = false;
 
-			} elseif($value !== null && \in_array($type, $types, true)) {
+			} elseif ($value !== null && \in_array($type, $types, true)) {
 				settype($value, $type);
 			}
 
@@ -166,13 +166,13 @@ 
 		$response = \call_user_func_array([$controller, $methodName], $arguments);
 
 		// format response
-		if($response instanceof DataResponse || !($response instanceof Response)) {
+		if ($response instanceof DataResponse || !($response instanceof Response)) {
 
 			// get format from the url format or request format parameter
 			$format = $this->request->getParam('format');
 
 			// if none is given try the first Accept header
-			if($format === null) {
+			if ($format === null) {
 				$headers = $this->request->getHeader('Accept');
 				$format = $controller->getResponderByHTTPHeader($headers, null);
 			}

lib/private/AppFramework/Middleware/MiddlewareDispatcher.php

Spacing +8 added lines, -8 removed lines

@@ -53,7 +53,7 @@ 
 	/**
 	 * Constructor
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->middlewares = [];
 		$this->middlewareCounter = 0;
 	}
@@ -63,7 +63,7 @@ 
 	 * Adds a new middleware
 	 * @param Middleware $middleWare the middleware which will be added
 	 */
-	public function registerMiddleware(Middleware $middleWare){
+	public function registerMiddleware(Middleware $middleWare) {
 		$this->middlewares[] = $middleWare;
 	}
 
@@ -85,11 +85,11 @@ 
 	 * @param string $methodName the name of the method that will be called on
 	 *                           the controller
 	 */
-	public function beforeController(Controller $controller, string $methodName){
+	public function beforeController(Controller $controller, string $methodName) {
 		// we need to count so that we know which middlewares we have to ask in
 		// case there is an exception
 		$middlewareCount = \count($this->middlewares);
-		for($i = 0; $i < $middlewareCount; $i++){
+		for ($i = 0; $i < $middlewareCount; $i++) {
 			$this->middlewareCounter++;
 			$middleware = $this->middlewares[$i];
 			$middleware->beforeController($controller, $methodName);
@@ -113,11 +113,11 @@ 
 	 * @throws \Exception the passed in exception if it can't handle it
 	 */
 	public function afterException(Controller $controller, string $methodName, \Exception $exception): Response {
-		for($i=$this->middlewareCounter-1; $i>=0; $i--){
+		for ($i = $this->middlewareCounter - 1; $i >= 0; $i--) {
 			$middleware = $this->middlewares[$i];
 			try {
 				return $middleware->afterException($controller, $methodName, $exception);
-			} catch(\Exception $exception){
+			} catch (\Exception $exception) {
 				continue;
 			}
 		}
@@ -136,7 +136,7 @@ 
 	 * @return Response a Response object
 	 */
 	public function afterController(Controller $controller, string $methodName, Response $response): Response {
-		for($i= \count($this->middlewares)-1; $i>=0; $i--){
+		for ($i = \count($this->middlewares) - 1; $i >= 0; $i--) {
 			$middleware = $this->middlewares[$i];
 			$response = $middleware->afterController($controller, $methodName, $response);
 		}
@@ -155,7 +155,7 @@ 
 	 * @return string the output that should be printed
 	 */
 	public function beforeOutput(Controller $controller, string $methodName, string $output): string {
-		for($i= \count($this->middlewares)-1; $i>=0; $i--){
+		for ($i = \count($this->middlewares) - 1; $i >= 0; $i--) {
 			$middleware = $this->middlewares[$i];
 			$output = $middleware->beforeOutput($controller, $methodName, $output);
 		}

lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php

Spacing +12 added lines, -12 removed lines

@@ -138,25 +138,25 @@ 
 
 		// security checks
 		$isPublicPage = $this->reflector->hasAnnotation('PublicPage');
-		if(!$isPublicPage) {
-			if(!$this->isLoggedIn) {
+		if (!$isPublicPage) {
+			if (!$this->isLoggedIn) {
 				throw new NotLoggedInException();
 			}
 
-			if(!$this->reflector->hasAnnotation('NoAdminRequired') && !$this->isAdminUser) {
+			if (!$this->reflector->hasAnnotation('NoAdminRequired') && !$this->isAdminUser) {
 				throw new NotAdminException($this->l10n->t('Logged in user must be an admin'));
 			}
 		}
 
 		// Check for strict cookie requirement
-		if($this->reflector->hasAnnotation('StrictCookieRequired') || !$this->reflector->hasAnnotation('NoCSRFRequired')) {
-			if(!$this->request->passesStrictCookieCheck()) {
+		if ($this->reflector->hasAnnotation('StrictCookieRequired') || !$this->reflector->hasAnnotation('NoCSRFRequired')) {
+			if (!$this->request->passesStrictCookieCheck()) {
 				throw new StrictCookieMissingException();
 			}
 		}
 		// CSRF check - also registers the CSRF token since the session may be closed later
 		Util::callRegister();
-		if(!$this->reflector->hasAnnotation('NoCSRFRequired')) {
+		if (!$this->reflector->hasAnnotation('NoCSRFRequired')) {
 			/*
 			 * Only allow the CSRF check to fail on OCS Requests. This kind of
 			 * hacks around that we have no full token auth in place yet and we
@@ -165,7 +165,7 @@ 
 			 * Additionally we allow Bearer authenticated requests to pass on OCS routes.
 			 * This allows oauth apps (e.g. moodle) to use the OCS endpoints
 			 */
-			if(!$this->request->passesCSRFCheck() && !(
+			if (!$this->request->passesCSRFCheck() && !(
 					$controller instanceof OCSController && (
 						$this->request->getHeader('OCS-APIREQUEST') === 'true' ||
 						strpos($this->request->getHeader('Authorization'), 'Bearer ') === 0
@@ -211,7 +211,7 @@ 
 		$defaultPolicy = $this->contentSecurityPolicyManager->getDefaultPolicy();
 		$defaultPolicy = $this->contentSecurityPolicyManager->mergePolicies($defaultPolicy, $policy);
 
-		if($this->cspNonceManager->browserSupportsCspV3()) {
+		if ($this->cspNonceManager->browserSupportsCspV3()) {
 			$defaultPolicy->useJsNonce($this->csrfTokenManager->getToken()->getEncryptedValue());
 		}
 
@@ -231,17 +231,17 @@ 
 	 * @return Response a Response object or null in case that the exception could not be handled
 	 */
 	public function afterException($controller, $methodName, \Exception $exception): Response {
-		if($exception instanceof SecurityException) {
-			if($exception instanceof StrictCookieMissingException) {
+		if ($exception instanceof SecurityException) {
+			if ($exception instanceof StrictCookieMissingException) {
 				return new RedirectResponse(\OC::$WEBROOT);
  			}
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
+			if (stripos($this->request->getHeader('Accept'), 'html') === false) {
 				$response = new JSONResponse(
 					['message' => $exception->getMessage()],
 					$exception->getCode()
 				);
 			} else {
-				if($exception instanceof NotLoggedInException) {
+				if ($exception instanceof NotLoggedInException) {
 					$params = [];
 					if (isset($this->request->server['REQUEST_URI'])) {
 						$params['redirect_url'] = $this->request->server['REQUEST_URI'];

lib/private/AppFramework/App.php

Spacing +13 added lines, -13 removed lines

@@ -56,10 +56,10 @@ 
 	 * the transformed app id, defaults to OCA\
 	 * @return string the starting namespace for the app
 	 */
-	public static function buildAppNamespace(string $appId, string $topNamespace='OCA\\'): string {
+	public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string {
 		// Hit the cache!
 		if (isset(self::$nameSpaceCache[$appId])) {
-			return $topNamespace . self::$nameSpaceCache[$appId];
+			return $topNamespace.self::$nameSpaceCache[$appId];
 		}
 
 		$appInfo = \OC_App::getAppInfo($appId);
@@ -70,7 +70,7 @@ 
 			self::$nameSpaceCache[$appId] = ucfirst($appId);
 		}
 
-		return $topNamespace . self::$nameSpaceCache[$appId];
+		return $topNamespace.self::$nameSpaceCache[$appId];
 	}
 
 
@@ -93,7 +93,7 @@ 
 		// first try $controllerName then go for \OCA\AppName\Controller\$controllerName
 		try {
 			$controller = $container->query($controllerName);
-		} catch(QueryException $e) {
+		} catch (QueryException $e) {
 			if ($appName === 'core') {
 				$appNameSpace = 'OC\\Core';
 			} else if ($appName === 'settings') {
@@ -101,7 +101,7 @@ 
 			} else {
 				$appNameSpace = self::buildAppNamespace($appName);
 			}
-			$controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
+			$controllerName = $appNameSpace.'\\Controller\\'.$controllerName;
 			$controller = $container->query($controllerName);
 		}
 
@@ -119,17 +119,17 @@ 
 
 		$io = $container[IOutput::class];
 
-		if(!is_null($httpHeaders)) {
+		if (!is_null($httpHeaders)) {
 			$io->setHeader($httpHeaders);
 		}
 
-		foreach($responseHeaders as $name => $value) {
-			$io->setHeader($name . ': ' . $value);
+		foreach ($responseHeaders as $name => $value) {
+			$io->setHeader($name.': '.$value);
 		}
 
-		foreach($responseCookies as $name => $value) {
+		foreach ($responseCookies as $name => $value) {
 			$expireDate = null;
-			if($value['expireDate'] instanceof \DateTime) {
+			if ($value['expireDate'] instanceof \DateTime) {
 				$expireDate = $value['expireDate']->getTimestamp();
 			}
 			$io->setCookie(
@@ -153,7 +153,7 @@ 
 			if ($response instanceof ICallbackResponse) {
 				$response->callback($io);
 			} else if (!is_null($output)) {
-				$io->setHeader('Content-Length: ' . strlen($output));
+				$io->setHeader('Content-Length: '.strlen($output));
 				$io->setOutput($output);
 			}
 		}
@@ -173,14 +173,14 @@ 
 	 * @param DIContainer $container an instance of a pimple container.
 	 */
 	public static function part(string $controllerName, string $methodName, array $urlParams,
-								DIContainer $container){
+								DIContainer $container) {
 
 		$container['urlParams'] = $urlParams;
 		$controller = $container[$controllerName];
 
 		$dispatcher = $container['Dispatcher'];
 
-		list(, , $output) =  $dispatcher->dispatch($controller, $methodName);
+		list(,, $output) = $dispatcher->dispatch($controller, $methodName);
 		return $output;
 	}
 

lib/private/AppFramework/Utility/ControllerMethodReflector.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	 * @param object $object an object or classname
 	 * @param string $method the method which we want to inspect
 	 */
-	public function reflect($object, string $method){
+	public function reflect($object, string $method) {
 		$reflection = new \ReflectionMethod($object, $method);
 		$docs = $reflection->getDocComment();
 
@@ -82,7 +82,7 @@ 
 			}
 
 			$default = null;
-			if($param->isOptional()) {
+			if ($param->isOptional()) {
 				$default = $param->getDefaultValue();
 			}
 			$this->parameters[$param->name] = $default;
@@ -97,7 +97,7 @@ 
 	 * would return int or null if not existing
 	 */
 	public function getType(string $parameter) {
-		if(array_key_exists($parameter, $this->types)) {
+		if (array_key_exists($parameter, $this->types)) {
 			return $this->types[$parameter];
 		}
 
@@ -128,7 +128,7 @@ 
 	 * @return string
 	 */
 	public function getAnnotationParameter(string $name, string $key): string {
-		if(isset($this->annotations[$name][$key])) {
+		if (isset($this->annotations[$name][$key])) {
 			return $this->annotations[$name][$key];
 		}