HexMakina / Hopper

hopper.php

Indentation +2 added lines, -2 removed lines

@@ -188,8 +188,8 @@
 
   public function hop_url($url)
   {
-  	header('Cache-Control: no-cache, must-revalidate');
-  	header('Expires: Mon, 01 Jan 1970 00:00:00 GMT');
+    header('Cache-Control: no-cache, must-revalidate');
+    header('Expires: Mon, 01 Jan 1970 00:00:00 GMT');
     header('Location: '.$url);
     exit();
   }

Spacing +27 added lines, -27 removed lines

@@ -8,14 +8,14 @@ 
 
 class hopper extends \AltoRouter implements RouterInterface
 {
-  private $match=null;
-  private $file_root=null;
+  private $match = null;
+  private $file_root = null;
   private $controller_namespaces = null;
 
   //----------------------------------------------------------- INITIALISATION
   public function __construct($settings)
   {
-    if(!isset($settings['route_home']))
+    if (!isset($settings['route_home']))
       throw new RouterException('ROUTE_HOME_UNDEFINED');
 
     parent::__construct();
@@ -41,12 +41,12 @@ 
   {
     $this->match = parent::match($requestUrl, $requestMethod);
 
-    if($this->match === false)
+    if ($this->match === false)
       throw new RouterException('ROUTE_MATCH_FALSE');
 
     $res = explode('::', $this->target());
 
-    if($res === false || !isset($res[1]) || isset($res[2]))
+    if ($res === false || !isset($res[1]) || isset($res[2]))
       throw new RouterException('INVALID_TARGET');
 
     $target_controller = $res[0];
@@ -54,11 +54,11 @@ 
     $found = false;
 
     $controller_class_name = null;
-    foreach($this->controller_namespaces as $controller_ns)
-      if($found = class_exists($controller_class_name = "$controller_ns$target_controller"))
+    foreach ($this->controller_namespaces as $controller_ns)
+      if ($found = class_exists($controller_class_name = "$controller_ns$target_controller"))
         break;
 
-    if($found === false)
+    if ($found === false)
       throw new RouterException('INVALID_CONTROLLER_NAME');
 
     $this->match['target_controller'] = $controller_class_name;
@@ -67,29 +67,29 @@ 
     return [$controller_class_name, $target_method];
   }
 
-  public function params($param_name=null)
+  public function params($param_name = null)
   {
     return $this->extract_request($this->match['params'] ?? [], $param_name);
   }
 
-  public function submitted($param_name=null)
+  public function submitted($param_name = null)
   {
     return $this->extract_request($_POST, $param_name);
   }
 
-  private function extract_request($dat_ass, $key=null)
+  private function extract_request($dat_ass, $key = null)
   {
 
     // $key is null, returns $dat_ass or empty array
-    if(is_null($key))
+    if (is_null($key))
       return $dat_ass ?? [];
 
     // $dat_ass[$key] not set, returns null
-    if(!isset($dat_ass[$key]))
+    if (!isset($dat_ass[$key]))
       return null;
 
     // $dat_ass[$key] is a string, returns decoded value
-    if(is_string($dat_ass[$key]))
+    if (is_string($dat_ass[$key]))
       return urldecode($dat_ass[$key]);
 
     // $dat_ass[$key] is not a string, return match[$key]
@@ -136,18 +136,18 @@ 
    *  - an assoc_array of url params (strongly AltoRouter-based)
    * returns: something to put in a href="", action="" or header('Location:');
    */
-  public function prehop($route, $route_params=[])
+  public function prehop($route, $route_params = [])
   {
-    try{
+    try {
       $url = $this->generate($route, $route_params);
-    }catch(\Exception $e){
+    }catch (\Exception $e) {
       $url = $this->prehop(self::ROUTE_HOME_NAME);
     }
 
     return $url;
   }
 
-  public function prehop_here($url=null)
+  public function prehop_here($url = null)
   {
     return $url ?? $_SERVER['REQUEST_URI'];
   }
@@ -159,13 +159,13 @@ 
    *    - a url, go there
    * @params $route_params, assoc_data for url creation (i:id, a:format, ..)
    */
-  public function hop($route=null, $route_params=[])
+  public function hop($route = null, $route_params = [])
   {
     $url = null;
 
-    if(is_null($route))
+    if (is_null($route))
       $url = $this->prehop(self::ROUTE_HOME_NAME, $route_params);
-    elseif(is_string($route) && $this->route_exists($route))
+    elseif (is_string($route) && $this->route_exists($route))
       $url = $this->prehop($route, $route_params);
     else
       $url = $route;
@@ -176,7 +176,7 @@ 
   // hops back to previous page (referer()), or home if no referer
   public function hop_back()
   {
-    if(!is_null($back = $this->referer()))
+    if (!is_null($back = $this->referer()))
       $this->hop_url($back);
 
     $this->hop();
@@ -194,7 +194,7 @@ 
   // returns null if same as current URL (prevents endless redirection loop)
   public function referer()
   {
-    if(isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != $this->web_host() .$_SERVER['REQUEST_URI'])
+    if (isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != $this->web_host().$_SERVER['REQUEST_URI'])
       return $_SERVER['HTTP_REFERER'];
 
     return null;
@@ -202,7 +202,7 @@ 
 
   public function send_file($file_path)
   {
-    if(!file_exists($file_path))
+    if (!file_exists($file_path))
       throw new RouterException('SENDING_NON_EXISTING_FILE');
 
     $file_name = basename($file_path);
@@ -210,7 +210,7 @@ 
     //Get file type and set it as Content Type
     $finfo = finfo_open(FILEINFO_MIME_TYPE);
 
-    header('Content-Type: ' . finfo_file($finfo, $file_path));
+    header('Content-Type: '.finfo_file($finfo, $file_path));
 
     finfo_close($finfo);
 
@@ -223,7 +223,7 @@ 
     header('Pragma: public');
 
     //Define file size
-    header('Content-Length: ' . filesize($file_path));
+    header('Content-Length: '.filesize($file_path));
 
     ob_clean();
     flush();
@@ -249,7 +249,7 @@ 
 
   public function web_root() : string
   {
-    return $this->web_host() . $this->web_base();
+    return $this->web_host().$this->web_base();
   }
 
   public function web_base() : string

Braces +41 added lines, -29 removed lines

@@ -15,8 +15,9 @@ 
   //----------------------------------------------------------- INITIALISATION
   public function __construct($settings)
   {
-    if(!isset($settings['route_home']))
-      throw new RouterException('ROUTE_HOME_UNDEFINED');
+    if(!isset($settings['route_home'])) {
+          throw new RouterException('ROUTE_HOME_UNDEFINED');
+    }
 
     parent::__construct();
 
@@ -41,25 +42,29 @@ 
   {
     $this->match = parent::match($requestUrl, $requestMethod);
 
-    if($this->match === false)
-      throw new RouterException('ROUTE_MATCH_FALSE');
+    if($this->match === false) {
+          throw new RouterException('ROUTE_MATCH_FALSE');
+    }
 
     $res = explode('::', $this->target());
 
-    if($res === false || !isset($res[1]) || isset($res[2]))
-      throw new RouterException('INVALID_TARGET');
+    if($res === false || !isset($res[1]) || isset($res[2])) {
+          throw new RouterException('INVALID_TARGET');
+    }
 
     $target_controller = $res[0];
     $target_method = $res[1];
     $found = false;
 
     $controller_class_name = null;
-    foreach($this->controller_namespaces as $controller_ns)
-      if($found = class_exists($controller_class_name = "$controller_ns$target_controller"))
+    foreach($this->controller_namespaces as $controller_ns) {
+          if($found = class_exists($controller_class_name = "$controller_ns$target_controller"))
         break;
+    }
 
-    if($found === false)
-      throw new RouterException('INVALID_CONTROLLER_NAME');
+    if($found === false) {
+          throw new RouterException('INVALID_CONTROLLER_NAME');
+    }
 
     $this->match['target_controller'] = $controller_class_name;
     $this->match['target_method'] = $target_method;
@@ -81,16 +86,19 @@ 
   {
 
     // $key is null, returns $dat_ass or empty array
-    if(is_null($key))
-      return $dat_ass ?? [];
+    if(is_null($key)) {
+          return $dat_ass ?? [];
+    }
 
     // $dat_ass[$key] not set, returns null
-    if(!isset($dat_ass[$key]))
-      return null;
+    if(!isset($dat_ass[$key])) {
+          return null;
+    }
 
     // $dat_ass[$key] is a string, returns decoded value
-    if(is_string($dat_ass[$key]))
-      return urldecode($dat_ass[$key]);
+    if(is_string($dat_ass[$key])) {
+          return urldecode($dat_ass[$key]);
+    }
 
     // $dat_ass[$key] is not a string, return match[$key]
     return $dat_ass[$key];
@@ -140,7 +148,7 @@ 
   {
     try{
       $url = $this->generate($route, $route_params);
-    }catch(\Exception $e){
+    } catch(\Exception $e){
       $url = $this->prehop(self::ROUTE_HOME_NAME);
     }
 
@@ -163,12 +171,13 @@ 
   {
     $url = null;
 
-    if(is_null($route))
-      $url = $this->prehop(self::ROUTE_HOME_NAME, $route_params);
-    elseif(is_string($route) && $this->route_exists($route))
-      $url = $this->prehop($route, $route_params);
-    else
-      $url = $route;
+    if(is_null($route)) {
+          $url = $this->prehop(self::ROUTE_HOME_NAME, $route_params);
+    } elseif(is_string($route) && $this->route_exists($route)) {
+          $url = $this->prehop($route, $route_params);
+    } else {
+          $url = $route;
+    }
 
     $this->hop_url($url);
   }
@@ -176,8 +185,9 @@ 
   // hops back to previous page (referer()), or home if no referer
   public function hop_back()
   {
-    if(!is_null($back = $this->referer()))
-      $this->hop_url($back);
+    if(!is_null($back = $this->referer())) {
+          $this->hop_url($back);
+    }
 
     $this->hop();
   }
@@ -194,16 +204,18 @@ 
   // returns null if same as current URL (prevents endless redirection loop)
   public function referer()
   {
-    if(isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != $this->web_host() .$_SERVER['REQUEST_URI'])
-      return $_SERVER['HTTP_REFERER'];
+    if(isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != $this->web_host() .$_SERVER['REQUEST_URI']) {
+          return $_SERVER['HTTP_REFERER'];
+    }
 
     return null;
   }
 
   public function send_file($file_path)
   {
-    if(!file_exists($file_path))
-      throw new RouterException('SENDING_NON_EXISTING_FILE');
+    if(!file_exists($file_path)) {
+          throw new RouterException('SENDING_NON_EXISTING_FILE');
+    }
 
     $file_name = basename($file_path);
 

RouterInterface.php

Spacing +3 added lines, -3 removed lines

@@ -13,17 +13,17 @@
   public function match($requestUrl = null, $requestMethod = null);
 
   // generates URL for href and location
-  public function prehop($route, $route_params=[]);
+  public function prehop($route, $route_params = []);
 
   // heads to another location
-  public function hop($route, $route_params=[]);
+  public function hop($route, $route_params = []);
 
   // do you GET it ?
   public function requests() : bool;
 
   // have you POSTed it ?
   public function submits() : bool;
-  public function submitted($param_name=null);
+  public function submitted($param_name = null);
 
   public function send_file($file_path);