nextcloud / server

lib/private/Route/Router.php

Spacing +9 added lines, -9 removed lines

@@ -99,7 +99,7 @@ 
 			foreach (\OC_APP::getEnabledApps() as $app) {
 				$appPath = \OC_App::getAppPath($app);
 				if ($appPath !== false) {
-					$file = $appPath . '/appinfo/routes.php';
+					$file = $appPath.'/appinfo/routes.php';
 					if (file_exists($file)) {
 						$this->routingFiles[$app] = $file;
 					}
@@ -130,14 +130,14 @@ 
 			if (isset($this->loadedApps[$app])) {
 				return;
 			}
-			$file = \OC_App::getAppPath($app) . '/appinfo/routes.php';
+			$file = \OC_App::getAppPath($app).'/appinfo/routes.php';
 			if ($file !== false && file_exists($file)) {
 				$routingFiles = [$app => $file];
 			} else {
 				$routingFiles = [];
 			}
 		}
-		\OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
+		\OC::$server->getEventLogger()->start('loadroutes'.$requestedApp, 'Loading Routes');
 		foreach ($routingFiles as $app => $file) {
 			if (!isset($this->loadedApps[$app])) {
 				if (!\OC_App::isAppLoaded($app)) {
@@ -161,7 +161,7 @@ 
 		if (!isset($this->loadedApps['core'])) {
 			$this->loadedApps['core'] = true;
 			$this->useCollection('root');
-			require_once __DIR__ . '/../../../core/routes.php';
+			require_once __DIR__.'/../../../core/routes.php';
 
 			// Also add the OCS collection
 			$collection = $this->getCollection('root.ocs');
@@ -173,7 +173,7 @@ 
 			$collection->addPrefix('/ocs');
 			$this->root->addCollection($collection);
 		}
-		\OC::$server->getEventLogger()->end('loadroutes' . $requestedApp);
+		\OC::$server->getEventLogger()->end('loadroutes'.$requestedApp);
 	}
 
 	/**
@@ -244,14 +244,14 @@ 
 	public function match($url) {
 		if (substr($url, 0, 6) === '/apps/') {
 			// empty string / 'apps' / $app / rest of the route
-			list(, , $app,) = explode('/', $url, 4);
+			list(,, $app,) = explode('/', $url, 4);
 
 			$app = \OC_App::cleanAppId($app);
 			\OC::$REQUESTEDAPP = $app;
 			$this->loadRoutes($app);
 		} elseif (substr($url, 0, 13) === '/ocsapp/apps/') {
 			// empty string / 'ocsapp' / 'apps' / $app / rest of the route
-			list(, , , $app,) = explode('/', $url, 5);
+			list(,,, $app,) = explode('/', $url, 5);
 
 			$app = \OC_App::cleanAppId($app);
 			\OC::$REQUESTEDAPP = $app;
@@ -277,7 +277,7 @@ 
 				// However, since Symfony does not allow empty route names, the route
 				// we need to match is '/', so we need to append the '/' here.
 				try {
-					$parameters = $matcher->match($url . '/');
+					$parameters = $matcher->match($url.'/');
 				} catch (ResourceNotFoundException $newException) {
 					// If we still didn't match a route, we throw the original exception
 					throw $e;
@@ -407,7 +407,7 @@ 
 	private function getApplicationClass(string $appName) {
 		$appNameSpace = App::buildAppNamespace($appName);
 
-		$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
+		$applicationClassName = $appNameSpace.'\\AppInfo\\Application';
 
 		if (class_exists($applicationClassName)) {
 			$application = \OC::$server->query($applicationClassName);

lib/private/AppFramework/Routing/RouteConfig.php

Spacing +9 added lines, -9 removed lines

@@ -91,7 +91,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);
@@ -126,7 +126,7 @@ 
 		$postfix = $route['postfix'] ?? '';
 		$root = $this->buildRootPrefix($route, $routeNamePrefix);
 
-		$url = $root . '/' . ltrim($route['url'], '/');
+		$url = $root.'/'.ltrim($route['url'], '/');
 		$verb = strtoupper($route['verb'] ?? 'GET');
 
 		$split = explode('#', $name, 2);
@@ -138,7 +138,7 @@ 
 		$controllerName = $this->buildControllerName($controller);
 		$actionName = $this->buildActionName($action);
 
-		$routeName = $routeNamePrefix . $this->appName . '.' . $controller . '.' . $action . $postfix;
+		$routeName = $routeNamePrefix.$this->appName.'.'.$controller.'.'.$action.$postfix;
 
 		$router = $this->router->create($routeName, $url)
 			->method($verb)
@@ -211,7 +211,7 @@ 
 
 			// the url parameter used as id to the resource
 			foreach ($actions as $action) {
-				$url = $root . '/' . ltrim($config['url'], '/');
+				$url = $root.'/'.ltrim($config['url'], '/');
 				$method = $action['name'];
 
 				$verb = strtoupper($action['verb'] ?? 'GET');
@@ -220,7 +220,7 @@ 
 					$url .= '/{id}';
 				}
 				if (isset($action['url-postfix'])) {
-					$url .= '/' . $action['url-postfix'];
+					$url .= '/'.$action['url-postfix'];
 				}
 
 				$controller = $resource;
@@ -228,7 +228,7 @@ 
 				$controllerName = $this->buildControllerName($controller);
 				$actionName = $this->buildActionName($method);
 
-				$routeName = $routeNamePrefix . $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+				$routeName = $routeNamePrefix.$this->appName.'.'.strtolower($resource).'.'.strtolower($method);
 
 				$this->router->create($routeName, $url)
 					->method($verb)
@@ -238,7 +238,7 @@ 
 	}
 
 	private function buildRootPrefix(array $route, string $routeNamePrefix): string {
-		$defaultRoot = $this->appName === 'core' ? '' : '/apps/' . $this->appName;
+		$defaultRoot = $this->appName === 'core' ? '' : '/apps/'.$this->appName;
 		$root = $route['root'] ?? $defaultRoot;
 
 		if ($routeNamePrefix !== '') {
@@ -261,7 +261,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];
 	}
@@ -284,7 +284,7 @@ 
 		$pattern = '/_[a-z]?/';
 		return preg_replace_callback(
 			$pattern,
-			function ($matches) {
+			function($matches) {
 				return strtoupper(ltrim($matches[0], '_'));
 			},
 			$str);