maikgreubel / caribu-mvc

src/Mvc/Util/RequestParser.php

Doc Comments +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
      * Parse the context prefix variables to determine in which path
      * context the request has been performed.
      *
-     * @param Request $request            
+     * @param \Nkey\Caribu\Mvc\Controller\Request $request            
      */
     private static function parseContextPrefix(\Nkey\Caribu\Mvc\Controller\Request &$request, $serverVars = array())
     {
@@ -37,7 +37,7 @@ 
     /**
      * Parse the prepared uri into its parts
      *
-     * @param Request $request
+     * @param \Nkey\Caribu\Mvc\Controller\Request $request
      *            The unprepared request object
      * @param string $uri
      *            The prepared uri
@@ -89,7 +89,7 @@ 
     /**
      * Parse a single http header element into parameter for the request object
      *
-     * @param Request $req
+     * @param \Nkey\Caribu\Mvc\Controller\Request $req
      *            The destination request object
      * @param array $serverVars
      *            The server variables provided by sapi
@@ -108,7 +108,7 @@ 
     /**
      * Parse the server variables which represents HTTP headers into parameter values for the request object
      *
-     * @param Request $req
+     * @param \Nkey\Caribu\Mvc\Controller\Request $req
      *            The request object
      *            
      * @param
@@ -143,7 +143,7 @@ 
     /**
      * Parse the remote host variables to determine client address
      *
-     * @param Request $request            
+     * @param \Nkey\Caribu\Mvc\Controller\Request $request            
      */
     private static function parseRemoteHost(\Nkey\Caribu\Mvc\Controller\Request &$request, $serverVars = array())
     {
@@ -158,7 +158,7 @@ 
     /**
      * Parse the super globals for request parameters
      *
-     * @param Request $request
+     * @param \Nkey\Caribu\Mvc\Controller\Request $request
      *            Request object to put the parameters in
      */
     private static function parseGetPostSessionCookie(\Nkey\Caribu\Mvc\Controller\Request &$request)

Spacing +9 added lines, -9 removed lines

@@ -17,11 +17,11 @@ 
      *
      * @param Request $request            
      */
-    private static function parseContextPrefix(\Nkey\Caribu\Mvc\Controller\Request &$request, $serverVars = array())
+    private static function parseContextPrefix(\Nkey\Caribu\Mvc\Controller\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->contextPrefix = $serverVars['CONTEXT_PREFIX'] . '/';
+            $request->contextPrefix = $serverVars['CONTEXT_PREFIX'].'/';
         } elseif (isset($serverVars['REDIRECT_BASE'])) {
             // Try to determine the context from redirect base
             $request->contextPrefix = $serverVars['REDIRECT_BASE'];
@@ -48,7 +48,7 @@ 
      *            
      * @return array Parsed parts for later usage
      */
-    private static function parseUri(\Nkey\Caribu\Mvc\Controller\Request &$request, $uri, $defaultController, $defaultAction)
+    private static function parseUri(\Nkey\Caribu\Mvc\Controller\Request & $request, $uri, $defaultController, $defaultAction)
     {
         // All beyond the context prefix is our application request uri
         $contextUri = $uri;
@@ -69,7 +69,7 @@ 
         if (count($parts) > 0) {
             $request->controller = ucfirst(trim($parts[0]));
             array_shift($parts);
-            if (! $request->controller) {
+            if (!$request->controller) {
                 $request->controller = $defaultController;
             }
         }
@@ -78,7 +78,7 @@ 
         if (count($parts) > 0) {
             $request->action = trim($parts[0]);
             array_shift($parts);
-            if (! $request->action) {
+            if (!$request->action) {
                 $request->action = $defaultAction;
             }
         }
@@ -98,7 +98,7 @@ 
      * @param string $paramName
      *            The destination parameter name
      */
-    private static function parseElement(\Nkey\Caribu\Mvc\Controller\Request &$req, $serverVars, $elementName, $paramName)
+    private static function parseElement(\Nkey\Caribu\Mvc\Controller\Request & $req, $serverVars, $elementName, $paramName)
     {
         if (isset($serverVars[$elementName])) {
             $req->params[$paramName] = $serverVars[$elementName];
@@ -114,7 +114,7 @@ 
      * @param
      *            array The server variables provided by sapi
      */
-    private static function parseParameters(\Nkey\Caribu\Mvc\Controller\Request &$req, $serverVars)
+    private static function parseParameters(\Nkey\Caribu\Mvc\Controller\Request & $req, $serverVars)
     {
         self::parseElement($req, $serverVars, 'HTTP_ACCEPT', 'Accept');
         self::parseElement($req, $serverVars, 'HTTP_ACCEPT_LANGUAGE', 'Accept-Language');
@@ -145,7 +145,7 @@ 
      *
      * @param Request $request            
      */
-    private static function parseRemoteHost(\Nkey\Caribu\Mvc\Controller\Request &$request, $serverVars = array())
+    private static function parseRemoteHost(\Nkey\Caribu\Mvc\Controller\Request & $request, $serverVars = array())
     {
         if (isset($serverVars['REMOTE_ADDR'])) {
             $request->remoteHost = $serverVars['REMOTE_ADDR'];
@@ -161,7 +161,7 @@ 
      * @param Request $request
      *            Request object to put the parameters in
      */
-    private static function parseGetPostSessionCookie(\Nkey\Caribu\Mvc\Controller\Request &$request)
+    private static function parseGetPostSessionCookie(\Nkey\Caribu\Mvc\Controller\Request & $request)
     {
         foreach ($_GET as $name => $value) {
             $request->params[$name] = $value;

src/Mvc/Controller/AbstractController.php

Spacing +4 added lines, -4 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,7 +214,7 @@ 
             $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/Controller/Request.php

Spacing +3 added lines, -3 removed lines

@@ -149,7 +149,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);
@@ -244,7 +244,7 @@ 
             
             case 'bool':
             case 'boolean':
-                $result = function_exists('boolval') ? boolval($result) : (bool) $result;
+                $result = function_exists('boolval') ? boolval($result) : (bool)$result;
                 break;
             
             case 'double':
@@ -279,7 +279,7 @@ 
      */
     public function setParam($name, $value)
     {
-        if (! $this->hasParam($name)) {
+        if (!$this->hasParam($name)) {
             throw new ControllerException("Parameter {param} does not exist", array(
                 'param' => $name
             ));

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();
         }
         

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/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

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/Application.php

Spacing +6 added lines, -6 removed lines

@@ -203,14 +203,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
             ));
@@ -310,13 +310,13 @@ 
      */
     public function registerController($controller, $applicationName = 'default')
     {
-        if (! class_exists($controller)) {
+        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
             ));
@@ -365,7 +365,7 @@ 
             'action' => $action
         ));
         
-        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
@@ -376,7 +376,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

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];