maikgreubel / caribu-mvc

src/Mvc/Application.php

Indentation +42 added lines, -42 removed lines

@@ -318,21 +318,21 @@ 
      */
     public function registerController($controller, $applicationName = 'default')
     {
-    	if ( !$controller instanceof \Nkey\Caribu\Mvc\Controller\AbstractController ) {
-	        if (! class_exists($controller)) {
-	            throw new ControllerException("No such controller class {controller} found", array(
-	                'controller' => $controller
-	            ));
-	        }
-	        $c = new $controller();
-	        if (! ($c instanceof AbstractController)) {
-	            throw new ControllerException("Controller {controller} is not in application scope", array(
-	                'controller' => $controller
-	            ));
-	        }
-    	}
+        if ( !$controller instanceof \Nkey\Caribu\Mvc\Controller\AbstractController ) {
+            if (! class_exists($controller)) {
+                throw new ControllerException("No such controller class {controller} found", array(
+                    'controller' => $controller
+                ));
+            }
+            $c = new $controller();
+            if (! ($c instanceof AbstractController)) {
+                throw new ControllerException("Controller {controller} is not in application scope", array(
+                    'controller' => $controller
+                ));
+            }
+        }
         else {
-        	$c = $controller;
+            $c = $controller;
         }
         $settings = $c->getControllerSettings();
         $this->controllers[$applicationName][$settings->getControllerSimpleName()] = $settings;
@@ -375,35 +375,35 @@ 
         ));
         
         if ( null != $this->router && $this->router->hasRoute($action) ) {
-        	$controllerInstance = $this->router->route($action, $request);
-        	$action = $request->getAction();
+            $controllerInstance = $this->router->route($action, $request);
+            $action = $request->getAction();
         }
         else {
-	        if (! isset($this->controllers[$applicationName][$controller])) {
-	            $this->getLogger()->error("[{remote}] No such controller {controller}", array(
-	                'remote' => $request->getRemoteHost(),
-	                'controller' => $controller
-	            ));
-	            $controller = 'Error';
-	            $action = 'error';
-	        }
+            if (! isset($this->controllers[$applicationName][$controller])) {
+                $this->getLogger()->error("[{remote}] No such controller {controller}", array(
+                    'remote' => $request->getRemoteHost(),
+                    'controller' => $controller
+                ));
+                $controller = 'Error';
+                $action = 'error';
+            }
 	        
-	        $controllerInstance = $this->controllers[$applicationName][$controller];
-	        assert($controllerInstance instanceof AbstractController);
-	        if (! $controllerInstance->hasAction($action)) {
-	            $this->getLogger()->error("[{remote}] No such action {action}", array(
-	                'remote' => $request->getRemoteHost(),
-	                'action' => $action
-	            ));
-	            $controllerInstance = $this->controllers[$applicationName]['Error'];
-	            $action = 'error';
-	        }
+            $controllerInstance = $this->controllers[$applicationName][$controller];
+            assert($controllerInstance instanceof AbstractController);
+            if (! $controllerInstance->hasAction($action)) {
+                $this->getLogger()->error("[{remote}] No such action {action}", array(
+                    'remote' => $request->getRemoteHost(),
+                    'action' => $action
+                ));
+                $controllerInstance = $this->controllers[$applicationName]['Error'];
+                $action = 'error';
+            }
 	        
-	        $this->getLogger()->debug("[{remote}] Routing request to {controller}:{action}", array(
-	            'remote' => $request->getRemoteHost(),
-	            'controller' => $controller,
-	            'action' => $action
-	        ));
+            $this->getLogger()->debug("[{remote}] Routing request to {controller}:{action}", array(
+                'remote' => $request->getRemoteHost(),
+                'controller' => $controller,
+                'action' => $action
+            ));
         }
         
         $view = $this->getViewBestMatch($request, $applicationName);
