maikgreubel / caribu-mvc

src/Mvc/View/Controls/Form.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     private function renderFields($rendered, $fields)
     {
         foreach ($fields as $field) {
-            if (! isset($field['name'])) {
+            if (!isset($field['name'])) {
                 throw new ControlException("Field must have at least a name!");
             }
             $fieldType = isset($field['type']) ? $field['type'] : 'text';
@@ -54,7 +54,7 @@ 
     private function renderButtons($rendered, $buttons)
     {
         foreach ($buttons as $button) {
-            if (! isset($button['name'])) {
+            if (!isset($button['name'])) {
                 throw new ControlException("Button must have at least a name!");
             }
             $buttonType = isset($button['type']) ? $button['type'] : "submit";
@@ -76,7 +76,7 @@ 
     public function render(Request $request, $parameters = array())
     {
         $contentPrefix = "/";
-        if (! is_null($request->getContextPrefix())) {
+        if (!is_null($request->getContextPrefix())) {
             $contentPrefix = $request->getContextPrefix();
         }
         

Indentation +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
             $class = isset($field['class']) ? $field['class'] : $field['name'];
             
             $rendered .= sprintf('<input type="%s" id="%s" class="%s" name="%s"/>',
-            		$fieldType, $id, $class, $field['name']);
+                    $fieldType, $id, $class, $field['name']);
         }
         
         return $rendered;
@@ -64,7 +64,7 @@ 
             $label = isset($button['label']) ? $button['label'] : $button['name'];
             
             $rendered .= sprintf('<button type="%s" id="%s" class="%s" name="%s">%s</button>',
-            		$buttonType, $id, $class, $button['name'], $label);
+                    $buttonType, $id, $class, $button['name'], $label);
         }
         
         return $rendered;
@@ -83,16 +83,16 @@ 
         }
         
         $formAction = sprintf("%s%s/%s", $contentPrefix, isset($parameters['controller']) ?
-        		$parameters['controller'] : lcfirst($request->getController()), isset($parameters['action']) ?
-        			$parameters['action'] : lcfirst($request->getAction()));
+                $parameters['controller'] : lcfirst($request->getController()), isset($parameters['action']) ?
+                    $parameters['action'] : lcfirst($request->getAction()));
         
         if (isset($parameters['formAction'])) {
             $formAction = $parameters['formAction'];
         }
         
         $rendered = sprintf('<form action="%s" method="%s"%s>', $formAction, isset($parameters['formMethod']) ?
-        		$parameters['formMethod'] : "POST", isset($parameters['formClass']) ?
-        		(sprintf(' class="%s"', $parameters['formClass'])) : "");
+                $parameters['formMethod'] : "POST", isset($parameters['formClass']) ?
+                (sprintf(' class="%s"', $parameters['formClass'])) : "");
         
         $rendered = $this->renderFields($rendered, $parameters['fields']);
         

src/Mvc/View/AbstractView.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
      *
      * @see \Nkey\Caribu\Mvc\View\View::render()
      */
-    abstract public function render(Response &$response, Request $request, $parameters = array());
+    abstract public function render(Response & $response, Request $request, $parameters = array());
 
     /**
      * Retrieve the settings from view

Indentation +4 added lines, -4 removed lines

@@ -120,8 +120,8 @@ 
     final public function matchController($controller)
     {
         return (in_array($controller, $this->controllers) ||
-				in_array('any', $this->controllers) ||
-				count($this->controllers) == 0);
+                in_array('any', $this->controllers) ||
+                count($this->controllers) == 0);
     }
 
     /**
@@ -132,8 +132,8 @@ 
     final public function matchAction($action)
     {
         return (in_array($action, $this->actions) ||
-        		in_array('any', $this->actions) ||
-        		count($this->actions) == 0);
+                in_array('any', $this->actions) ||
+                count($this->actions) == 0);
     }
 
     /**

src/Mvc/View/DefaultView.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      *
      * @see \Nkey\Caribu\Mvc\View\AbstractView::render()
      */
-    public function render(Response &$response, Request $request, $parameters = array())
+    public function render(Response & $response, Request $request, $parameters = array())
     {
         if ($response->getType() == 'text/html') {
             $html = sprintf("

src/Mvc/Util/Session.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         if (null === $namespace) {
             $this->sessionData = $_SESSION;
         } else {
-            if (! isset($_SESSION[$namespace])) {
+            if (!isset($_SESSION[$namespace])) {
                 $_SESSION[$namespace] = array();
             }
             $this->sessionData = $_SESSION[$namespace];

src/Mvc/View/View.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      *
      * @return void
      */
-    public function render(Response &$response, Request $request, $parameters = array());
+    public function render(Response & $response, Request $request, $parameters = array());
 
     /**
      * Retrieve the order of view in best-match list

src/Mvc/Controller/AbstractController.php

Indentation +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
             $currentBody = $response->getBody();
             
             if (! isset($this->viewParams[$controlIdentifier][$controlName])
-				|| ! $view->hasControl($controlIdentifier)) {
+                || ! $view->hasControl($controlIdentifier)) {
                 $response->setBody(str_replace($matches[0], '', $currentBody));
                 continue;
             }

Spacing +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
         
         $param = $params[0];
         assert($param instanceof \ReflectionParameter);
-        if (! ($class = $param->getClass()) || $class->getName() != 'Nkey\Caribu\Mvc\Controller\Request') {
+        if (!($class = $param->getClass()) || $class->getName() != 'Nkey\Caribu\Mvc\Controller\Request') {
             return false;
         }
         
@@ -106,7 +106,7 @@ 
             return;
         }
         
-        if (! $this->parseParameters($action)) {
+        if (!$this->parseParameters($action)) {
             return;
         }
         
@@ -205,7 +205,7 @@ 
      * @param View $view
      *            The View instance to use for rendering
      */
-    protected function addControls(Response &$response, Request $request, View $view)
+    protected function addControls(Response & $response, Request $request, View $view)
     {
         $matches = array();
         
@@ -214,8 +214,8 @@ 
             $controlName = $matches[2];
             $currentBody = $response->getBody();
             
-            if (! isset($this->viewParams[$controlIdentifier][$controlName])
-				|| ! $view->hasControl($controlIdentifier)) {
+            if (!isset($this->viewParams[$controlIdentifier][$controlName])
+				|| !$view->hasControl($controlIdentifier)) {
                 $response->setBody(str_replace($matches[0], '', $currentBody));
                 continue;
             }

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':