reformo / rslim

apps/_skel/controllers/app/hello.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
 
-function app_content($request, $args){
+function app_content($request, $args) {
     return ['data'=>null];
 }
\ No newline at end of file

apps/_skel/controllers/app/main.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-function app_content($request, $args){
+function app_content($request, $args) {
 
     return ['data'=>null];
 }
\ No newline at end of file

apps/_skel/controllers/app/hello.post.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-function app_content($request, $args){
+function app_content($request, $args) {
 
-    return ['data'=>['name'=>$request->getParam('name')],'status'=>200];
+    return ['data'=>['name'=>$request->getParam('name')], 'status'=>200];
 }
\ No newline at end of file

apps/_skel/controllers/app/hello_name.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-function app_content($request, $args){
+function app_content($request, $args) {
 
-    return ['data'=>['name'=>$args['name']],'status'=>200];
+    return ['data'=>['name'=>$args['name']], 'status'=>200];
 }
\ No newline at end of file

apps/_skel/app_config.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$config =[
+$config = [
     'base_dir'  => dirname(dirname(__DIR__)),
     'base_url'  => 'http://www.reformo.dev',
     'app_name'  => basename(__DIR__),

src/RSlim.php

Spacing +44 added lines, -44 removed lines

@@ -5,7 +5,7 @@ 
 use \Psr\Http\Message\RequestInterface as Request;
 use \Psr\Http\Message\ResponseInterface as Response;
 
-class RSlim{
+class RSlim {
 
     public $config = [
         'base_dir'  => null,
@@ -30,40 +30,40 @@ 
         $this->app          = new \Slim\App($this->container);
     }
 
-    public function run_route($request, $response, $route, $action='main', $return_type='html', $args = [])
+    public function run_route($request, $response, $route, $action = 'main', $return_type = 'html', $args = [])
     {
-        $controller = $this->config['base_dir'] . '/apps/' . $this->config['app_name'] .'/controllers/'. $route . '/' . $action . '.php';
+        $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;
+                else {
+                    if (!isset($function_output['status'])) {
+                        $function_output['status'] = 200;
                     }
                     $status = (int) $function_output['status'];
                 }
-                $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);
+                $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{
-                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 );
+            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);
                 }
                 $function_output = app_content($request, $args);
-                if(!isset($function_output['data'])){
-                    $function_output['data']=[];
+                if (!isset($function_output['data'])) {
+                    $function_output['data'] = [];
                 }
                 $loader     = new \Twig_Loader_Filesystem($this->config['base_dir']);
                 $this->twig = new \Twig_Environment($loader, [
@@ -72,69 +72,69 @@ 
                     'auto_reload'   => 1
                 ]);
                 $this->twig->addGlobal('runtime_config', $this->config);
-                $function_output['app_content']=$this->twig->render($template,$function_output['data']);
+                $function_output['app_content'] = $this->twig->render($template, $function_output['data']);
                 $main_template_name = 'default';
-                if( isset( $function_output['app_main_template'] ) ){
+                if (isset($function_output['app_main_template'])) {
                     $main_template_name = $function_output['app_main_template'];
                 }
-                $main_template =  '/apps/'.$this->config['app_name'] . '/templates/_' . $main_template_name . '.html';
+                $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 );
+                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);
                 }
-                $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");
+        else {
+            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';
-        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);
+        $not_found_template = '/apps/' . $this->config['app_name'] . '/templates/_404.html';
+        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")
+                ->withHeader('Content-Type', 'text/html')->withHeader('X-Powered-By', "reformo/rslim")
                 ->write($this->twig->render($not_found_template, ['message'=>$message]));
         }
     }
 
-    public function register($request_method, $pattern, $controller, $return_type='html')
+    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]);
     }
 
     public function run()
     {
-        $this->container['notFoundHandler'] = function ($c) {
-            return function (Request $req, Response $res) use ($c) {
+        $this->container['notFoundHandler'] = function($c) {
+            return function(Request $req, Response $res) use ($c) {
                 return $c['response']
                     ->withStatus(404)
-                    ->withHeader('Content-Type', 'text/html')->withHeader('X-Powered-By',"reformo/rslim")
+                    ->withHeader('Content-Type', 'text/html')->withHeader('X-Powered-By', "reformo/rslim")
                     ->write('<h1>404 - Requested URL not found</h1>');
             };
         };
-        $this->container['errorHandler'] = function ($container) {
-            return function ($request, $response, $exception) use ($container) {
+        $this->container['errorHandler'] = function($container) {
+            return function($request, $response, $exception) use ($container) {
                 $response->getBody()->rewind();
                 return $response->withStatus(500)
                     ->withHeader('Content-Type', 'text/html')
                     ->write($exception->getMessage());
             };
         };
-        $this->container['phpErrorHandler'] = function ($container) {
-        return function ($request, $response, $error) use ($container) {
+        $this->container['phpErrorHandler'] = function($container) {
+        return function($request, $response, $error) use ($container) {
             $response->getBody()->rewind();
             return $response->withStatus(500)
                 ->withHeader('Content-Type', 'text/html')

Braces +4 added lines, -8 removed lines

@@ -47,8 +47,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;
                     }
@@ -56,8 +55,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 );
                 }
@@ -87,8 +85,7 @@ 
                 $newResponse->write($app_content);
             }
             return $newResponse;
-        }
-        else{
+        } else{
             return $this->not_found($request, $response, $return_type, 'Controller '. $route . '/' . $action." not found");
         }
     }
@@ -99,8 +96,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]));