nextcloud / server

lib/private/AppFramework/Routing/RouteConfig.php

Spacing +20 added lines, -20 removed lines

@@ -81,7 +81,7 @@ 
 		 * OCS routes go into a different collection
 		 */
 		$oldCollection = $this->router->getCurrentCollection();
-		$this->router->useCollection($oldCollection . '.ocs');
+		$this->router->useCollection($oldCollection.'.ocs');
 
 		// parse ocs simple routes
 		$this->processOCS($this->routes);
@@ -97,9 +97,9 @@ 
 		foreach ($ocsRoutes as $ocsRoute) {
 			$name = $ocsRoute['name'];
 			$postfix = $ocsRoute['postfix'] ?? '';
-			$root = $ocsRoute['root'] ?? '/apps/' . $this->appName;
+			$root = $ocsRoute['root'] ?? '/apps/'.$this->appName;
 
-			$url = $root . $ocsRoute['url'];
+			$url = $root.$ocsRoute['url'];
 			$verb = strtoupper($ocsRoute['verb'] ?? 'GET');
 
 			$split = explode('#', $name, 2);
@@ -111,7 +111,7 @@ 
 			$controllerName = $this->buildControllerName($controller);
 			$actionName = $this->buildActionName($action);
 
-			$routeName = 'ocs.' . $this->appName . '.' . $controller . '.' . $action . $postfix;
+			$routeName = 'ocs.'.$this->appName.'.'.$controller.'.'.$action.$postfix;
 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
@@ -122,13 +122,13 @@ 
 
 			// optionally register requirements for route. This is used to
 			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $ocsRoute)) {
+			if (array_key_exists('requirements', $ocsRoute)) {
 				$router->requirements($ocsRoute['requirements']);
 			}
 
 			// optionally register defaults for route. This is used to
 			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $ocsRoute)) {
+			if (array_key_exists('defaults', $ocsRoute)) {
 				$router->defaults($ocsRoute['defaults']);
 			}
 		}
@@ -167,10 +167,10 @@ 
 				} else if ($controllerName === 'RequesthandlerController') {
 					$controllerName = 'RequestHandlerController';
 				}
-				$controllerName = App::buildAppNamespace($appName) . '\\Controller\\' . $controllerName;
+				$controllerName = App::buildAppNamespace($appName).'\\Controller\\'.$controllerName;
 			}
 
-			$routeName = $appName . '.' . $controller . '.' . $action . $postfix;
+			$routeName = $appName.'.'.$controller.'.'.$action.$postfix;
 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
@@ -180,13 +180,13 @@ 
 
 			// optionally register requirements for route. This is used to
 			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $simpleRoute)) {
+			if (array_key_exists('requirements', $simpleRoute)) {
 				$router->requirements($simpleRoute['requirements']);
 			}
 
 			// optionally register defaults for route. This is used to
 			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $simpleRoute)) {
+			if (array_key_exists('defaults', $simpleRoute)) {
 				$router->defaults($simpleRoute['defaults']);
 			}
 		}
@@ -214,11 +214,11 @@ 
 
 		$resources = $routes['ocs-resources'] ?? [];
 		foreach ($resources as $resource => $config) {
-			$root = $config['root'] ?? '/apps/' . $this->appName;
+			$root = $config['root'] ?? '/apps/'.$this->appName;
 
 			// the url parameter used as id to the resource
-			foreach($actions as $action) {
-				$url = $root . $config['url'];
+			foreach ($actions as $action) {
+				$url = $root.$config['url'];
 				$method = $action['name'];
 				$verb = strtoupper($action['verb'] ?? 'GET');
 				$collectionAction = $action['on-collection'] ?? false;
@@ -226,7 +226,7 @@ 
 					$url .= '/{id}';
 				}
 				if (isset($action['url-postfix'])) {
-					$url .= '/' . $action['url-postfix'];
+					$url .= '/'.$action['url-postfix'];
 				}
 
 				$controller = $resource;
@@ -234,7 +234,7 @@ 
 				$controllerName = $this->buildControllerName($controller);
 				$actionName = $this->buildActionName($method);
 
-				$routeName = 'ocs.' . $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+				$routeName = 'ocs.'.$this->appName.'.'.strtolower($resource).'.'.strtolower($method);
 
 				$this->router->create($routeName, $url)->method($verb)->action(
 					new RouteActionHandler($this->container, $controllerName, $actionName)
@@ -267,7 +267,7 @@ 
 		foreach ($resources as $resource => $config) {
 
 			// the url parameter used as id to the resource
-			foreach($actions as $action) {
+			foreach ($actions as $action) {
 				$url = $config['url'];
 				$method = $action['name'];
 				$verb = strtoupper($action['verb'] ?? 'GET');
@@ -276,7 +276,7 @@ 
 					$url .= '/{id}';
 				}
 				if (isset($action['url-postfix'])) {
-					$url .= '/' . $action['url-postfix'];
+					$url .= '/'.$action['url-postfix'];
 				}
 
 				$controller = $resource;
@@ -284,7 +284,7 @@ 
 				$controllerName = $this->buildControllerName($controller);
 				$actionName = $this->buildActionName($method);
 
-				$routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+				$routeName = $this->appName.'.'.strtolower($resource).'.'.strtolower($method);
 
 				$this->router->create($routeName, $url)->method($verb)->action(
 					new RouteActionHandler($this->container, $controllerName, $actionName)
@@ -300,7 +300,7 @@ 
 	 */
 	private function buildControllerName(string $controller): string {
 		if (!isset($this->controllerNameCache[$controller])) {
-			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
+			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)).'Controller';
 		}
 		return $this->controllerNameCache[$controller];
 	}
@@ -323,7 +323,7 @@ 
 		$pattern = '/_[a-z]?/';
 		return preg_replace_callback(
 			$pattern,
-			function ($matches) {
+			function($matches) {
 				return strtoupper(ltrim($matches[0], '_'));
 			},
 			$str);

lib/private/AppFramework/App.php

Spacing +14 added lines, -14 removed lines

@@ -57,10 +57,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);
@@ -71,7 +71,7 @@ 
 			self::$nameSpaceCache[$appId] = ucfirst($appId);
 		}
 
-		return $topNamespace . self::$nameSpaceCache[$appId];
+		return $topNamespace.self::$nameSpaceCache[$appId];
 	}
 
 
@@ -95,11 +95,11 @@ 
 		// first try $controllerName then go for \OCA\AppName\Controller\$controllerName
 		try {
 			$controller = $container->query($controllerName);
-		} catch(QueryException $e) {
+		} catch (QueryException $e) {
 			if (strpos($controllerName, '\\Controller\\') !== false) {
 				// This is from a global registered app route that is not enabled.
 				[/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3);
-				throw new HintException('App ' . strtolower($app) . ' is not enabled');
+				throw new HintException('App '.strtolower($app).' is not enabled');
 			}
 
 			if ($appName === 'core') {
@@ -109,7 +109,7 @@ 
 			} else {
 				$appNameSpace = self::buildAppNamespace($appName);
 			}
-			$controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
+			$controllerName = $appNameSpace.'\\Controller\\'.$controllerName;
 			$controller = $container->query($controllerName);
 		}
 
@@ -127,17 +127,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(
@@ -161,7 +161,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);
 			}
 		}
@@ -181,14 +181,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;
 	}