HexMakina / kadro

StateAgent.class.php

Spacing +10 added lines, -10 removed lines

@@ -11,7 +11,7 @@ 
   // $options : https://www.php.net/manual/fr/session.configuration.php
   public function __construct($options)
   {
-    if(isset($options['session_name']))
+    if (isset($options['session_name']))
     {
       session_name($options['session_name']);
       unset($options['session_name']);
@@ -32,28 +32,28 @@ 
     return isset($_SESSION[$this->index_filter][$filter_name]) && strlen(''.$_SESSION[$this->index_filter][$filter_name]) > 0;
   }
 
-  public function filters($filter_name=null, $value=null)
+  public function filters($filter_name = null, $value = null)
   {
-    if(is_null($filter_name))
+    if (is_null($filter_name))
       return $_SESSION[$this->index_filter];
 
-    if(!is_null($value))
+    if (!is_null($value))
       $_SESSION[$this->index_filter][$filter_name] = $value;
 
     return $_SESSION[$this->index_filter][$filter_name] ?? null;
   }
 
-  public function reset_filters($filter_name=null)
+  public function reset_filters($filter_name = null)
   {
-    if(is_null($filter_name))
-      $_SESSION[$this->index_filter]=[];
+    if (is_null($filter_name))
+      $_SESSION[$this->index_filter] = [];
     else
       unset($_SESSION[$this->index_filter][$filter_name]);
   }
 
   public function operator_id($setter = null)
   {
-    if(!is_null($setter))
+    if (!is_null($setter))
       $_SESSION[$this->index_operator] = ['id' => $setter, 'set_on' => time()];
 
     return $_SESSION[$this->index_operator]['id'] ?? null;
@@ -68,10 +68,10 @@ 
   public function destroy() : bool
   {
 
-    if(ini_get("session.use_cookies"))
+    if (ini_get("session.use_cookies"))
     {
       $params = session_get_cookie_params();
-      setcookie(session_name(), '', time() - 42000,
+      setcookie(session_name(), '', time()-42000,
         $params["path"], $params["domain"],
         $params["secure"], $params["httponly"]
       );

Braces +14 added lines, -10 removed lines

@@ -34,27 +34,31 @@
 
   public function filters($filter_name=null, $value=null)
   {
-    if(is_null($filter_name))
-      return $_SESSION[$this->index_filter];
+    if(is_null($filter_name)) {
+          return $_SESSION[$this->index_filter];
+    }
 
-    if(!is_null($value))
-      $_SESSION[$this->index_filter][$filter_name] = $value;
+    if(!is_null($value)) {
+          $_SESSION[$this->index_filter][$filter_name] = $value;
+    }
 
     return $_SESSION[$this->index_filter][$filter_name] ?? null;
   }
 
   public function reset_filters($filter_name=null)
   {
-    if(is_null($filter_name))
-      $_SESSION[$this->index_filter]=[];
-    else
-      unset($_SESSION[$this->index_filter][$filter_name]);
+    if(is_null($filter_name)) {
+          $_SESSION[$this->index_filter]=[];
+    } else {
+          unset($_SESSION[$this->index_filter][$filter_name]);
+    }
   }
 
   public function operator_id($setter = null)
   {
-    if(!is_null($setter))
-      $_SESSION[$this->index_operator] = ['id' => $setter, 'set_on' => time()];
+    if(!is_null($setter)) {
+          $_SESSION[$this->index_operator] = ['id' => $setter, 'set_on' => time()];
+    }
 
     return $_SESSION[$this->index_operator]['id'] ?? null;
   }

Auth/Permissionability.class.php

Spacing +16 added lines, -16 removed lines

@@ -8,17 +8,17 @@ 
 
   public function permission_names()
   {
-    if(property_exists($this, 'permission_names'))
+    if (property_exists($this, 'permission_names'))
     {
       return explode(',', $this->permission_names);
     }
-    elseif(property_exists($this, 'permission_ids'))
+    elseif (property_exists($this, 'permission_ids'))
     {
       $ids = explode(',', $this->permission_ids);
       $ret = [];
       $permissions = Permission::get_many_by_AIPK($ids);
-      foreach($permissions as $id => $p)
-        $ret[]="$p";
+      foreach ($permissions as $id => $p)
+        $ret[] = "$p";
       return $ret;
     }
     
@@ -31,16 +31,16 @@ 
   public function permissions()
   {
     
-    if(!is_null($this->permissions))
+    if (!is_null($this->permissions))
       return $this->permissions;
     $permission_unique_keys = null;
-    if(property_exists($this, 'permission_names'))
+    if (property_exists($this, 'permission_names'))
     {
       $permission_unique_keys = explode(',', $this->permission_names);
       // vd(Permission::table()->select());
       $this->permissions = Permission::retrieve(Permission::table()->select()->aw_string_in('name', $permission_unique_keys));
     }
-    elseif(property_exists($this, 'permission_ids'))
+    elseif (property_exists($this, 'permission_ids'))
     {
       $permission_unique_keys = explode(',', $this->permission_ids);
       $this->permissions = Permission::retrieve(Permission::table()->select()->aw_numeric_in('id', $permission_unique_keys));
@@ -56,40 +56,40 @@ 
   public function has_permission($p) : bool
   {
     // new instances or inactive operators, none shall pass
-    if($this->is_new() === true || $this->is_active()  === false)
+    if ($this->is_new() === true || $this->is_active() === false)
       return false;
     
     $permission_name = $permission_id = null;
-    if(is_subclass_of($p, '\HexMakina\kadro\Auth\Permission'))
+    if (is_subclass_of($p, '\HexMakina\kadro\Auth\Permission'))
     {
       $permission_name = $p->get('name');
       $permission_id = $p->get_id();
     }
-    elseif(preg_match('/[0-9]+/', $p))
+    elseif (preg_match('/[0-9]+/', $p))
       $permission_id = $p;
     else
       $permission_name = $p;
 
 
-    if(!is_null($this->get('permission_names')) && !is_null($permission_name))
+    if (!is_null($this->get('permission_names')) && !is_null($permission_name))
     {
       return strpos($this->get('permission_names'), $permission_name) !== false;
     }
-    elseif(!is_null($this->get('permission_ids')) && !is_null($permission_id))
+    elseif (!is_null($this->get('permission_ids')) && !is_null($permission_id))
     {
       return strpos($this->get('permission_ids'), $permission_id) !== false;
     }
-    elseif(!is_null($permission_name))
+    elseif (!is_null($permission_name))
     {
-      if(method_exists($this, $permission_name) && $this->$permission_name() == true)
+      if (method_exists($this, $permission_name) && $this->$permission_name() == true)
       {
         return true;
       }
-      elseif(property_exists($this, $permission_name) && $this->$permission_name == true)
+      elseif (property_exists($this, $permission_name) && $this->$permission_name == true)
       {
         return true;
       }
-      elseif(ACL::match($this, $permission_name) === true)
+      elseif (ACL::match($this, $permission_name) === true)
       {
         return true;
       }

Braces +21 added lines, -27 removed lines

@@ -11,18 +11,16 @@ 
     if(property_exists($this, 'permission_names'))
     {
       return explode(',', $this->permission_names);
-    }
-    elseif(property_exists($this, 'permission_ids'))
+    } elseif(property_exists($this, 'permission_ids'))
     {
       $ids = explode(',', $this->permission_ids);
       $ret = [];
       $permissions = Permission::get_many_by_AIPK($ids);
-      foreach($permissions as $id => $p)
-        $ret[]="$p";
+      foreach($permissions as $id => $p) {
+              $ret[]="$p";
+      }
       return $ret;
-    }
-
-    else
+    } else
     {
       return ACL::permissions_names_for($this);
     }
@@ -31,21 +29,20 @@ 
   public function permissions()
   {
 
-    if(!is_null($this->permissions))
-      return $this->permissions;
+    if(!is_null($this->permissions)) {
+          return $this->permissions;
+    }
     $permission_unique_keys = null;
     if(property_exists($this, 'permission_names'))
     {
       $permission_unique_keys = explode(',', $this->permission_names);
       // vd(Permission::table()->select());
       $this->permissions = Permission::retrieve(Permission::table()->select()->aw_string_in('name', $permission_unique_keys));
-    }
-    elseif(property_exists($this, 'permission_ids'))
+    } elseif(property_exists($this, 'permission_ids'))
     {
       $permission_unique_keys = explode(',', $this->permission_ids);
       $this->permissions = Permission::retrieve(Permission::table()->select()->aw_numeric_in('id', $permission_unique_keys));
-    }
-    else
+    } else
     {
       $this->permissions = ACL::permissions_for($this);
     }
@@ -56,39 +53,36 @@ 
   public function has_permission($p) : bool
   {
     // new instances or inactive operators, none shall pass
-    if($this->is_new() === true || $this->is_active()  === false)
-      return false;
+    if($this->is_new() === true || $this->is_active()  === false) {
+          return false;
+    }
 
     $permission_name = $permission_id = null;
     if(is_subclass_of($p, '\HexMakina\kadro\Auth\Permission'))
     {
       $permission_name = $p->get('name');
       $permission_id = $p->get_id();
+    } elseif(preg_match('/[0-9]+/', $p)) {
+          $permission_id = $p;
+    } else {
+          $permission_name = $p;
     }
-    elseif(preg_match('/[0-9]+/', $p))
-      $permission_id = $p;
-    else
-      $permission_name = $p;
 
     if(!is_null($this->get('permission_names')) && !is_null($permission_name))
     {
       return strpos($this->get('permission_names'), $permission_name) !== false;
-    }
-    elseif(!is_null($this->get('permission_ids')) && !is_null($permission_id))
+    } elseif(!is_null($this->get('permission_ids')) && !is_null($permission_id))
     {
       return strpos($this->get('permission_ids'), $permission_id) !== false;
-    }
-    elseif(!is_null($permission_name))
+    } elseif(!is_null($permission_name))
     {
       if(method_exists($this, $permission_name) && $this->$permission_name() == true)
       {
         return true;
-      }
-      elseif(property_exists($this, $permission_name) && $this->$permission_name == true)
+      } elseif(property_exists($this, $permission_name) && $this->$permission_name == true)
       {
         return true;
-      }
-      elseif(ACL::match($this, $permission_name) === true)
+      } elseif(ACL::match($this, $permission_name) === true)
       {
         return true;
       }

Auth/Operatorability.class.php

Braces +15 added lines, -9 removed lines

@@ -17,8 +17,10 @@ 
 
   public function load_operator($id = null)
   {
-    if(!is_null($operator_id = $id ?? $this->get('operator_id'))) // extraction failed but we have an fk
+    if(!is_null($operator_id = $id ?? $this->get('operator_id'))) {
+      // extraction failed but we have an fk
       $this->operator = Operator::exists($operator_id);
+    }
   }
 
   public function operator() : ?OperatorInterface
@@ -28,9 +30,10 @@ 
       $extract_attempt = $this->extract(new Operator(), true);
       if(!is_null($extract_attempt))
       {
-        foreach(['permission_names', 'permission_ids'] as $permission_marker)
-          if(property_exists($this, $permission_marker))
+        foreach(['permission_names', 'permission_ids'] as $permission_marker) {
+                  if(property_exists($this, $permission_marker))
             $extract_attempt->set($permission_marker, $this->$permission_marker);
+        }
 
         $this->operator = $extract_attempt;
       }
@@ -55,14 +58,17 @@ 
 
     $Query->select_also(['operator.name as operator_name', 'operator.active as operator_active']);
 
-    if(isset($filters['username']))
-      $Query->aw_eq('username', $filters['username'], 'operator');
+    if(isset($filters['username'])) {
+          $Query->aw_eq('username', $filters['username'], 'operator');
+    }
 
-    if(isset($filters['email']))
-      $Query->aw_eq('email', $filters['email'], 'operator');
+    if(isset($filters['email'])) {
+          $Query->aw_eq('email', $filters['email'], 'operator');
+    }
 
-    if(isset($filters['active']))
-      $Query->aw_eq('active', $filters['active'], 'operator');
+    if(isset($filters['active'])) {
+          $Query->aw_eq('active', $filters['active'], 'operator');
+    }
 
     return $Query;
   }

Spacing +11 added lines, -11 removed lines

@@ -17,19 +17,19 @@ 
 
   public function load_operator($id = null)
   {
-    if(!is_null($operator_id = $id ?? $this->get('operator_id'))) // extraction failed but we have an fk
+    if (!is_null($operator_id = $id ?? $this->get('operator_id'))) // extraction failed but we have an fk
       $this->operator = Operator::exists($operator_id);
   }
 
   public function operator() : ?OperatorInterface
   {
-    if(is_null($this->operator))
+    if (is_null($this->operator))
     {
       $extract_attempt = $this->extract(new Operator(), true);
-      if(!is_null($extract_attempt))
+      if (!is_null($extract_attempt))
       {
-        foreach(['permission_names', 'permission_ids'] as $permission_marker)
-          if(property_exists($this, $permission_marker))
+        foreach (['permission_names', 'permission_ids'] as $permission_marker)
+          if (property_exists($this, $permission_marker))
             $extract_attempt->set($permission_marker, $this->$permission_marker);
 
         $this->operator = $extract_attempt;
@@ -45,23 +45,23 @@ 
 
   public static function enhance_query_retrieve($Query, $filters, $options)
   {
-    $joined_alias = $Query->auto_join([ACL::table(),'ACL'], null, 'LEFT OUTER');
+    $joined_alias = $Query->auto_join([ACL::table(), 'ACL'], null, 'LEFT OUTER');
     $joined_alias = $Query->auto_join([Permission::table(), 'permission'], null, 'LEFT OUTER');
 
     $permission_ids_and_names = [];
-    $permission_ids_and_names []= sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'id', $joined_alias.'_ids');
-    $permission_ids_and_names []= sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'name', $joined_alias.'_names');
+    $permission_ids_and_names [] = sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'id', $joined_alias.'_ids');
+    $permission_ids_and_names [] = sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'name', $joined_alias.'_names');
     $Query->select_also($permission_ids_and_names);
 
     $Query->select_also(['operator.name as operator_name', 'operator.active as operator_active']);
 
-    if(isset($filters['username']))
+    if (isset($filters['username']))
       $Query->aw_eq('username', $filters['username'], 'operator');
 
-    if(isset($filters['email']))
+    if (isset($filters['email']))
       $Query->aw_eq('email', $filters['email'], 'operator');
 
-    if(isset($filters['active']))
+    if (isset($filters['active']))
       $Query->aw_eq('active', $filters['active'], 'operator');
 
     return $Query;

PSR4Autoloader.class.php

Indentation +45 added lines, -45 removed lines

@@ -7,18 +7,18 @@ 
 {
   
   /**
-  * An associative array where the key is a namespace prefix and the value
-  * is an array of base directories for classes in that namespace.
-  *
-  * @var array
-  */
+   * An associative array where the key is a namespace prefix and the value
+   * is an array of base directories for classes in that namespace.
+   *
+   * @var array
+   */
   protected $prefixes = [];
 
   /**
-  * Register loader with SPL autoloader stack.
-  *
-  * @return void
-  */
+   * Register loader with SPL autoloader stack.
+   *
+   * @return void
+   */
 
   public function register()
   {
@@ -26,28 +26,28 @@ 
   }
 
   /**
-  * Adds a base directory for a namespace prefix.
-  *
-  * @param string $prefix The namespace prefix.
-  * @param string $base_dir A base directory for class files in the
-  * namespace.
-  * @param bool $prepend If true, prepend the base directory to the stack
-  * instead of appending it; this causes it to be searched first rather
-  * than last.
-  * @return void
-  */
+   * Adds a base directory for a namespace prefix.
+   *
+   * @param string $prefix The namespace prefix.
+   * @param string $base_dir A base directory for class files in the
+   * namespace.
+   * @param bool $prepend If true, prepend the base directory to the stack
+   * instead of appending it; this causes it to be searched first rather
+   * than last.
+   * @return void
+   */
   public function addNamespaceTree($base_dir, $prepend = false)
   {
-  	$dir_content = FileSystem::preg_scandir($base_dir, '/^[A-Z]{1}[A-Za-z]+(?!\.class.\.php)$/');
+    $dir_content = FileSystem::preg_scandir($base_dir, '/^[A-Z]{1}[A-Za-z]+(?!\.class.\.php)$/');
     
-  	foreach($dir_content as $res)
-  	{
-  		if(is_dir($fullpath = $base_dir.'/'.$res))
-  		{
-  			$this->addNamespace('HexMakina\kadro\\'.$res, $fullpath);
+    foreach($dir_content as $res)
+    {
+      if(is_dir($fullpath = $base_dir.'/'.$res))
+      {
+        $this->addNamespace('HexMakina\kadro\\'.$res, $fullpath);
         $this->addNamespaceTree($fullpath);
-  		}
-  	}
+      }
+    }
   }
   
   public function addNamespace($prefix, $base_dir, $prepend = false)
@@ -73,12 +73,12 @@ 
   }
 
   /**
-  * Loads the class file for a given class name.
-  *
-  * @param string $class The fully-qualified class name.
-  * @return mixed The mapped file name on success, or boolean false on
-  * failure.
-  */
+   * Loads the class file for a given class name.
+   *
+   * @param string $class The fully-qualified class name.
+   * @return mixed The mapped file name on success, or boolean false on
+   * failure.
+   */
   public function loadClass($class)
   {
     // var_dump(__FUNCTION__."($class)");
@@ -110,13 +110,13 @@ 
   }
 
   /**
-  * Load the mapped file for a namespace prefix and relative class.
-  *
-  * @param string $prefix The namespace prefix.
-  * @param string $relative_class The relative class name.
-  * @return mixed Boolean false if no mapped file can be loaded, or the
-  * name of the mapped file that was loaded.
-  */
+   * Load the mapped file for a namespace prefix and relative class.
+   *
+   * @param string $prefix The namespace prefix.
+   * @param string $relative_class The relative class name.
+   * @return mixed Boolean false if no mapped file can be loaded, or the
+   * name of the mapped file that was loaded.
+   */
   protected function loadMappedFile($prefix, $relative_class)
   {
     // are there any base directories for this namespace prefix?
@@ -147,11 +147,11 @@ 
   }
 
   /**
-  * If a file exists, require it from the file system.
-  *
-  * @param string $file The file to require.
-  * @return bool True if the file exists, false if not.
-  */
+   * If a file exists, require it from the file system.
+   *
+   * @param string $file The file to require.
+   * @return bool True if the file exists, false if not.
+   */
   protected function requireFile($file)
   {
     // var_dump(__FUNCTION__."($file)");

Spacing +6 added lines, -6 removed lines

@@ -40,9 +40,9 @@ 
   {
   	$dir_content = FileSystem::preg_scandir($base_dir, '/^[A-Z]{1}[A-Za-z]+(?!\.class.\.php)$/');
     
-  	foreach($dir_content as $res)
+  	foreach ($dir_content as $res)
   	{
-  		if(is_dir($fullpath = $base_dir.'/'.$res))
+  		if (is_dir($fullpath = $base_dir.'/'.$res))
   		{
   			$this->addNamespace('HexMakina\kadro\\'.$res, $fullpath);
         $this->addNamespaceTree($fullpath);
@@ -54,10 +54,10 @@ 
   {
     
     // normalize namespace prefix
-    $prefix = trim($prefix, '\\') . '\\';
+    $prefix = trim($prefix, '\\').'\\';
 
     // normalize the base directory with a trailing separator
-    $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . '/';
+    $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR).'/';
 
     // initialize the namespace prefix array
     if (isset($this->prefixes[$prefix]) === false) {
@@ -90,10 +90,10 @@ 
     while (false !== $pos = strrpos($prefix, '\\')) 
     {
       // retain the trailing namespace separator in the prefix
-      $prefix = substr($class, 0, $pos + 1);
+      $prefix = substr($class, 0, $pos+1);
       // var_dump("prefix: $prefix");
       // the rest is the relative class name
-      $relative_class = substr($class, $pos + 1);
+      $relative_class = substr($class, $pos+1);
       // try to load a mapped file for the prefix and relative class
       
       $mapped_file = $this->loadMappedFile($prefix, $relative_class);

Router/hopper.class.php

Indentation +2 added lines, -2 removed lines

@@ -192,8 +192,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

@@ -10,14 +10,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();
@@ -44,12 +44,12 @@ 
   {
     $this->match = parent::match($requestUrl, $requestMethod);
 
-    if($this->match === false)
+    if ($this->match === false)
       throw new RouterException('ROUTE_MATCH_FALSE');
 
     $res = explode('::', self::target());
 
-    if($res === false || !isset($res[1]) || isset($ret[2]))
+    if ($res === false || !isset($res[1]) || isset($ret[2]))
       throw new RouterException('INVALID_TARGET');
 
     // if($this->match['name'] === 'akadok_controller_method')
@@ -60,11 +60,11 @@ 
     $target_method = $res[1];
     $found = false;
 
-    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;
@@ -73,29 +73,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]
@@ -142,18 +142,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'];
   }
@@ -165,13 +165,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;
@@ -182,7 +182,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();
@@ -200,7 +200,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;
@@ -208,7 +208,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);
@@ -216,7 +216,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);
 
@@ -229,7 +229,7 @@ 
     header('Pragma: public');
 
     //Define file size
-    header('Content-Length: ' . filesize($file_path));
+    header('Content-Length: '.filesize($file_path));
 
     ob_clean();
     flush();
@@ -255,7 +255,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

@@ -17,8 +17,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();
 
@@ -44,13 +45,15 @@ 
   {
     $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('::', self::target());
 
-    if($res === false || !isset($res[1]) || isset($ret[2]))
-      throw new RouterException('INVALID_TARGET');
+    if($res === false || !isset($res[1]) || isset($ret[2])) {
+          throw new RouterException('INVALID_TARGET');
+    }
 
     // if($this->match['name'] === 'akadok_controller_method')
     //   $res = [ucfirst(self::params('controller')).'Controller', ucfirst(self::params('method'))];
@@ -60,12 +63,14 @@ 
     $target_method = $res[1];
     $found = false;
 
-    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;
@@ -87,16 +92,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];
@@ -146,7 +154,7 @@ 
   {
     try{
       $url = $this->generate($route, $route_params);
-    }catch(\Exception $e){
+    } catch(\Exception $e){
       $url = $this->prehop(self::ROUTE_HOME_NAME);
     }
 
@@ -169,12 +177,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);
   }
@@ -182,8 +191,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();
   }
@@ -200,16 +210,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);
 

Router/AltoRouter.php

Indentation +261 added lines, -261 removed lines

@@ -2,266 +2,266 @@
 
 class AltoRouter {
 
-	/**
-	 * @var array Array of all routes (incl. named routes).
-	 */
-	protected $routes = [];
-
-	/**
-	 * @var array Array of all named routes.
-	 */
-	protected $namedRoutes = [];
-
-	/**
-	 * @var string Can be used to ignore leading part of the Request URL (if main file lives in subdirectory of host)
-	 */
-	protected $basePath = '';
-
-	/**
-	 * @var array Array of default match types (regex helpers)
-	 */
-	protected $matchTypes = array(
-		'i'  => '[0-9]++',
-		'a'  => '[0-9A-Za-z]++',
-		'h'  => '[0-9A-Fa-f]++',
-		'*'  => '.+?',
-		'**' => '.++',
-		''   => '[^/\.]++'
-	);
-
-	/**
-	  * Create router in one call from config.
-	  *
-	  * @param array $routes
-	  * @param string $basePath
-	  * @param array $matchTypes
-	  */
-	public function __construct( $routes = array(), $basePath = '', $matchTypes = array() ) {
-		$this->addRoutes($routes);
-		$this->setBasePath($basePath);
-		$this->addMatchTypes($matchTypes);
-	}
-
-	/**
-	 * Retrieves all routes.
-	 * Useful if you want to process or display routes.
-	 * @return array All routes.
-	 */
-	public function getRoutes() {
-		return $this->routes;
-	}
-
-	/**
-	 * Add multiple routes at once from array in the following format:
-	 *
-	 *   $routes = array(
-	 *      array($method, $route, $target, $name)
-	 *   );
-	 *
-	 * @param array $routes
-	 * @return void
-	 * @author Koen Punt
-	 * @throws Exception
-	 */
-	public function addRoutes($routes){
-		if(!is_array($routes) && !$routes instanceof Traversable) {
-			throw new \Exception('Routes should be an array or an instance of Traversable');
-		}
-		foreach($routes as $route) {
-			call_user_func_array(array($this, 'map'), $route);
-		}
-	}
-
-	/**
-	 * Set the base path.
-	 * Useful if you are running your application from a subdirectory.
-	 */
-	public function setBasePath($basePath) {
-		$this->basePath = $basePath;
-	}
-
-	/**
-	 * Add named match types. It uses array_merge so keys can be overwritten.
-	 *
-	 * @param array $matchTypes The key is the name and the value is the regex.
-	 */
-	public function addMatchTypes($matchTypes) {
-		$this->matchTypes = array_merge($this->matchTypes, $matchTypes);
-	}
-
-	/**
-	 * Map a route to a target
-	 *
-	 * @param string $method One of 5 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PATCH|PUT|DELETE)
-	 * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id]
-	 * @param mixed $target The target where this route should point to. Can be anything.
-	 * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application.
-	 * @throws Exception
-	 */
-	public function map($method, $route, $target, $name = null) {
-
-		$this->routes[] = array($method, $route, $target, $name);
-
-		if($name) {
-			if(isset($this->namedRoutes[$name])) {
-				throw new \Exception("Can not redeclare route '{$name}'");
-			} else {
-				$this->namedRoutes[$name] = $route;
-			}
-
-		}
-
-		return;
-	}
-
-	/**
-	 * Reversed routing
-	 *
-	 * Generate the URL for a named route. Replace regexes with supplied parameters
-	 *
-	 * @param string $routeName The name of the route.
-	 * @param array @params Associative array of parameters to replace placeholders with.
-	 * @return string The URL of the route with named parameters in place.
-	 * @throws Exception
-	 */
-	public function generate($routeName, array $params = array()) {
-
-		// Check if named route exists
-		if(!isset($this->namedRoutes[$routeName])) {
-			throw new \Exception("Route '{$routeName}' does not exist.");
-		}
-
-		// Replace named parameters
-		$route = $this->namedRoutes[$routeName];
-
-		// prepend base path to route url again
-		$url = $this->basePath . $route;
-
-		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
-
-			foreach($matches as $match) {
-				list($block, $pre, $type, $param, $optional) = $match;
-
-				if ($pre) {
-					$block = substr($block, 1);
-				}
-
-				if(isset($params[$param])) {
-					$url = str_replace($block, $params[$param], $url);
-				} elseif ($optional) {
-					$url = str_replace($pre . $block, '', $url);
-				}
-			}
-
-
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Match a given Request Url against stored routes
-	 * @param string $requestUrl
-	 * @param string $requestMethod
-	 * @return array|boolean Array with route information on success, false on failure (no match).
-	 */
-	public function match($requestUrl = null, $requestMethod = null) {
-
-		$params = [];
-		$match = false;
-
-		// set Request Url if it isn't passed as parameter
-		if($requestUrl === null) {
-			$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
-		}
-
-		// strip base path from request url
-		$requestUrl = substr($requestUrl, strlen($this->basePath));
+  /**
+   * @var array Array of all routes (incl. named routes).
+   */
+  protected $routes = [];
+
+  /**
+   * @var array Array of all named routes.
+   */
+  protected $namedRoutes = [];
+
+  /**
+   * @var string Can be used to ignore leading part of the Request URL (if main file lives in subdirectory of host)
+   */
+  protected $basePath = '';
+
+  /**
+   * @var array Array of default match types (regex helpers)
+   */
+  protected $matchTypes = array(
+    'i'  => '[0-9]++',
+    'a'  => '[0-9A-Za-z]++',
+    'h'  => '[0-9A-Fa-f]++',
+    '*'  => '.+?',
+    '**' => '.++',
+    ''   => '[^/\.]++'
+  );
+
+  /**
+   * Create router in one call from config.
+   *
+   * @param array $routes
+   * @param string $basePath
+   * @param array $matchTypes
+   */
+  public function __construct( $routes = array(), $basePath = '', $matchTypes = array() ) {
+    $this->addRoutes($routes);
+    $this->setBasePath($basePath);
+    $this->addMatchTypes($matchTypes);
+  }
+
+  /**
+   * Retrieves all routes.
+   * Useful if you want to process or display routes.
+   * @return array All routes.
+   */
+  public function getRoutes() {
+    return $this->routes;
+  }
+
+  /**
+   * Add multiple routes at once from array in the following format:
+   *
+   *   $routes = array(
+   *      array($method, $route, $target, $name)
+   *   );
+   *
+   * @param array $routes
+   * @return void
+   * @author Koen Punt
+   * @throws Exception
+   */
+  public function addRoutes($routes){
+    if(!is_array($routes) && !$routes instanceof Traversable) {
+      throw new \Exception('Routes should be an array or an instance of Traversable');
+    }
+    foreach($routes as $route) {
+      call_user_func_array(array($this, 'map'), $route);
+    }
+  }
+
+  /**
+   * Set the base path.
+   * Useful if you are running your application from a subdirectory.
+   */
+  public function setBasePath($basePath) {
+    $this->basePath = $basePath;
+  }
+
+  /**
+   * Add named match types. It uses array_merge so keys can be overwritten.
+   *
+   * @param array $matchTypes The key is the name and the value is the regex.
+   */
+  public function addMatchTypes($matchTypes) {
+    $this->matchTypes = array_merge($this->matchTypes, $matchTypes);
+  }
+
+  /**
+   * Map a route to a target
+   *
+   * @param string $method One of 5 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PATCH|PUT|DELETE)
+   * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id]
+   * @param mixed $target The target where this route should point to. Can be anything.
+   * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application.
+   * @throws Exception
+   */
+  public function map($method, $route, $target, $name = null) {
+
+    $this->routes[] = array($method, $route, $target, $name);
+
+    if($name) {
+      if(isset($this->namedRoutes[$name])) {
+        throw new \Exception("Can not redeclare route '{$name}'");
+      } else {
+        $this->namedRoutes[$name] = $route;
+      }
+
+    }
+
+    return;
+  }
+
+  /**
+   * Reversed routing
+   *
+   * Generate the URL for a named route. Replace regexes with supplied parameters
+   *
+   * @param string $routeName The name of the route.
+   * @param array @params Associative array of parameters to replace placeholders with.
+   * @return string The URL of the route with named parameters in place.
+   * @throws Exception
+   */
+  public function generate($routeName, array $params = array()) {
+
+    // Check if named route exists
+    if(!isset($this->namedRoutes[$routeName])) {
+      throw new \Exception("Route '{$routeName}' does not exist.");
+    }
+
+    // Replace named parameters
+    $route = $this->namedRoutes[$routeName];
+
+    // prepend base path to route url again
+    $url = $this->basePath . $route;
+
+    if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+
+      foreach($matches as $match) {
+        list($block, $pre, $type, $param, $optional) = $match;
+
+        if ($pre) {
+          $block = substr($block, 1);
+        }
+
+        if(isset($params[$param])) {
+          $url = str_replace($block, $params[$param], $url);
+        } elseif ($optional) {
+          $url = str_replace($pre . $block, '', $url);
+        }
+      }
+
+
+    }
+
+    return $url;
+  }
+
+  /**
+   * Match a given Request Url against stored routes
+   * @param string $requestUrl
+   * @param string $requestMethod
+   * @return array|boolean Array with route information on success, false on failure (no match).
+   */
+  public function match($requestUrl = null, $requestMethod = null) {
+
+    $params = [];
+    $match = false;
+
+    // set Request Url if it isn't passed as parameter
+    if($requestUrl === null) {
+      $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
+    }
+
+    // strip base path from request url
+    $requestUrl = substr($requestUrl, strlen($this->basePath));
     
-		// Strip query string (?a=b) from Request Url
-		if (($strpos = strpos($requestUrl, '?')) !== false) {
-			$requestUrl = substr($requestUrl, 0, $strpos);
-		}
-
-		// set Request Method if it isn't passed as a parameter
-		if($requestMethod === null) {
-			$requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
-		}
-
-		foreach($this->routes as $handler) {
-			list($methods, $route, $target, $name) = $handler;
-			$method_match = (stripos($methods, $requestMethod) !== false);
-
-			// Method did not match, continue to next route.
-			if (!$method_match) continue;
-
-			if ($route === '*') {
-				// * wildcard (matches all)
-				$match = true;
-			} elseif (isset($route[0]) && $route[0] === '@') {
-				// @ regex delimiter
-				$pattern = '`' . substr($route, 1) . '`u';
-				$match = preg_match($pattern, $requestUrl, $params) === 1;
-			} elseif (($position = strpos($route, '[')) === false) {
-				// No params in url, do string comparison
-				$match = strcmp($requestUrl, $route) === 0;
-			} else {
-				// Compare longest non-param string with url
-				if (strncmp($requestUrl, $route, $position) !== 0) {
-					continue;
-				}
-				$regex = $this->compileRoute($route);
-				$match = preg_match($regex, $requestUrl, $params) === 1;
-			}
-
-			if ($match) {
-
-				if ($params) {
-					foreach($params as $key => $value) {
-						if(is_numeric($key)) unset($params[$key]);
-					}
-				}
-
-				return array(
-					'target' => $target,
-					'params' => $params,
-					'name' => $name
-				);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Compile the regex for a given route (EXPENSIVE)
-	 */
-	private function compileRoute($route) {
-		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
-
-			$matchTypes = $this->matchTypes;
-			foreach($matches as $match) {
-				list($block, $pre, $type, $param, $optional) = $match;
-
-				if (isset($matchTypes[$type])) {
-					$type = $matchTypes[$type];
-				}
-				if ($pre === '.') {
-					$pre = '\.';
-				}
-
-				//Older versions of PCRE require the 'P' in (?P<named>)
-				$pattern = '(?:'
-						. ($pre !== '' ? $pre : null)
-						. '('
-						. ($param !== '' ? "?P<$param>" : null)
-						. $type
-						. '))'
-						. ($optional !== '' ? '?' : null);
-
-				$route = str_replace($block, $pattern, $route);
-			}
-
-		}
-		return "`^$route$`u";
-	}
+    // Strip query string (?a=b) from Request Url
+    if (($strpos = strpos($requestUrl, '?')) !== false) {
+      $requestUrl = substr($requestUrl, 0, $strpos);
+    }
+
+    // set Request Method if it isn't passed as a parameter
+    if($requestMethod === null) {
+      $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
+    }
+
+    foreach($this->routes as $handler) {
+      list($methods, $route, $target, $name) = $handler;
+      $method_match = (stripos($methods, $requestMethod) !== false);
+
+      // Method did not match, continue to next route.
+      if (!$method_match) continue;
+
+      if ($route === '*') {
+        // * wildcard (matches all)
+        $match = true;
+      } elseif (isset($route[0]) && $route[0] === '@') {
+        // @ regex delimiter
+        $pattern = '`' . substr($route, 1) . '`u';
+        $match = preg_match($pattern, $requestUrl, $params) === 1;
+      } elseif (($position = strpos($route, '[')) === false) {
+        // No params in url, do string comparison
+        $match = strcmp($requestUrl, $route) === 0;
+      } else {
+        // Compare longest non-param string with url
+        if (strncmp($requestUrl, $route, $position) !== 0) {
+          continue;
+        }
+        $regex = $this->compileRoute($route);
+        $match = preg_match($regex, $requestUrl, $params) === 1;
+      }
+
+      if ($match) {
+
+        if ($params) {
+          foreach($params as $key => $value) {
+            if(is_numeric($key)) unset($params[$key]);
+          }
+        }
+
+        return array(
+          'target' => $target,
+          'params' => $params,
+          'name' => $name
+        );
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Compile the regex for a given route (EXPENSIVE)
+   */
+  private function compileRoute($route) {
+    if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+
+      $matchTypes = $this->matchTypes;
+      foreach($matches as $match) {
+        list($block, $pre, $type, $param, $optional) = $match;
+
+        if (isset($matchTypes[$type])) {
+          $type = $matchTypes[$type];
+        }
+        if ($pre === '.') {
+          $pre = '\.';
+        }
+
+        //Older versions of PCRE require the 'P' in (?P<named>)
+        $pattern = '(?:'
+            . ($pre !== '' ? $pre : null)
+            . '('
+            . ($param !== '' ? "?P<$param>" : null)
+            . $type
+            . '))'
+            . ($optional !== '' ? '?' : null);
+
+        $route = str_replace($block, $pattern, $route);
+      }
+
+    }
+    return "`^$route$`u";
+  }
 }

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
 	  * @param string $basePath
 	  * @param array $matchTypes
 	  */
-	public function __construct( $routes = array(), $basePath = '', $matchTypes = array() ) {
+	public function __construct($routes = array(), $basePath = '', $matchTypes = array()) {
 		$this->addRoutes($routes);
 		$this->setBasePath($basePath);
 		$this->addMatchTypes($matchTypes);
@@ -63,11 +63,11 @@ 
 	 * @author Koen Punt
 	 * @throws Exception
 	 */
-	public function addRoutes($routes){
-		if(!is_array($routes) && !$routes instanceof Traversable) {
+	public function addRoutes($routes) {
+		if (!is_array($routes) && !$routes instanceof Traversable) {
 			throw new \Exception('Routes should be an array or an instance of Traversable');
 		}
-		foreach($routes as $route) {
+		foreach ($routes as $route) {
 			call_user_func_array(array($this, 'map'), $route);
 		}
 	}
@@ -102,8 +102,8 @@ 
 
 		$this->routes[] = array($method, $route, $target, $name);
 
-		if($name) {
-			if(isset($this->namedRoutes[$name])) {
+		if ($name) {
+			if (isset($this->namedRoutes[$name])) {
 				throw new \Exception("Can not redeclare route '{$name}'");
 			} else {
 				$this->namedRoutes[$name] = $route;
@@ -127,7 +127,7 @@ 
 	public function generate($routeName, array $params = array()) {
 
 		// Check if named route exists
-		if(!isset($this->namedRoutes[$routeName])) {
+		if (!isset($this->namedRoutes[$routeName])) {
 			throw new \Exception("Route '{$routeName}' does not exist.");
 		}
 
@@ -135,21 +135,21 @@ 
 		$route = $this->namedRoutes[$routeName];
 
 		// prepend base path to route url again
-		$url = $this->basePath . $route;
+		$url = $this->basePath.$route;
 
 		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
 
-			foreach($matches as $match) {
+			foreach ($matches as $match) {
 				list($block, $pre, $type, $param, $optional) = $match;
 
 				if ($pre) {
 					$block = substr($block, 1);
 				}
 
-				if(isset($params[$param])) {
+				if (isset($params[$param])) {
 					$url = str_replace($block, $params[$param], $url);
 				} elseif ($optional) {
-					$url = str_replace($pre . $block, '', $url);
+					$url = str_replace($pre.$block, '', $url);
 				}
 			}
 
@@ -171,7 +171,7 @@ 
 		$match = false;
 
 		// set Request Url if it isn't passed as parameter
-		if($requestUrl === null) {
+		if ($requestUrl === null) {
 			$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
 		}
 
@@ -184,11 +184,11 @@ 
 		}
 
 		// set Request Method if it isn't passed as a parameter
-		if($requestMethod === null) {
+		if ($requestMethod === null) {
 			$requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
 		}
 
-		foreach($this->routes as $handler) {
+		foreach ($this->routes as $handler) {
 			list($methods, $route, $target, $name) = $handler;
 			$method_match = (stripos($methods, $requestMethod) !== false);
 
@@ -200,7 +200,7 @@ 
 				$match = true;
 			} elseif (isset($route[0]) && $route[0] === '@') {
 				// @ regex delimiter
-				$pattern = '`' . substr($route, 1) . '`u';
+				$pattern = '`'.substr($route, 1).'`u';
 				$match = preg_match($pattern, $requestUrl, $params) === 1;
 			} elseif (($position = strpos($route, '[')) === false) {
 				// No params in url, do string comparison
@@ -217,8 +217,8 @@ 
 			if ($match) {
 
 				if ($params) {
-					foreach($params as $key => $value) {
-						if(is_numeric($key)) unset($params[$key]);
+					foreach ($params as $key => $value) {
+						if (is_numeric($key)) unset($params[$key]);
 					}
 				}
 
@@ -239,7 +239,7 @@ 
 		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
 
 			$matchTypes = $this->matchTypes;
-			foreach($matches as $match) {
+			foreach ($matches as $match) {
 				list($block, $pre, $type, $param, $optional) = $match;
 
 				if (isset($matchTypes[$type])) {

Braces +6 added lines, -2 removed lines

@@ -193,7 +193,9 @@ 
 			$method_match = (stripos($methods, $requestMethod) !== false);
 
 			// Method did not match, continue to next route.
-			if (!$method_match) continue;
+			if (!$method_match) {
+			  continue;
+			}
 
 			if ($route === '*') {
 				// * wildcard (matches all)
@@ -218,7 +220,9 @@ 
 
 				if ($params) {
 					foreach($params as $key => $value) {
-						if(is_numeric($key)) unset($params[$key]);
+						if(is_numeric($key)) {
+						  unset($params[$key]);
+						}
 					}
 				}
 

Controllers/Paginator.class.php

Indentation +7 added lines, -7 removed lines

@@ -7,8 +7,8 @@ 
 {
   protected static function prepare_pagination($records_total)
   {
-  	global $settings;
-  	global $smarty;
+    global $settings;
+    global $smarty;
 
     $pages_max_on_each_side = 3;
     $pages_max_displayed = $pages_max_on_each_side*2+1;
@@ -35,12 +35,12 @@ 
     if($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
       $pages_last = $pages_total;
 
-  	$this->viewport("pages_total",     $pages_total);
-  	$this->viewport("pages_first",     $pages_first);
+    $this->viewport("pages_total",     $pages_total);
+    $this->viewport("pages_first",     $pages_first);
     $this->viewport("pages_previous",  $pages_current <= 1 ? $pages_total : $pages_current - 1);
-  	$this->viewport("pages_current",   $pages_current);
-  	$this->viewport("pages_next",      $pages_current >= $pages_total ? 1 : $pages_current + 1);
-  	$this->viewport("pages_last",      $pages_last);
+    $this->viewport("pages_current",   $pages_current);
+    $this->viewport("pages_next",      $pages_current >= $pages_total ? 1 : $pages_current + 1);
+    $this->viewport("pages_last",      $pages_last);
   }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -11,36 +11,36 @@
   	global $smarty;
 
     $pages_max_on_each_side = 3;
-    $pages_max_displayed = $pages_max_on_each_side*2+1;
+    $pages_max_displayed = $pages_max_on_each_side * 2+1;
 
     // are we paginating ?
 
-    if(is_null($this->box('StateAgent')->filters('results_per_page')))
+    if (is_null($this->box('StateAgent')->filters('results_per_page')))
       return;
 
     $pages_range    = intval($this->box('StateAgent')->filters('results_per_page'));
     $pages_total    = $pages_range > 0 ? intval(ceil($records_total / $pages_range)) : 1;
     $pages_current  = intval($this->box('StateAgent')->filters('page'));
 
-    if($pages_current >= $pages_total)
+    if ($pages_current >= $pages_total)
       $pages_current = $pages_total;
 
-    $pages_first = ($pages_current <= $pages_max_on_each_side)? 1 : $pages_current - $pages_max_on_each_side;
+    $pages_first = ($pages_current <= $pages_max_on_each_side) ? 1 : $pages_current-$pages_max_on_each_side;
 
-    $pages_last = $pages_current + $pages_max_on_each_side;
+    $pages_last = $pages_current+$pages_max_on_each_side;
 
-    if($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed
+    if ($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed
       $pages_last += $pages_max_displayed-$pages_last;
 
-    if($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
+    if ($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
       $pages_last = $pages_total;
 
-  	$this->viewport("pages_total",     $pages_total);
-  	$this->viewport("pages_first",     $pages_first);
-    $this->viewport("pages_previous",  $pages_current <= 1 ? $pages_total : $pages_current - 1);
-  	$this->viewport("pages_current",   $pages_current);
-  	$this->viewport("pages_next",      $pages_current >= $pages_total ? 1 : $pages_current + 1);
-  	$this->viewport("pages_last",      $pages_last);
+  	$this->viewport("pages_total", $pages_total);
+  	$this->viewport("pages_first", $pages_first);
+    $this->viewport("pages_previous", $pages_current <= 1 ? $pages_total : $pages_current-1);
+  	$this->viewport("pages_current", $pages_current);
+  	$this->viewport("pages_next", $pages_current >= $pages_total ? 1 : $pages_current+1);
+  	$this->viewport("pages_last", $pages_last);
   }
 
 }

Braces +12 added lines, -6 removed lines

@@ -15,25 +15,31 @@
 
     // are we paginating ?
 
-    if(is_null($this->box('StateAgent')->filters('results_per_page')))
-      return;
+    if(is_null($this->box('StateAgent')->filters('results_per_page'))) {
+          return;
+    }
 
     $pages_range    = intval($this->box('StateAgent')->filters('results_per_page'));
     $pages_total    = $pages_range > 0 ? intval(ceil($records_total / $pages_range)) : 1;
     $pages_current  = intval($this->box('StateAgent')->filters('page'));
 
-    if($pages_current >= $pages_total)
-      $pages_current = $pages_total;
+    if($pages_current >= $pages_total) {
+          $pages_current = $pages_total;
+    }
 
     $pages_first = ($pages_current <= $pages_max_on_each_side)? 1 : $pages_current - $pages_max_on_each_side;
 
     $pages_last = $pages_current + $pages_max_on_each_side;
 
-    if($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed
+    if($pages_last < $pages_max_displayed) {
+      // add the missing pages to fullfill $pages_max_displayed
       $pages_last += $pages_max_displayed-$pages_last;
+    }
 
-    if($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
+    if($pages_last > $pages_total) {
+      // $pages_max_displayed greater than the total of pages
       $pages_last = $pages_total;
+    }
 
   	$this->viewport("pages_total",     $pages_total);
   	$this->viewport("pages_first",     $pages_first);

Controllers/KadroController.class.php

Indentation +13 added lines, -13 removed lines

@@ -107,18 +107,18 @@ 
     $custom_template = null;
 
     if(method_exists($this, 'prepare'))
-    	$this->prepare();
+      $this->prepare();
 
-  	if(method_exists($this, $method = $this->router()->target_method()))
+    if(method_exists($this, $method = $this->router()->target_method()))
     {
       $custom_template = $this->$method();
     }
 
     if(method_exists($this, 'conclude'))
-    	$this->conclude();
+      $this->conclude();
 
     if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+      $template = $this->display($custom_template);
   }
 
   public function conclude(){}
@@ -143,16 +143,16 @@ 
 
     $template = $this->find_template($smarty, $custom_template); // throws Exception if nothing found
 
-		$this->viewport('controller', $this);
+    $this->viewport('controller', $this);
 
     $this->viewport('user_messages', $this->logger()->get_user_report());
 
 
-  	$this->viewport('file_root', $this->router()->file_root());
-  	$this->viewport('view_path', $this->router()->file_root() . $this->box('settings.smarty.template_path').'app/');
-  	$this->viewport('web_root', $this->router()->web_root());
-  	$this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
-  	$this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
+    $this->viewport('file_root', $this->router()->file_root());
+    $this->viewport('view_path', $this->router()->file_root() . $this->box('settings.smarty.template_path').'app/');
+    $this->viewport('web_root', $this->router()->web_root());
+    $this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
+    $this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
 
     foreach($this->viewport() as $template_var_name => $value)
       $smarty->assign($template_var_name, $value);
@@ -227,12 +227,12 @@ 
    *
    */
   public function route_back($route_name=null, $route_params=[]) : string
-	{
+  {
     if(is_null($route_name))
-		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
+      return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
 
     return $this->route_back = $this->route_factory($route_name, $route_params);
-	}
+  }
 
   public function route_factory($route_name=null, $route_params=[]) : string
   {

Spacing +45 added lines, -45 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace HexMakina\kadro\Controllers;
 
-use \Psr\Container\{ContainerInterface,ContainerExceptionInterface,NotFoundExceptionInterface};
+use \Psr\Container\{ContainerInterface, ContainerExceptionInterface, NotFoundExceptionInterface};
 
 use \HexMakina\kadro\Auth\{OperatorInterface, AccessRefusedException};
 use \HexMakina\kadro\Router\RouterInterface;
@@ -15,7 +15,7 @@ 
 
   protected $route_back = null;
 
-  public function __toString(){ return get_called_class();}
+  public function __toString() { return get_called_class(); }
 
   // -------- Controller Container
   public function set_container(ContainerInterface $container)
@@ -29,9 +29,9 @@ 
   }
 
   // shortcut for (un)boxing
-  public function box($key, $instance=null)
+  public function box($key, $instance = null)
   {
-    if(!is_null($instance))
+    if (!is_null($instance))
       $this->container->register($key, $instance);
 
     // dd($this->container->get($key));
@@ -61,32 +61,32 @@ 
     return true; // security by default
   }
 
-  public function authorize($permission=null)
+  public function authorize($permission = null)
   {
     // if(!$this->requires_operator() || is_null($permission))
-    if(!$this->requires_operator())
+    if (!$this->requires_operator())
       return true;
 
     $operator = $this->operator();
-    if(is_null($operator) || $operator->is_new() || !$operator->is_active())
+    if (is_null($operator) || $operator->is_new() || !$operator->is_active())
       throw new AccessRefusedException();
 
-    if(!is_null($permission) && !$operator->has_permission($permission))
+    if (!is_null($permission) && !$operator->has_permission($permission))
       throw new AccessRefusedException();
 
     return true;
   }
 
-  public function viewport($key=null, $value=null, $coercion=false)
+  public function viewport($key = null, $value = null, $coercion = false)
   {
     // no key, returns all
-    if(is_null($key))
+    if (is_null($key))
       return $this->template_variables;
 
     // got key, got null value, returns $[$key]
-    if(is_null($value))
+    if (is_null($value))
     {
-      if($coercion === true) // break rule 1 ?
+      if ($coercion === true) // break rule 1 ?
         $this->template_variables[$key] = null;
 
       return $this->template_variables[$key] ?? null;
@@ -94,7 +94,7 @@ 
 
     // got key, got value
     // sets or coerces $[$key]=$value and returns $[$key]
-    if(!isset($this->template_variables[$key]) || $coercion === true)
+    if (!isset($this->template_variables[$key]) || $coercion === true)
       $this->template_variables[$key] = $value;
 
     return $this->template_variables[$key] ?? null;
@@ -106,22 +106,22 @@ 
 
     $custom_template = null;
 
-    if(method_exists($this, 'prepare'))
+    if (method_exists($this, 'prepare'))
     	$this->prepare();
 
-  	if(method_exists($this, $method = $this->router()->target_method()))
+  	if (method_exists($this, $method = $this->router()->target_method()))
     {
       $custom_template = $this->$method();
     }
 
-    if(method_exists($this, 'conclude'))
+    if (method_exists($this, 'conclude'))
     	$this->conclude();
 
-    if(method_exists($this, 'display'))
+    if (method_exists($this, 'display'))
     	$template = $this->display($custom_template);
   }
 
-  public function conclude(){}
+  public function conclude() {}
 
   public function prepare()
   {
@@ -130,14 +130,14 @@ 
 
   private function trim_request_data()
   {
-    array_walk_recursive($_GET, function(&$value){$value = trim($value);});
-    array_walk_recursive($_REQUEST, function(&$value){$value = trim($value);});
+    array_walk_recursive($_GET, function(&$value) {$value = trim($value); });
+    array_walk_recursive($_REQUEST, function(&$value) {$value = trim($value); });
 
-    if($this->router()->submits())
-      array_walk_recursive($_POST, function(&$value){$value = trim($value);});
+    if ($this->router()->submits())
+      array_walk_recursive($_POST, function(&$value) {$value = trim($value); });
   }
 
-  public function display($custom_template = null, $standalone=false)
+  public function display($custom_template = null, $standalone = false)
   {
     $smarty = $this->box('template_engine');
 
@@ -149,15 +149,15 @@ 
 
 
   	$this->viewport('file_root', $this->router()->file_root());
-  	$this->viewport('view_path', $this->router()->file_root() . $this->box('settings.smarty.template_path').'app/');
+  	$this->viewport('view_path', $this->router()->file_root().$this->box('settings.smarty.template_path').'app/');
   	$this->viewport('web_root', $this->router()->web_root());
-  	$this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
-  	$this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
+  	$this->viewport('view_url', $this->router()->web_root().$this->box('settings.smarty.template_path'));
+  	$this->viewport('images_url', $this->router()->web_root().$this->box('settings.smarty.template_path').'images/');
 
-    foreach($this->viewport() as $template_var_name => $value)
+    foreach ($this->viewport() as $template_var_name => $value)
       $smarty->assign($template_var_name, $value);
 
-    if($standalone === false)
+    if ($standalone === false)
     {
       $smarty->display(sprintf('%s|%s', $this->box('settings.smarty.template_inclusion_path'), $template));
     }
@@ -180,32 +180,32 @@ 
     $controller_template_path = $this->template_base();
     $templates = [];
 
-    if(!empty($custom_template))
+    if (!empty($custom_template))
     {
       // 1. check for custom template in the current controller directory
-      $templates ['custom_3']= sprintf('%s/%s.html', $controller_template_path, $custom_template);
+      $templates ['custom_3'] = sprintf('%s/%s.html', $controller_template_path, $custom_template);
       // 2. check for custom template formatted as controller/view
-      $templates ['custom_2']= $custom_template.'.html';
-      $templates ['custom_1']= '_layouts/'.$custom_template.'.html';
+      $templates ['custom_2'] = $custom_template.'.html';
+      $templates ['custom_1'] = '_layouts/'.$custom_template.'.html';
     }
 
-    if(!empty($this->router()->target_method()))
+    if (!empty($this->router()->target_method()))
     {
       // 1. check for template in controller-related directory
-      $templates ['target_1']= sprintf('%s/%s.html', $controller_template_path, $this->router()->target_method());
+      $templates ['target_1'] = sprintf('%s/%s.html', $controller_template_path, $this->router()->target_method());
       // 2. check for template in app-related directory
-      $templates ['target_2']= sprintf('_layouts/%s.html', $this->router()->target_method());
+      $templates ['target_2'] = sprintf('_layouts/%s.html', $this->router()->target_method());
       // 3. check for template in kadro directory
-      $templates ['target_3']= sprintf('%s.html', $this->router()->target_method());
+      $templates ['target_3'] = sprintf('%s.html', $this->router()->target_method());
     }
 
-    $templates ['default_3']= sprintf('%s/edit.html', $controller_template_path);
-    $templates ['default_4']= 'edit.tpl';
+    $templates ['default_3'] = sprintf('%s/edit.html', $controller_template_path);
+    $templates ['default_4'] = 'edit.tpl';
     $templates = array_unique($templates);
 
-    while(!is_null($tpl_path = array_shift($templates)))
+    while (!is_null($tpl_path = array_shift($templates)))
     {
-      if($smarty->templateExists($tpl_path))
+      if ($smarty->templateExists($tpl_path))
         return $tpl_path;
     }
 
@@ -226,21 +226,21 @@ 
    * route_back($route_name [,$route_params]), sets $route_back using route_factory()
    *
    */
-  public function route_back($route_name=null, $route_params=[]) : string
+  public function route_back($route_name = null, $route_params = []) : string
 	{
-    if(is_null($route_name))
+    if (is_null($route_name))
 		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
 
     return $this->route_back = $this->route_factory($route_name, $route_params);
 	}
 
-  public function route_factory($route_name=null, $route_params=[]) : string
+  public function route_factory($route_name = null, $route_params = []) : string
   {
     $route = null;
 
-    if(is_string($route_name) && !empty($route_name))
+    if (is_string($route_name) && !empty($route_name))
     {
-      if($this->router()->route_exists($route_name))
+      if ($this->router()->route_exists($route_name))
         $route = $this->router()->prehop($route_name, $route_params);
       else
         $route = $route_name;

Braces +49 added lines, -33 removed lines

@@ -31,8 +31,9 @@ 
   // shortcut for (un)boxing
   public function box($key, $instance=null)
   {
-    if(!is_null($instance))
-      $this->container->register($key, $instance);
+    if(!is_null($instance)) {
+          $this->container->register($key, $instance);
+    }
 
     // dd($this->container->get($key));
     return $this->container->get($key);
@@ -64,15 +65,18 @@ 
   public function authorize($permission=null)
   {
     // if(!$this->requires_operator() || is_null($permission))
-    if(!$this->requires_operator())
-      return true;
+    if(!$this->requires_operator()) {
+          return true;
+    }
 
     $operator = $this->operator();
-    if(is_null($operator) || $operator->is_new() || !$operator->is_active())
-      throw new AccessRefusedException();
+    if(is_null($operator) || $operator->is_new() || !$operator->is_active()) {
+          throw new AccessRefusedException();
+    }
 
-    if(!is_null($permission) && !$operator->has_permission($permission))
-      throw new AccessRefusedException();
+    if(!is_null($permission) && !$operator->has_permission($permission)) {
+          throw new AccessRefusedException();
+    }
 
     return true;
   }
@@ -80,22 +84,26 @@ 
   public function viewport($key=null, $value=null, $coercion=false)
   {
     // no key, returns all
-    if(is_null($key))
-      return $this->template_variables;
+    if(is_null($key)) {
+          return $this->template_variables;
+    }
 
     // got key, got null value, returns $[$key]
     if(is_null($value))
     {
-      if($coercion === true) // break rule 1 ?
+      if($coercion === true) {
+        // break rule 1 ?
         $this->template_variables[$key] = null;
+      }
 
       return $this->template_variables[$key] ?? null;
     }
 
     // got key, got value
     // sets or coerces $[$key]=$value and returns $[$key]
-    if(!isset($this->template_variables[$key]) || $coercion === true)
-      $this->template_variables[$key] = $value;
+    if(!isset($this->template_variables[$key]) || $coercion === true) {
+          $this->template_variables[$key] = $value;
+    }
 
     return $this->template_variables[$key] ?? null;
   }
@@ -106,19 +114,22 @@ 
 
     $custom_template = null;
 
-    if(method_exists($this, 'prepare'))
-    	$this->prepare();
+    if(method_exists($this, 'prepare')) {
+        	$this->prepare();
+    }
 
   	if(method_exists($this, $method = $this->router()->target_method()))
     {
       $custom_template = $this->$method();
     }
 
-    if(method_exists($this, 'conclude'))
-    	$this->conclude();
+    if(method_exists($this, 'conclude')) {
+        	$this->conclude();
+    }
 
-    if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+    if(method_exists($this, 'display')) {
+        	$template = $this->display($custom_template);
+    }
   }
 
   public function conclude(){}
@@ -133,8 +144,10 @@ 
     array_walk_recursive($_GET, function(&$value){$value = trim($value);});
     array_walk_recursive($_REQUEST, function(&$value){$value = trim($value);});
 
-    if($this->router()->submits())
-      array_walk_recursive($_POST, function(&$value){$value = trim($value);});
+    if($this->router()->submits()) {
+          array_walk_recursive($_POST, function(&$value){$value = trim($value);
+    }
+    });
   }
 
   public function display($custom_template = null, $standalone=false)
@@ -154,14 +167,14 @@ 
   	$this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
   	$this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
 
-    foreach($this->viewport() as $template_var_name => $value)
-      $smarty->assign($template_var_name, $value);
+    foreach($this->viewport() as $template_var_name => $value) {
+          $smarty->assign($template_var_name, $value);
+    }
 
     if($standalone === false)
     {
       $smarty->display(sprintf('%s|%s', $this->box('settings.smarty.template_inclusion_path'), $template));
-    }
-    else
+    } else
     {
       $smarty->display($template);
     }
@@ -205,8 +218,9 @@ 
 
     while(!is_null($tpl_path = array_shift($templates)))
     {
-      if($smarty->templateExists($tpl_path))
-        return $tpl_path;
+      if($smarty->templateExists($tpl_path)) {
+              return $tpl_path;
+      }
     }
 
     throw new \Exception('KADRO_ERR_NO_TEMPLATE_TO_DISPLAY');
@@ -228,8 +242,9 @@ 
    */
   public function route_back($route_name=null, $route_params=[]) : string
 	{
-    if(is_null($route_name))
-		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
+    if(is_null($route_name)) {
+    		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
+    }
 
     return $this->route_back = $this->route_factory($route_name, $route_params);
 	}
@@ -240,10 +255,11 @@ 
 
     if(is_string($route_name) && !empty($route_name))
     {
-      if($this->router()->route_exists($route_name))
-        $route = $this->router()->prehop($route_name, $route_params);
-      else
-        $route = $route_name;
+      if($this->router()->route_exists($route_name)) {
+              $route = $this->router()->prehop($route_name, $route_params);
+      } else {
+              $route = $route_name;
+      }
 
       return $route;
     }

Controllers/Breadcrumb.class.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
     return $this->breadcrumbs;
   }
   
-  public function breadcrumb($show, $route=null)
+  public function breadcrumb($show, $route = null)
   {
-    $this->breadcrumbs[]= ['show' => $show, 'route' => $route];
+    $this->breadcrumbs[] = ['show' => $show, 'route' => $route];
   }
   
   public function reset_breadcrumbs() : array