HexMakina / kadro

StorageManager/PictureManager.class.php

Spacing +44 added lines, -44 removed lines

@@ -25,11 +25,11 @@ 
   // const MOVIE_POSTER = 'poster';
   // const MOVIE_SNAPSHOT = 'snapshot';
 
-  public function filenames($replace_by_thumbs_if_exists=false)
+  public function filenames($replace_by_thumbs_if_exists = false)
   {
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
+		if (!file_exists($picture_directory) && mkdir($picture_directory) === false)
 			throw new PictureManagerException("directory '$picture_directory' does not exist");
 
     $filenames = self::preg_scandir($picture_directory, self::FILENAME_REGEX);
@@ -38,21 +38,21 @@ 
     return $filenames;
   }
 
-  public function filepathes($replace_by_thumbs_if_exists=false)
+  public function filepathes($replace_by_thumbs_if_exists = false)
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $filepathes = [];
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
       $filepathes[] = $this->locate_thumbnail($filename);
 
     return $filepathes;
   }
 
-  public function file_uris($replace_by_thumbs_if_exists=false)
+  public function file_uris($replace_by_thumbs_if_exists = false)
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $uris = [];
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
       $uris[] = hopper::file_uri($this->locate_file($filename)); ;
 
     return $uris;
@@ -67,7 +67,7 @@ 
       'image/gif' => 'imagecreatefromgif',
     );
     $mime = mime_content_type($filepath);
-    if(array_key_exists($mime, $picture_mime_to_gd_create_function))
+    if (array_key_exists($mime, $picture_mime_to_gd_create_function))
       return true;
     return $mime;
   }
@@ -75,22 +75,22 @@ 
 
   public function upload()
   {
-    if(!array_key_exists($this->get_type(), $_FILES))
+    if (!array_key_exists($this->get_type(), $_FILES))
       throw new PictureManagerException($this->get_type()." not found in _FILES");
 
-    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0)
+    if (!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0)
       throw new PictureManagerException('uploaded file has no size');
 
