nextcloud / server

lib/private/AppFramework/Routing/RouteConfig.php

Indentation +242 added lines, -242 removed lines

@@ -36,248 +36,248 @@
  * @package OC\AppFramework\routing
  */
 class RouteConfig {
-	/** @var DIContainer */
-	private $container;
-
-	/** @var IRouter */
-	private $router;
-
-	/** @var array */
-	private $routes;
-
-	/** @var string */
-	private $appName;
-
-	/** @var string[] */
-	private $controllerNameCache = [];
-
-	/**
-	 * @param \OC\AppFramework\DependencyInjection\DIContainer $container
-	 * @param \OCP\Route\IRouter $router
-	 * @param array $routes
-	 * @internal param $appName
-	 */
-	public function __construct(DIContainer $container, IRouter $router, $routes) {
-		$this->routes = $routes;
-		$this->container = $container;
-		$this->router = $router;
-		$this->appName = $container['AppName'];
-	}
-
-	/**
-	 * The routes and resource will be registered to the \OCP\Route\IRouter
-	 */
-	public function register() {
-
-		// parse simple
-		$this->processSimpleRoutes($this->routes);
-
-		// parse resources
-		$this->processResources($this->routes);
-
-		/*
+    /** @var DIContainer */
+    private $container;
+
+    /** @var IRouter */
+    private $router;
+
+    /** @var array */
+    private $routes;
+
+    /** @var string */
+    private $appName;
+
+    /** @var string[] */
+    private $controllerNameCache = [];
+
+    /**
+     * @param \OC\AppFramework\DependencyInjection\DIContainer $container
+     * @param \OCP\Route\IRouter $router
+     * @param array $routes
+     * @internal param $appName
+     */
+    public function __construct(DIContainer $container, IRouter $router, $routes) {
+        $this->routes = $routes;
+        $this->container = $container;
+        $this->router = $router;
+        $this->appName = $container['AppName'];
+    }
+
+    /**
+     * The routes and resource will be registered to the \OCP\Route\IRouter
+     */
+    public function register() {
+
+        // parse simple
+        $this->processSimpleRoutes($this->routes);
+
+        // parse resources
+        $this->processResources($this->routes);
+
+        /*
 		 * OCS routes go into a different collection
 		 */
-		$oldCollection = $this->router->getCurrentCollection();
-		$this->router->useCollection($oldCollection.'.ocs');
-
-		// parse ocs simple routes
-		$this->processOCS($this->routes);
-
-		$this->router->useCollection($oldCollection);
-	}
-
-	private function processOCS(array $routes) {
-		$ocsRoutes = isset($routes['ocs']) ? $routes['ocs'] : [];
-		foreach ($ocsRoutes as $ocsRoute) {
-			$name = $ocsRoute['name'];
-			$postfix = '';
-
-			if (isset($ocsRoute['postfix'])) {
-				$postfix = $ocsRoute['postfix'];
-			}
-
-			if (isset($ocsRoute['root'])) {
-				$root = $ocsRoute['root'];
-			} else {
-				$root = '/apps/'.$this->appName;
-			}
-
-			$url = $root . $ocsRoute['url'];
-			$verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET';
-
-			$split = explode('#', $name, 2);
-			if (count($split) != 2) {
-				throw new \UnexpectedValueException('Invalid route name');
-			}
-			$controller = $split[0];
-			$action = $split[1];
-
-			$controllerName = $this->buildControllerName($controller);
-			$actionName = $this->buildActionName($action);
-
-			// register the route
-			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-
-			$router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action . $postfix, $url)
-				->method($verb)
-				->action($handler);
-
-			// 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)) {
-				$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)) {
-				$router->defaults($ocsRoute['defaults']);
-			}
-		}
-	}
-
-	/**
-	 * Creates one route base on the give configuration
-	 * @param array $routes
-	 * @throws \UnexpectedValueException
-	 */
-	private function processSimpleRoutes($routes)
-	{
-		$simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
-		foreach ($simpleRoutes as $simpleRoute) {
-			$name = $simpleRoute['name'];
-			$postfix = '';
-
-			if (isset($simpleRoute['postfix'])) {
-				$postfix = $simpleRoute['postfix'];
-			}
-
-			$url = $simpleRoute['url'];
-			$verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
-
-			$split = explode('#', $name, 2);
-			if (count($split) != 2) {
-				throw new \UnexpectedValueException('Invalid route name');
-			}
-			$controller = $split[0];
-			$action = $split[1];
-
-			$controllerName = $this->buildControllerName($controller);
-			$actionName = $this->buildActionName($action);
-
-			// register the route
-			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
-							->method($verb)
-							->action($handler);
-
-			// 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)) {
-				$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)) {
-				$router->defaults($simpleRoute['defaults']);
-			}
-		}
-	}
-
-	/**
-	 * For a given name and url restful routes are created:
-	 *  - index
-	 *  - show
-	 *  - new
-	 *  - create
-	 *  - update
-	 *  - destroy
-	 *
-	 * @param array $routes
-	 */
-	private function processResources($routes)
-	{
-		// declaration of all restful actions
-		$actions = array(
-			array('name' => 'index', 'verb' => 'GET', 'on-collection' => true),
-			array('name' => 'show', 'verb' => 'GET'),
-			array('name' => 'create', 'verb' => 'POST', 'on-collection' => true),
-			array('name' => 'update', 'verb' => 'PUT'),
-			array('name' => 'destroy', 'verb' => 'DELETE'),
-		);
-
-		$resources = isset($routes['resources']) ? $routes['resources'] : array();
-		foreach ($resources as $resource => $config) {
-
-			// the url parameter used as id to the resource
-			foreach($actions as $action) {
-				$url = $config['url'];
-				$method = $action['name'];
-				$verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
-				$collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
-				if (!$collectionAction) {
-					$url = $url . '/{id}';
-				}
-				if (isset($action['url-postfix'])) {
-					$url = $url . '/' . $action['url-postfix'];
-				}
-
-				$controller = $resource;
-
-				$controllerName = $this->buildControllerName($controller);
-				$actionName = $this->buildActionName($method);
-
-				$routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
-
-				$route = $this->router->create($routeName, $url)->method($verb)->action(
-					new RouteActionHandler($this->container, $controllerName, $actionName)
-				);
-
-				if (!$collectionAction) {
-					$route->requirements([
-						'id' => '[^?]*'
-					]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Based on a given route name the controller name is generated
-	 * @param string $controller
-	 * @return string
-	 */
-	private function buildControllerName($controller)
-	{
-		if (!isset($this->controllerNameCache[$controller])) {
-			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
-		}
-		return $this->controllerNameCache[$controller];
-	}
-
-	/**
-	 * Based on the action part of the route name the controller method name is generated
-	 * @param string $action
-	 * @return string
-	 */
-	private function buildActionName($action) {
-		return $this->underScoreToCamelCase($action);
-	}
-
-	/**
-	 * Underscored strings are converted to camel case strings
-	 * @param string $str
-	 * @return string
-	 */
-	private function underScoreToCamelCase($str) {
-		$pattern = "/_[a-z]?/";
-		return preg_replace_callback(
-			$pattern,
-			function ($matches) {
-				return strtoupper(ltrim($matches[0], "_"));
-			},
-			$str);
-	}
+        $oldCollection = $this->router->getCurrentCollection();
+        $this->router->useCollection($oldCollection.'.ocs');
+
+        // parse ocs simple routes
+        $this->processOCS($this->routes);
+
+        $this->router->useCollection($oldCollection);
+    }
+
+    private function processOCS(array $routes) {
+        $ocsRoutes = isset($routes['ocs']) ? $routes['ocs'] : [];
+        foreach ($ocsRoutes as $ocsRoute) {
+            $name = $ocsRoute['name'];
+            $postfix = '';
+
+            if (isset($ocsRoute['postfix'])) {
+                $postfix = $ocsRoute['postfix'];
+            }
+
+            if (isset($ocsRoute['root'])) {
+                $root = $ocsRoute['root'];
+            } else {
+                $root = '/apps/'.$this->appName;
+            }
+
+            $url = $root . $ocsRoute['url'];
+            $verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET';
+
+            $split = explode('#', $name, 2);
+            if (count($split) != 2) {
+                throw new \UnexpectedValueException('Invalid route name');
+            }
+            $controller = $split[0];
+            $action = $split[1];
+
+            $controllerName = $this->buildControllerName($controller);
+            $actionName = $this->buildActionName($action);
+
+            // register the route
+            $handler = new RouteActionHandler($this->container, $controllerName, $actionName);
+
+            $router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+                ->method($verb)
+                ->action($handler);
+
+            // 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)) {
+                $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)) {
+                $router->defaults($ocsRoute['defaults']);
+            }
+        }
+    }
+
+    /**
+     * Creates one route base on the give configuration
+     * @param array $routes
+     * @throws \UnexpectedValueException
+     */
+    private function processSimpleRoutes($routes)
+    {
+        $simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
+        foreach ($simpleRoutes as $simpleRoute) {
+            $name = $simpleRoute['name'];
+            $postfix = '';
+
+            if (isset($simpleRoute['postfix'])) {
+                $postfix = $simpleRoute['postfix'];
+            }
+
+            $url = $simpleRoute['url'];
+            $verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
+
+            $split = explode('#', $name, 2);
+            if (count($split) != 2) {
+                throw new \UnexpectedValueException('Invalid route name');
+            }
+            $controller = $split[0];
+            $action = $split[1];
+
+            $controllerName = $this->buildControllerName($controller);
+            $actionName = $this->buildActionName($action);
+
+            // register the route
+            $handler = new RouteActionHandler($this->container, $controllerName, $actionName);
+            $router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+                            ->method($verb)
+                            ->action($handler);
+
+            // 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)) {
+                $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)) {
+                $router->defaults($simpleRoute['defaults']);
+            }
+        }
+    }
+
+    /**
+     * For a given name and url restful routes are created:
+     *  - index
+     *  - show
+     *  - new
+     *  - create
+     *  - update
+     *  - destroy
+     *
+     * @param array $routes
+     */
+    private function processResources($routes)
+    {
+        // declaration of all restful actions
+        $actions = array(
+            array('name' => 'index', 'verb' => 'GET', 'on-collection' => true),
+            array('name' => 'show', 'verb' => 'GET'),
+            array('name' => 'create', 'verb' => 'POST', 'on-collection' => true),
+            array('name' => 'update', 'verb' => 'PUT'),
+            array('name' => 'destroy', 'verb' => 'DELETE'),
+        );
+
+        $resources = isset($routes['resources']) ? $routes['resources'] : array();
+        foreach ($resources as $resource => $config) {
+
+            // the url parameter used as id to the resource
+            foreach($actions as $action) {
+                $url = $config['url'];
+                $method = $action['name'];
+                $verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
+                $collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
+                if (!$collectionAction) {
+                    $url = $url . '/{id}';
+                }
+                if (isset($action['url-postfix'])) {
+                    $url = $url . '/' . $action['url-postfix'];
+                }
+
+                $controller = $resource;
+
+                $controllerName = $this->buildControllerName($controller);
+                $actionName = $this->buildActionName($method);
+
+                $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+
+                $route = $this->router->create($routeName, $url)->method($verb)->action(
+                    new RouteActionHandler($this->container, $controllerName, $actionName)
+                );
+
+                if (!$collectionAction) {
+                    $route->requirements([
+                        'id' => '[^?]*'
+                    ]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Based on a given route name the controller name is generated
+     * @param string $controller
+     * @return string
+     */
+    private function buildControllerName($controller)
+    {
+        if (!isset($this->controllerNameCache[$controller])) {
+            $this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
+        }
+        return $this->controllerNameCache[$controller];
+    }
+
+    /**
+     * Based on the action part of the route name the controller method name is generated
+     * @param string $action
+     * @return string
+     */
+    private function buildActionName($action) {
+        return $this->underScoreToCamelCase($action);
+    }
+
+    /**
+     * Underscored strings are converted to camel case strings
+     * @param string $str
+     * @return string
+     */
+    private function underScoreToCamelCase($str) {
+        $pattern = "/_[a-z]?/";
+        return preg_replace_callback(
+            $pattern,
+            function ($matches) {
+                return strtoupper(ltrim($matches[0], "_"));
+            },
+            $str);
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -103,7 +103,7 @@ 
 				$root = '/apps/'.$this->appName;
 			}
 
-			$url = $root . $ocsRoute['url'];
+			$url = $root.$ocsRoute['url'];
 			$verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET';
 
 			$split = explode('#', $name, 2);
@@ -119,19 +119,19 @@ 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
 
-			$router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+			$router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action.$postfix, $url)
 				->method($verb)
 				->action($handler);
 
 			// 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']);
 			}
 		}
@@ -168,19 +168,19 @@ 
 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action.$postfix, $url)
 							->method($verb)
 							->action($handler);
 
 			// 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']);
 			}
 		}
@@ -212,16 +212,16 @@ 
 		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 = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
 				$collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
 				if (!$collectionAction) {
-					$url = $url . '/{id}';
+					$url = $url.'/{id}';
 				}
 				if (isset($action['url-postfix'])) {
-					$url = $url . '/' . $action['url-postfix'];
+					$url = $url.'/'.$action['url-postfix'];
 				}
 
 				$controller = $resource;
@@ -229,7 +229,7 @@ 
 				$controllerName = $this->buildControllerName($controller);
 				$actionName = $this->buildActionName($method);
 
-				$routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+				$routeName = $this->appName.'.'.strtolower($resource).'.'.strtolower($method);
 
 				$route = $this->router->create($routeName, $url)->method($verb)->action(
 					new RouteActionHandler($this->container, $controllerName, $actionName)
@@ -252,7 +252,7 @@ 
 	private function buildControllerName($controller)
 	{
 		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];
 	}
@@ -275,7 +275,7 @@ 
 		$pattern = "/_[a-z]?/";
 		return preg_replace_callback(
 			$pattern,
-			function ($matches) {
+			function($matches) {
 				return strtoupper(ltrim($matches[0], "_"));
 			},
 			$str);