HexMakina / Hopper

hopper.php

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