ingeniasoftware / luthier

src/Middleware/Request.php

Spacing +5 added lines, -5 removed lines

@@ -95,7 +95,7 @@ 
             if (ENVIRONMENT != 'production')
                 show_error('The request method '.$this->requestMethod.' is not allowed to view the resource', 403, 'Forbidden method');
 
-            if(is_null(Route::get404()))
+            if (is_null(Route::get404()))
                 show_404();
 
             if (Route::get404()->controller != get_class($this->CI))
@@ -110,16 +110,16 @@ 
 
                 // Redirect to 404 if not enough parameters provided
 
-                if(count($path_args) < count($route_args['required']))
+                if (count($path_args) < count($route_args['required']))
                     redirect(Route::get404()->path);
 
-                if(count($path_args) == 0)
+                if (count($path_args) == 0)
                 {
                     $this->CI->{$this->route->method}();
                 }
                 else
                 {
-                    call_user_func_array( [$this->CI, $this->route->method], array_values($path_args) );
+                    call_user_func_array([$this->CI, $this->route->method], array_values($path_args));
                 }
 
                 // TODO: Add support to hooks in this execution thread
@@ -132,7 +132,7 @@ 
                 if (ENVIRONMENT != 'production')
                     show_error('The method '.$this->route->controller.'::'.$this->route->method.'() does not exists', 500, 'Method not found');
 
-                if(is_null(Route::get404()))
+                if (is_null(Route::get404()))
                     show_404();
 
                 if (Route::get404()->controller != get_class($this->CI))

Braces +34 added lines, -28 removed lines

@@ -64,20 +64,22 @@ 
 
         // FIXME: Solve ambiguity here! POST with _method="GET" makes no sense
 
-        if (isset($_POST['_method']) && in_array(strtoupper($_POST['_method']), $validMethods, TRUE))
-            $formMethod = strtoupper($_POST['_method']);
+        if (isset($_POST['_method']) && in_array(strtoupper($_POST['_method']), $validMethods, TRUE)) {
+                    $formMethod = strtoupper($_POST['_method']);
+        }
 
         if (is_null($formMethod))
         {
             $this->requestMethod = $requestMethod;
-        }
-        else
+        } else
         {
-            if ($requestMethod == 'POST')
-                $this->requestMethod = $formMethod;
+            if ($requestMethod == 'POST') {
+                            $this->requestMethod = $formMethod;
+            }
 
-            if (!$this->CI->input->is_ajax_request() && $this->requestMethod == 'HEAD')
-                $this->requestMethod = 'POST';
+            if (!$this->CI->input->is_ajax_request() && $this->requestMethod == 'HEAD') {
+                            $this->requestMethod = 'POST';
+            }
         }
     }
 
@@ -92,16 +94,18 @@ 
     {
         if (!$this->route)
         {
-            if (ENVIRONMENT != 'production')
-                show_error('The request method '.$this->requestMethod.' is not allowed to view the resource', 403, 'Forbidden method');
+            if (ENVIRONMENT != 'production') {
+                            show_error('The request method '.$this->requestMethod.' is not allowed to view the resource', 403, 'Forbidden method');
+            }
 
-            if(is_null(Route::get404()))
-                show_404();
+            if(is_null(Route::get404())) {
+                            show_404();
+            }
 
-            if (Route::get404()->controller != get_class($this->CI))
-                Route::trigger404();
-        }
-        else
+            if (Route::get404()->controller != get_class($this->CI)) {
+                            Route::trigger404();
+            }
+        } else
         {
             if (method_exists($this->CI, $this->route->method))
             {
@@ -110,14 +114,14 @@ 
 
                 // Redirect to 404 if not enough parameters provided
 
-                if(count($path_args) < count($route_args['required']))
-                    redirect(Route::get404()->path);
+                if(count($path_args) < count($route_args['required'])) {
+                                    redirect(Route::get404()->path);
+                }
 
                 if(count($path_args) == 0)
                 {
                     $this->CI->{$this->route->method}();
-                }
-                else
+                } else
                 {
                     call_user_func_array( [$this->CI, $this->route->method], array_values($path_args) );
                 }
@@ -126,17 +130,19 @@ 
 
                 $this->CI->output->_display();
                 exit(0);
-            }
-            else
+            } else
             {
-                if (ENVIRONMENT != 'production')
-                    show_error('The method '.$this->route->controller.'::'.$this->route->method.'() does not exists', 500, 'Method not found');
+                if (ENVIRONMENT != 'production') {
+                                    show_error('The method '.$this->route->controller.'::'.$this->route->method.'() does not exists', 500, 'Method not found');
+                }
 
-                if(is_null(Route::get404()))
-                    show_404();
+                if(is_null(Route::get404())) {
+                                    show_404();
+                }
 
-                if (Route::get404()->controller != get_class($this->CI))
-                    Route::trigger404();
+                if (Route::get404()->controller != get_class($this->CI)) {
+                                    Route::trigger404();
+                }
             }
         }
     }