@@ -467,9 +467,9 @@ 
      */
     public function registerRouter(AbstractRouter $router)
     {
-    	$this->router = $router;
-    	$this->router->setApplication($this);
-    	return $this;
+        $this->router = $router;
+        $this->router->setApplication($this);
+        return $this;
     }
 
     /**

Spacing +8 added lines, -8 removed lines

@@ -211,14 +211,14 @@ 
      */
     public function registerView($view, $order = null, $applicationName = 'default')
     {
-        if (! class_exists($view)) {
+        if (!class_exists($view)) {
             throw new ViewException("No such view class {view} found", array(
                 'view' => $view
             ));
         }
         
         $v = new $view();
-        if (! $v instanceof View) {
+        if (!$v instanceof View) {
             throw new ViewException("View {view} is not in application scope", array(
                 'view' => $view
             ));
@@ -318,14 +318,14 @@ 
      */
     public function registerController($controller, $applicationName = 'default')
     {
-    	if ( !$controller instanceof \Nkey\Caribu\Mvc\Controller\AbstractController ) {
-	        if (! class_exists($controller)) {
+    	if (!$controller instanceof \Nkey\Caribu\Mvc\Controller\AbstractController) {
+	        if (!class_exists($controller)) {
 	            throw new ControllerException("No such controller class {controller} found", array(
 	                'controller' => $controller
 	            ));
 	        }
 	        $c = new $controller();
-	        if (! ($c instanceof AbstractController)) {
+	        if (!($c instanceof AbstractController)) {
 	            throw new ControllerException("Controller {controller} is not in application scope", array(
 	                'controller' => $controller
 	            ));
@@ -374,12 +374,12 @@ 
             'action' => $action
         ));
         
-        if ( null != $this->router && $this->router->hasRoute($action) ) {
+        if (null != $this->router && $this->router->hasRoute($action)) {
         	$controllerInstance = $this->router->route($action, $request);
         	$action = $request->getAction();
         }
         else {
-	        if (! isset($this->controllers[$applicationName][$controller])) {
+	        if (!isset($this->controllers[$applicationName][$controller])) {
 	            $this->getLogger()->error("[{remote}] No such controller {controller}", array(
 	                'remote' => $request->getRemoteHost(),
 	                'controller' => $controller
@@ -390,7 +390,7 @@ 
 	        
 	        $controllerInstance = $this->controllers[$applicationName][$controller];
 	        assert($controllerInstance instanceof AbstractController);
-	        if (! $controllerInstance->hasAction($action)) {
+	        if (!$controllerInstance->hasAction($action)) {
 	            $this->getLogger()->error("[{remote}] No such action {action}", array(
 	                'remote' => $request->getRemoteHost(),
 	                'action' => $action

Braces +2 added lines, -4 removed lines

@@ -330,8 +330,7 @@ 
 	                'controller' => $controller
 	            ));
 	        }
-    	}
-        else {
+    	} else {
         	$c = $controller;
         }
         $settings = $c->getControllerSettings();
@@ -377,8 +376,7 @@ 
         if ( null != $this->router && $this->router->hasRoute($action) ) {
         	$controllerInstance = $this->router->route($action, $request);
         	$action = $request->getAction();
-        }
-        else {
+        } else {
 	        if (! isset($this->controllers[$applicationName][$controller])) {
 	            $this->getLogger()->error("[{remote}] No such controller {controller}", array(
 	                'remote' => $request->getRemoteHost(),

src/Mvc/Util/RequestParser.php

Indentation +4 added lines, -4 removed lines

@@ -51,12 +51,12 @@ 
      * @return array Parsed parts for later usage
      */
     private static function parseUri(Request &$request,
-    		$uri, $defaultController, $defaultAction)
+            $uri, $defaultController, $defaultAction)
     {
         // All beyond the context prefix is our application request uri
         $contextUri = $uri;
         if (null != $request->getContextPrefix() && '/' != $request->getContextPrefix()) {
-        	$contextUri = str_replace($request->getContextPrefix(), '', $uri);
+            $contextUri = str_replace($request->getContextPrefix(), '', $uri);
         }
         
         // Split parts
@@ -102,10 +102,10 @@ 
      *            The destination parameter name
      */
     private static function parseElement(Request &$req,
-    		$serverVars, $elementName, $paramName)
+            $serverVars, $elementName, $paramName)
     {
         if (isset($serverVars[$elementName])) {
-        	$req->setParam( $paramName, $serverVars[$elementName] );
+            $req->setParam( $paramName, $serverVars[$elementName] );
         }
     }
 

Spacing +15 added lines, -15 removed lines

@@ -19,14 +19,14 @@ 
      *
      * @param Request $request
      */
-    private static function parseContextPrefix(Request &$request, $serverVars = array())
+    private static function parseContextPrefix(Request & $request, $serverVars = array())
     {
         // Since apache 2.3.13 we have now an additional index which provides the context
         if (isset($serverVars['CONTEXT_PREFIX']) && $serverVars['CONTEXT_PREFIX'] != '') {
-            $request->setContextPrefix( $serverVars['CONTEXT_PREFIX'] . '/' );
+            $request->setContextPrefix($serverVars['CONTEXT_PREFIX'].'/');
         } elseif (isset($serverVars['REDIRECT_BASE'])) {
             // Try to determine the context from redirect base
-            $request->setContextPrefix ( $serverVars['REDIRECT_BASE'] );
+            $request->setContextPrefix($serverVars['REDIRECT_BASE']);
         } elseif (isset($serverVars['SCRIPT_FILENAME']) && isset($serverVars['SCRIPT_NAME'])) {
             // Fallback - get context out of script path
             if (isset($serverVars['HTTP_HOST'])) {
@@ -50,7 +50,7 @@ 
      *
      * @return array Parsed parts for later usage
      */
-    private static function parseUri(Request &$request,
+    private static function parseUri(Request & $request,
     		$uri, $defaultController, $defaultAction)
     {
         // All beyond the context prefix is our application request uri
@@ -70,19 +70,19 @@ 
         
         // Check if there was a controller requested
         if (count($parts) > 0) {
-            $request->setController( ucfirst(trim($parts[0])) );
+            $request->setController(ucfirst(trim($parts[0])));
             array_shift($parts);
-            if (! $request->getController()) {
-                $request->setController( $defaultController );
+            if (!$request->getController()) {
+                $request->setController($defaultController);
             }
         }
         
         // Check if there was an action requested
         if (count($parts) > 0) {
-            $request->setAction( trim($parts[0]) );
+            $request->setAction(trim($parts[0]));
             array_shift($parts);
-            if (! $request->getAction()) {
-                $request->setAction( $defaultAction );
+            if (!$request->getAction()) {
+                $request->setAction($defaultAction);
             }
         }
         
@@ -101,11 +101,11 @@ 
      * @param string $paramName
      *            The destination parameter name
      */
-    private static function parseElement(Request &$req,
+    private static function parseElement(Request & $req,
     		$serverVars, $elementName, $paramName)
     {
         if (isset($serverVars[$elementName])) {
-        	$req->setParam( $paramName, $serverVars[$elementName] );
+        	$req->setParam($paramName, $serverVars[$elementName]);
         }
     }
 
@@ -117,7 +117,7 @@ 
      * @param array $serverVars
      *            The server variables provided by sapi
      */
-    private static function parseParameters(Request &$req, $serverVars)
+    private static function parseParameters(Request & $req, $serverVars)
     {
         self::parseElement($req, $serverVars, 'HTTP_ACCEPT', 'Accept');
         self::parseElement($req, $serverVars, 'HTTP_ACCEPT_LANGUAGE', 'Accept-Language');
@@ -148,7 +148,7 @@ 
      *
      * @param Request $request
      */
-    private static function parseRemoteHost(Request &$request, $serverVars = array())
+    private static function parseRemoteHost(Request & $request, $serverVars = array())
     {
         if (isset($serverVars['REMOTE_ADDR'])) {
             $request->remoteHost = $serverVars['REMOTE_ADDR'];
@@ -164,7 +164,7 @@ 
      * @param Request $request
      *            Request object to put the parameters in
      */
-    private static function parseGetPostSessionCookie(Request &$request)
+    private static function parseGetPostSessionCookie(Request & $request)
     {
         foreach ($_GET as $name => $value) {
             $request->params[$name] = $value;

src/Mvc/Controller/Request.php

Indentation +3 added lines, -3 removed lines

@@ -181,7 +181,7 @@ 
      */
     public function setController($controller)
     {
-    	$this->controller = strval($controller);
+        $this->controller = strval($controller);
     }
 
     /**
@@ -201,7 +201,7 @@ 
      */
     public function setAction($action)
     {
-    	$this->action = $action;
+        $this->action = $action;
     }
 
     /**
@@ -231,7 +231,7 @@ 
      */
     public function setContextPrefix($prefix)
     {
-    	$this->contextPrefix = strval($prefix);
+        $this->contextPrefix = strval($prefix);
     }
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
      */
     public static function parseFromServerRequest($serverVars, $defaultController = 'Index', $defaultAction = 'index')
     {
-        if (! isset($serverVars['REQUEST_URI'])) {
+        if (!isset($serverVars['REQUEST_URI'])) {
             throw new InvalidUrlException("No such uri provided");
         }
         return self::parse($serverVars['REQUEST_URI'], $serverVars, $defaultController, $defaultAction);
@@ -272,7 +272,7 @@ 
         switch ($typeOf) {
             case 'bool':
             case 'boolean':
-                $result = function_exists('boolval') ? boolval($result) : (bool) $result;
+                $result = function_exists('boolval') ? boolval($result) : (bool)$result;
                 break;
             
             case 'double':

src/Mvc/Router/AbstractRouter.php

Indentation +66 added lines, -66 removed lines

@@ -7,77 +7,77 @@
 
 abstract class AbstractRouter {
 	
-	/**
-	 * Application instance
-	 * 
-	 * @var Application
-	 */
-	private $application;
+    /**
+     * Application instance
+     * 
+     * @var Application
+     */
+    private $application;
 	
-	public function setApplication(Application $application)
-	{
-		$this->application = $application;
-		foreach($this->routes as $routeName => $controller) {
-			$this->application->registerController($controller, $routeName);
-		}
-	}
+    public function setApplication(Application $application)
+    {
+        $this->application = $application;
+        foreach($this->routes as $routeName => $controller) {
+            $this->application->registerController($controller, $routeName);
+        }
+    }
 	
-	/**
-	 * @var array
-	 */
-	private $routes;
+    /**
+     * @var array
+     */
+    private $routes;
 	
-	public function addRoute(string $name, AbstractController $controller)
-	{
-		$this->routes[$name] = $controller;
-	}
+    public function addRoute(string $name, AbstractController $controller)
+    {
+        $this->routes[$name] = $controller;
+    }
 	
-	/**
-	 * Checks wether a route exists
-	 * 
-	 * @param string $name
-	 * @return bool
-	 */
-	public function hasRoute(string $name)
-	{
-		return key_exists($name, $this->routes);
-	}
+    /**
+     * Checks wether a route exists
+     * 
+     * @param string $name
+     * @return bool
+     */
+    public function hasRoute(string $name)
+    {
+        return key_exists($name, $this->routes);
+    }
 	
-	/**
-	 * 
-	 * @param string $name
-	 * @throws RouterException
-	 * @return AbstractController
-	 */
-	private function getRoute(string $name)
-	{
-		if(!$this->hasRoute($name)) {
-			throw new RouterException("Router {$router} is not registered");
-		}
+    /**
+     * 
+     * @param string $name
+     * @throws RouterException
+     * @return AbstractController
+     */
+    private function getRoute(string $name)
+    {
+        if(!$this->hasRoute($name)) {
+            throw new RouterException("Router {$router} is not registered");
+        }
 		
-		return $this->routes[$name];
-	}
+        return $this->routes[$name];
+    }
 	
-	/**
-	 * Route the existing request into a new controller
-	 * 
-	 * @param string $name The name of route
-	 * @param Request $request The existing request instance
-	 * @return \Nkey\Caribu\Mvc\Controller\AbstractController
-	 */
-	public function route(string $name, Request $request)
-	{
-		$parts = \explode('/', $request->getOrigin());
-		$found = false;
-		for($i = 0; $i < count($parts); $i++) {
-			if($parts[$i] === $name && isset($parts[$i+1])) {
-				$request->setAction($parts[$i+1]);
-				$found = true;
-			}
-		}
-		if(!$found) {
-			$request->setAction("index");
-		}
-		return $this->getRoute($name);
-	}
+    /**
+     * Route the existing request into a new controller
+     * 
+     * @param string $name The name of route
+     * @param Request $request The existing request instance
+     * @return \Nkey\Caribu\Mvc\Controller\AbstractController
+     */
+    public function route(string $name, Request $request)
+    {
+        $parts = \explode('/', $request->getOrigin());
+        $found = false;
+        for($i = 0; $i < count($parts); $i++) {
+            if($parts[$i] === $name && isset($parts[$i+1])) {
+                $request->setAction($parts[$i+1]);
+                $found = true;
+            }
+        }
+        if(!$found) {
+            $request->setAction("index");
+        }
+        return $this->getRoute($name);
+    }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 	public function setApplication(Application $application)
 	{
 		$this->application = $application;
-		foreach($this->routes as $routeName => $controller) {
+		foreach ($this->routes as $routeName => $controller) {
 			$this->application->registerController($controller, $routeName);
 		}
 	}
@@ -51,7 +51,7 @@ 
 	 */
 	private function getRoute(string $name)
 	{
-		if(!$this->hasRoute($name)) {
+		if (!$this->hasRoute($name)) {
 			throw new RouterException("Router {$router} is not registered");
 		}
 		
@@ -69,13 +69,13 @@ 
 	{
 		$parts = \explode('/', $request->getOrigin());
 		$found = false;
-		for($i = 0; $i < count($parts); $i++) {
-			if($parts[$i] === $name && isset($parts[$i+1])) {
-				$request->setAction($parts[$i+1]);
+		for ($i = 0; $i < count($parts); $i++) {
+			if ($parts[$i] === $name && isset($parts[$i + 1])) {
+				$request->setAction($parts[$i + 1]);
 				$found = true;
 			}
 		}
-		if(!$found) {
+		if (!$found) {
 			$request->setAction("index");
 		}
 		return $this->getRoute($name);