-    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true)
+    if (($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true)
       throw new PictureManagerException('data sent is not an image but a '.$file_type.'');
 
-    $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
+    $filepath = $this->build_filename().'.'.self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
+		if (file_exists($filepath))
       throw new PictureManagerException($this->get_type()." new path '$filepath' already exists");
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
+		if (copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
 			throw new PictureManagerException(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
 
     $this->make_thumbnail($filepath);
@@ -98,7 +98,7 @@ 
 
   public function download($url)
   {
-    $filepath = $this->build_filename() . '.' . self::file_ext($url);
+    $filepath = $this->build_filename().'.'.self::file_ext($url);
     $filepath = $this->locate_file($filepath);
 
     \qivive\Curlyb::fetch($url, $filepath);
@@ -113,7 +113,7 @@ 
 		$cover_iri = null;
 
 		$mime_type = mime_content_type($filepath);
-		switch($mime_type)
+		switch ($mime_type)
 		{
 			case 'image/jpeg':
 			case 'image/pjpeg':
@@ -129,21 +129,21 @@ 
 			break;
 		}
 
-		if(!is_null($cover_iri))
+		if (!is_null($cover_iri))
 		{
-			$width = imagesx( $cover_iri );
-			$height = imagesy( $cover_iri );
+			$width = imagesx($cover_iri);
+			$height = imagesy($cover_iri);
 
 			// calculate thumbnail size
       
 			$new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
-			$new_height = floor( $height * ( $new_width / $width ) );
+			$new_height = floor($height * ($new_width / $width));
 
 			// create a new temporary image
 			$thumb_iri = imagecreatetruecolor($new_width, $new_height);
 
 			// copy and resize old image into new image
-			imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
+			imagecopyresized($thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
 
 			// save thumbnail into a file
       imagejpeg($thumb_iri, $this->locate_thumbnail(pathinfo($filepath, PATHINFO_BASENAME)));
@@ -154,16 +154,16 @@ 
   {
     $filenames = $this->filenames();
 
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
 				$this->remove($filename);
 
     $directory = $this->build_path_to_directory();
-		if(file_exists($directory) === true)
+		if (file_exists($directory) === true)
     {
-      if(is_dir($directory) === false)
+      if (is_dir($directory) === false)
         throw new PictureManagerException($this->get_type()."' directory '$directory' is not a directory");
 
-   		if(rmdir($directory) === false)
+   		if (rmdir($directory) === false)
   			throw new PictureManagerException("rmdir($directory) failed like a bitch");
     }
     else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
@@ -174,27 +174,27 @@ 
     // removing a picture, and maybe a thumbnail? build the $pathes array accordingly
     $pathes = [];
     $pathes[$this->get_type()] = $this->locate_file($picture_filename);
-    $pathes[$this->get_type() . ' thumbnail'] = $this->locate_thumbnail($picture_filename);
+    $pathes[$this->get_type().' thumbnail'] = $this->locate_thumbnail($picture_filename);
 
     $deleted = [];
     $still_walking = [];
-    foreach($pathes as $what => $path)
+    foreach ($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
+  		if (!file_exists($path))
         $error = 'file does not exist';
-      elseif(unlink($path)===false)
+      elseif (unlink($path) === false)
         $error = 'unlink() failed';
 
-      if(is_null($error))
-        $deleted[]= $what;
+      if (is_null($error))
+        $deleted[] = $what;
       else
       {
         trigger_error(__FUNCTION__." '$picture_filename' ($what @ $path) impossible because ", E_USER_NOTICE);
-        $still_walking[]=$what;
+        $still_walking[] = $what;
       }
     }
-    return count($still_walking)===0;
+    return count($still_walking) === 0;
   }
 
   public function locate_thumbnail($filename)
@@ -208,11 +208,11 @@ 
     return $settings['thumbnail']['file_prefix'].''.pathinfo($picture_basename, PATHINFO_FILENAME).'.jpg';
   }
 
-  public static function file_info($absolute_path_to_picture, $what=null)
+  public static function file_info($absolute_path_to_picture, $what = null)
   {
-    $ret = parent::file_info($absolute_path_to_picture, $what=null);
+    $ret = parent::file_info($absolute_path_to_picture, $what = null);
 
-    if(is_array($ret))
+    if (is_array($ret))
     {
       $t = getimagesize($absolute_path_to_picture);
       $ret['width'] = $t[0];
@@ -230,7 +230,7 @@ 
   }
 
 
-  public static function uri_for($item, $picture_type, $thumbnail=true)
+  public static function uri_for($item, $picture_type, $thumbnail = true)
   {
     global $settings;
     $pi_manager = new PictureManager($item, $picture_type);
@@ -238,24 +238,24 @@ 
 		$pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
-    if(count($pictures)===0)
+    if (count($pictures) === 0)
       return hopper::file_uri($settings[$item_model_type][$picture_type]['generic_picture']);
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
+		if ($settings[$item_model_type][$picture_type]['cycle_on_load'])
 			$filename = $pictures[array_rand($pictures, 1)];
 		else
 			$filename = array_shift($pictures);
 
-    return hopper::file_uri( $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename));
+    return hopper::file_uri($thumbnail === true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename));
   }
 
   public function last_index()
   {
     $last_index = 0;
-    if(count($filenames = $this->filenames()) > 0)
+    if (count($filenames = $this->filenames()) > 0)
     {
       $last_filename = array_pop($filenames); // last cover name FIXME sort should be done here, check cost if sort already done
-      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1)
+      if (preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1)
         throw new PictureManagerException("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
 
       $last_index = $last_index[1];
@@ -269,9 +269,9 @@ 
     return sprintf('%s%s.jpg', $settings['thumbnail']['file_prefix'], pathinfo($picture_basename, PATHINFO_FILENAME));
   }
 
-  public function build_filename($index=null)
+  public function build_filename($index = null)
   {
-    if(is_null($index))
+    if (is_null($index))
       $index = $this->last_index()+1;
 
     return $this->pmi->id.'_'.sprintf("%'.09d", $index); // prepend bean id
@@ -290,7 +290,7 @@ 
     $new_thumbname_path = $this->locate_file($this->build_thumb_filename($new_filename_path)); //move current to zero
     $this->rename($selected_thumbname_path, $new_thumbname_path);
 
-    for($i=$filename_index-1; $i>=0; --$i)
+    for ($i = $filename_index-1; $i >= 0; --$i)
     {
       $move_this = $this->locate_file($files[$i]);
       $to_that = $this->locate_file($files[$i+1]);

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

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

Auth/Operatorability.class.php

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

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/RouterInterface.class.php

Spacing +2 added lines, -2 removed lines

@@ -13,10 +13,10 @@
   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;

Router/AltoRouter.php

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])) {

Controllers/OperatorController.class.php

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
 namespace HexMakina\kadro\Controllers;
 
 use \HexMakina\Crudites\Crudites;
-use \HexMakina\kadro\Auth\{Operator,OperatorInterface,ACL,AccessRefusedException};
+use \HexMakina\kadro\Auth\{Operator, OperatorInterface, ACL, AccessRefusedException};
 
 
 class OperatorController extends \HexMakina\kadro\Controllers\ORMController
@@ -23,7 +23,7 @@ 
     parent::edit();
 
     // do we create? or do we edit someone else ? must be admin
-    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
+    if (is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
       $this->authorize('group_admin');
 
   }
@@ -35,7 +35,7 @@ 
 
   public function save()
   {
-    if($this->operator()->operator_id() !== $this->form_model->operator_id())
+    if ($this->operator()->operator_id() !== $this->form_model->operator_id())
       $this->authorize('group_admin');
 
     parent::save();
@@ -44,7 +44,7 @@ 
   public function before_save() : array
   {
     //------------------------------------------------------------- PASSWORDS
-    if($this->form_model->get('password') != $this->form_model->get('password_verification'))
+    if ($this->form_model->get('password') != $this->form_model->get('password_verification'))
     {
       $this->logger()->warning('KADRO_operator_ERR_PASSWORDS_MISMATCH');
       return $this->edit();
@@ -58,7 +58,7 @@ 
   public function dashboard()
   {
     $real_operator_class = get_class($this->operator());
-    $this->viewport('users', $real_operator_class::filter([], ['order_by' => [null,'username', 'ASC']]));
+    $this->viewport('users', $real_operator_class::filter([], ['order_by' => [null, 'username', 'ASC']]));
   }
 
   public function destroy()
@@ -71,10 +71,10 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one($this->router()->params());
-    if($operator->username() == $this->operator()->username())
+    if ($operator->username() == $this->operator()->username())
       throw new AccessRefusedException();
 
-    if(Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
+    if (Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
     {
       $confirmation_message = $operator->is_active() ? 'KADRO_operator_DISABLED' : 'KADRO_operator_ENABLED';
       $this->logger()->nice($confirmation_message, [$operator->get('name')]);
@@ -92,14 +92,14 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one(['username' => $this->router()->params('username')]);
-    if($operator->username() == $this->operator()->username())
+    if ($operator->username() == $this->operator()->username())
       throw new AccessRefusedException();
 
     $permission_id = $this->router()->params('permission_id');
 
     $row_data = ['operator_id' => $operator->operator_id(), 'permission_id' => $permission_id];
     $row = ACL::table()->restore($row_data);
-    if($row->is_new())
+    if ($row->is_new())
     {
       $row = ACL::table()->produce($row_data);
       $res = $row->persist();

Controllers/TradukoController.class.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 		return $this->router()->prehop('traduko');
 	}
 
-  public function update_file($lang='fra')
+  public function update_file($lang = 'fra')
   {
     $locale_path = $this->box('settings.locale_data_path');
     self::create_file($locale_path, $lang);
@@ -32,11 +32,11 @@ 
   {
     $res = Traduko::filter(['lang' => $lang]);
     $assoc = [];
-    foreach($res as $id => $trad)
+    foreach ($res as $id => $trad)
     {
-      if(!isset($assoc[$trad->kategorio]))
+      if (!isset($assoc[$trad->kategorio]))
         $assoc[$trad->kategorio] = [];
-      if(!isset($assoc[$trad->kategorio][$trad->sekcio]))
+      if (!isset($assoc[$trad->kategorio][$trad->sekcio]))
         $assoc[$trad->kategorio][$trad->sekcio] = [];
 
       $assoc[$trad->kategorio][$trad->sekcio][$trad->referenco] = $trad->$lang;
@@ -46,7 +46,7 @@ 
     // {
     $path_to_file = $locale_path.'/'.$lang;
     // test directory access & creation
-    if(!JSON::exists($path_to_file))
+    if (!JSON::exists($path_to_file))
       JSON::make_dir($path_to_file);
 
     $file = new JSON($path_to_file.'/'.self::JSON_FILENAME, 'w+');
@@ -61,7 +61,7 @@ 
   public static function init($locale_path)
   {
     $languages = array_keys(array_slice(Traduko::inspect(Traduko::table_name())->columns(), 4));
-    foreach($languages as $l)
+    foreach ($languages as $l)
       self::create_file($locale_path, $l);
 
     return $languages;