maikgreubel / caribu-mvc

src/Mvc/Util/RequestParser.php

Spacing +9 added lines, -9 removed lines

@@ -19,11 +19,11 @@ 
      *
      * @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->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'];
@@ -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
@@ -72,7 +72,7 @@ 
         if (count($parts) > 0) {
             $request->controller = ucfirst(trim($parts[0]));
             array_shift($parts);
-            if (! $request->controller) {
+            if (!$request->controller) {
                 $request->controller = $defaultController;
             }
         }
@@ -81,7 +81,7 @@ 
         if (count($parts) > 0) {
             $request->action = trim($parts[0]);
             array_shift($parts);
-            if (! $request->action) {
+            if (!$request->action) {
                 $request->action = $defaultAction;
             }
         }
@@ -101,7 +101,7 @@ 
      * @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])) {
@@ -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/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/Request.php

Spacing +3 added lines, -3 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);
@@ -242,7 +242,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':
@@ -277,7 +277,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/Controller/AbstractController.php

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