reformo / rslim

src/RSlim.php

Spacing +18 added lines, -18 removed lines

@@ -36,22 +36,22 @@ 
         $controller = $this->config['base_dir'] . '/apps/' . $this->config['app_name'] . '/controllers/' . $route . '/' . $action . '.php';
         $template   = '/apps/' . $this->config['app_name'] . '/templates/' . $route . '/' . $action . '.html';
 
-        if(file_exists($controller)){
+        if (file_exists($controller)) {
 
             require_once($controller);
 
-            if(!function_exists('app_content')){
-                return $this->not_found($request, $response, $return_type, 'Controller '. $route . '/' . $action . " has not app_content function");
+            if (!function_exists('app_content')) {
+                return $this->not_found($request, $response, $return_type, 'Controller ' . $route . '/' . $action . " has not app_content function");
             }
-            if ($return_type == 'json'){
+            if ($return_type == 'json') {
                 $status = 500;
                 $function_output = app_content($request, $args);
-                if (!is_array( $function_output) ) {
+                if (!is_array($function_output)) {
                     $function_output = ["status" => 500, "error" => "Internal Server Error"];
                 }
                 else {
                     if (!isset($function_output['status'])) {
-                        $function_output['status']=200;
+                        $function_output['status'] = 200;
                     }
                     $status = (int) $function_output['status'];
                 }
@@ -59,8 +59,8 @@ 
                 $newResponse = $response->withHeader('Content-Type', 'application/json;charset=utf-8')->withHeader('X-Powered-By', "reformo/rslim")->withStatus($status);
             }
             else {
-                if (!file_exists($this->config['base_dir'].$template)) {
-                    throw new \Exception("<strong>Template file not found!</strong> " . $route . '/' . $action . " needs a template file at:" . $template );
+                if (!file_exists($this->config['base_dir'] . $template)) {
+                    throw new \Exception("<strong>Template file not found!</strong> " . $route . '/' . $action . " needs a template file at:" . $template);
                 }
                 $function_output = app_content($request, $args);
                 if (!isset($function_output['data'])) {
@@ -74,7 +74,7 @@ 
                 ]);
                 $filter = new \Twig_SimpleFunction(
                     'rwidget_*_*',
-                    function ($widget_name, $widget_action, $args = []) {
+                    function($widget_name, $widget_action, $args = []) {
 
                         $widget_file = $this->config['base_dir'] . '/apps/' . $this->config['app_name'] . '/widgets/' . $widget_name . '/' . $widget_action . ".php";
                         $widget_template = '/apps/' . $this->config['app_name'] . '/templates/_widgets/' . $widget_name . '/' . $widget_action . '.html';
@@ -112,24 +112,24 @@ 
                 $main_template = '/apps/' . $this->config['app_name'] . '/templates/_' . $main_template_name . '.html';
 
                 if (!file_exists($this->config['base_dir'] . $main_template)) {
-                    throw new \Exception("<strong>Main emplate file not found!</strong> " . $route . '/' . $action . " needs a main template file at:" . $main_template );
+                    throw new \Exception("<strong>Main emplate file not found!</strong> " . $route . '/' . $action . " needs a main template file at:" . $main_template);
                 }
-                $app_content =  $this->twig->render( $main_template, $function_output);
-                $newResponse=$response->withHeader('X-Powered-By', "reformo/rslim");
+                $app_content = $this->twig->render($main_template, $function_output);
+                $newResponse = $response->withHeader('X-Powered-By', "reformo/rslim");
                 $newResponse->write($app_content);
             }
             return $newResponse;
         }
         else {
-            return $this->not_found($request, $response, $return_type, 'Controller '. $route . '/' . $action." not found");
+            return $this->not_found($request, $response, $return_type, 'Controller ' . $route . '/' . $action . " not found");
         }
     }
 
-    public function not_found($request, $response, $return_type = 'html', $message = ""){
+    public function not_found($request, $response, $return_type = 'html', $message = "") {
 
-        $not_found_template =  '/apps/' . $this->config['app_name'] . '/templates/_404.html';
+        $not_found_template = '/apps/' . $this->config['app_name'] . '/templates/_404.html';
         if ($return_type == 'json') {
-            $response->getBody()->write( json_encode(['status'=>404, 'message'=>$message]));
+            $response->getBody()->write(json_encode(['status'=>404, 'message'=>$message]));
             return $response->withHeader('Content-Type', 'application/json;charset=utf-8')->withHeader('X-Powered-By', "reformo/rslim")->withStatus(404);
         }
         else {
@@ -141,8 +141,8 @@ 
 
     public function register($request_method, $pattern, $controller, $return_type = 'html')
     {
-        $this->app->map([strtoupper($request_method)], $pattern, function(Request $req, Response $res, $args ){
-            list($route,$action) = explode("/",$args['controller']);
+        $this->app->map([strtoupper($request_method)], $pattern, function(Request $req, Response $res, $args) {
+            list($route, $action) = explode("/", $args['controller']);
             return $args['RSlim']->run_route($req, $res, $route, $action, $args['return_type'], $args);
         })->setArguments(['controller'=>$controller, 'return_type'=>$return_type, 'RSlim'=>$this]);
     }

Braces +6 added lines, -12 removed lines

@@ -48,8 +48,7 @@ 
                 $function_output = app_content($request, $args);
                 if (!is_array( $function_output) ) {
                     $function_output = ["status" => 500, "error" => "Internal Server Error"];
-                }
-                else {
+                } else {
                     if (!isset($function_output['status'])) {
                         $function_output['status']=200;
                     }
@@ -57,8 +56,7 @@ 
                 }
                 $response->getBody()->write(json_encode($function_output));
                 $newResponse = $response->withHeader('Content-Type', 'application/json;charset=utf-8')->withHeader('X-Powered-By', "reformo/rslim")->withStatus($status);
-            }
-            else {
+            } else {
                 if (!file_exists($this->config['base_dir'].$template)) {
                     throw new \Exception("<strong>Template file not found!</strong> " . $route . '/' . $action . " needs a template file at:" . $template );
                 }
@@ -88,15 +86,13 @@ 
                             if (!file_exists($this->config['base_dir'] . $widget_template)) {
                                 if (is_string($widget_content)) {
                                     return $widget_content;
-                                }
-                                else {
+                                } else {
                                     throw new \Exception("<strong>Widget should return string:</strong> " . $widget_name . '/' . $widget_action . "!");
                                 }
                             } else {
                                 return $this->twig->render($widget_template, $widget_content);
                             }
-                        }
-                        else {
+                        } else {
                             throw new \Exception("<strong>Widget function not found!</strong> " . $widget_name . '/' . $widget_action . "!");
                         }
                     },
@@ -119,8 +115,7 @@ 
                 $newResponse->write($app_content);
             }
             return $newResponse;
-        }
-        else {
+        } else {
             return $this->not_found($request, $response, $return_type, 'Controller '. $route . '/' . $action." not found");
         }
     }
@@ -131,8 +126,7 @@ 
         if ($return_type == 'json') {
             $response->getBody()->write( json_encode(['status'=>404, 'message'=>$message]));
             return $response->withHeader('Content-Type', 'application/json;charset=utf-8')->withHeader('X-Powered-By', "reformo/rslim")->withStatus(404);
-        }
-        else {
+        } else {
             return $response->withStatus(404)
                 ->withHeader('Content-Type', 'text/html')->withHeader('X-Powered-By', "reformo/rslim")
                 ->write($this->twig->render($not_found_template, ['message'=>$message]));