HexMakina / kadro

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

Indentation +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
     foreach(['prepare', "before_$method", $method, "after_$method"] as $step => $chainling)
     {
       $this->search_and_execute_trait_methods($chainling);
-    	if(method_exists($this, $chainling) && empty($this->errors()))
+      if(method_exists($this, $chainling) && empty($this->errors()))
       {
         $res = $this->$chainling();
 
@@ -48,10 +48,10 @@ 
     }
 
     if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
-    	$this->conclude();
+      $this->conclude();
 
     if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+      $template = $this->display($custom_template);
   }
 
   public function prepare()

Spacing +50 added lines, -50 removed lines

@@ -27,19 +27,19 @@ 
     $custom_template = null;
     $method = $this->router()->target_method();
 
-    foreach(['prepare', "before_$method", $method, "after_$method"] as $step => $chainling)
+    foreach (['prepare', "before_$method", $method, "after_$method"] as $step => $chainling)
     {
       $this->search_and_execute_trait_methods($chainling);
-    	if(method_exists($this, $chainling) && empty($this->errors()))
+    	if (method_exists($this, $chainling) && empty($this->errors()))
       {
         $res = $this->$chainling();
 
-        if($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
+        if ($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
         {
           break; // dont go on with other
         }
 
-        if($chainling === $method)
+        if ($chainling === $method)
         {
 
           $custom_template = $res;
@@ -47,10 +47,10 @@ 
       }
     }
 
-    if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
+    if (method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
     	$this->conclude();
 
-    if(method_exists($this, 'display'))
+    if (method_exists($this, 'display'))
     	$template = $this->display($custom_template);
   }
 
@@ -58,7 +58,7 @@ 
   {
     parent::prepare();
 
-    if(!class_exists($this->model_class_name = $this->class_name()))
+    if (!class_exists($this->model_class_name = $this->class_name()))
       throw new \Exception("!class_exists($this->model_class_name)");
 
     $this->model_type = $this->model_class_name::model_type();
@@ -68,22 +68,22 @@ 
 
     $pk_values = [];
 
-    if($this->router()->submits())
+    if ($this->router()->submits())
     {
       $this->form_model->import($this->sanitize_post_data($this->router()->submitted()));
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->submitted());
 
       $this->load_model = $this->model_class_name::exists($pk_values);
     }
-    elseif($this->router()->requests())
+    elseif ($this->router()->requests())
     {
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->params());
 
-      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
+      if (!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
         $this->form_model = clone $this->load_model;
     }
 
-    if(!is_null($this->load_model) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable())
+    if (!is_null($this->load_model) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable())
       $this->viewport('load_model_history', $this->tracer()->traces_by_model($this->load_model));
   }
 
@@ -94,7 +94,7 @@ 
   // ----------- META -----------
   public function class_name() : string
   {
-    if(is_null($this->model_class_name))
+    if (is_null($this->model_class_name))
     {
       $this->model_class_name = get_called_class();
       $this->model_class_name = str_replace('\Controllers\\', '\Models\\', $this->model_class_name);
@@ -107,12 +107,12 @@ 
   public function persist_model($model) : ?ModelInterface
   {
     $this->errors = $model->save($this->operator()->operator_id(), $this->tracer()); // returns [errors]
-    if(empty($this->errors()))
+    if (empty($this->errors()))
     {
       $this->logger()->nice(L('CRUDITES_INSTANCE_ALTERED', ['MODEL_'.get_class($model)::model_type().'_INSTANCE']));
       return $model;
     }
-    foreach($this->errors() as $field => $error_msg)
+    foreach ($this->errors() as $field => $error_msg)
       $this->logger()->warning(L($error_msg, [$field]));
 
     return null;
@@ -123,12 +123,12 @@ 
     return $this->listing(); //default dashboard is a listing
   }
 
-  public function listing($model=null,$filters=[],$options=[])
+  public function listing($model = null, $filters = [], $options = [])
   {
     $class_name = is_null($model) ? $this->model_class_name : get_class($model);
 
-    if(!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
-    if(!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    if (!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
+    if (!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
 
     // dd($filters);
     $listing = $class_name::filter($filters);
@@ -139,24 +139,24 @@ 
   public function viewport_listing($class_name, $listing, $listing_template)
   {
     $listing_fields = [];
-    if(empty($listing))
+    if (empty($listing))
     {
-      foreach($class_name::table()->columns() as $column)
+      foreach ($class_name::table()->columns() as $column)
       {
 
-        if(!$column->is_auto_incremented() && !$column->is_hidden())
-          $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        if (!$column->is_auto_incremented() && !$column->is_hidden())
+          $listing_fields[$column->name()] = L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
       }
     }
     else
     {
       $current = current($listing);
-      if(is_object($current))
+      if (is_object($current))
         $current = get_object_vars($current);
 
-      foreach(array_keys($current) as $field)
+      foreach (array_keys($current) as $field)
       {
-        $listing_fields[$field]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $field));
+        $listing_fields[$field] = L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $field));
       }
 
     }
@@ -178,13 +178,13 @@ 
     $this->edit();
   }
 
-  public function edit(){}
+  public function edit() {}
 
   public function save()
   {
     $model = $this->persist_model($this->form_model);
 
-    if(empty($this->errors()))
+    if (empty($this->errors()))
       $this->route_back($model);
     else
     {
@@ -195,21 +195,21 @@ 
 
   public function before_edit()
   {
-    if(!is_null($this->router()->params('id')) && is_null($this->load_model))
+    if (!is_null($this->router()->params('id')) && is_null($this->load_model))
     {
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_class_name::model_type().'_INSTANCE']));
       $this->router()->hop($this->model_class_name::model_type());
     }
   }
 
-  public function before_save() : array { return [];}
+  public function before_save() : array { return []; }
 
   // default: hop to altered object
-  public function after_save() {$this->router()->hop($this->route_back());}
+  public function after_save() {$this->router()->hop($this->route_back()); }
 
   public function destroy_confirm()
   {
-    if(is_null($this->load_model))
+    if (is_null($this->load_model))
     {
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']));
       $this->router()->hop($this->model_type);
@@ -222,12 +222,12 @@ 
 
   public function before_destroy() // default: checks for load_model and immortality, hops back to object on failure
   {
-    if(is_null($this->load_model))
+    if (is_null($this->load_model))
     {
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']));
       $this->router()->hop($this->model_type);
     }
-    elseif($this->load_model->immortal())
+    elseif ($this->load_model->immortal())
     {
 
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', ['MODEL_'.$this->model_type.'_INSTANCE']));
@@ -237,10 +237,10 @@ 
 
   public function destroy()
   {
-    if(!$this->router()->submits())
+    if (!$this->router()->submits())
       throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
 
-    if($this->load_model->destroy($this->operator()->operator_id(), $this->tracer()) === false)
+    if ($this->load_model->destroy($this->operator()->operator_id(), $this->tracer()) === false)
     {
       $this->logger()->info(L('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]));
       $this->route_back($this->load_model);
@@ -263,10 +263,10 @@ 
 
     $this->viewport('form_model_type', $this->model_type);
 
-    if(isset($this->load_model))
+    if (isset($this->load_model))
       $this->viewport('load_model', $this->load_model);
 
-    if(isset($this->form_model))
+    if (isset($this->form_model))
       $this->viewport('form_model', $this->form_model);
   }
 
@@ -278,15 +278,15 @@ 
 
     $header = false;
 
-    foreach($collection as $line)
+    foreach ($collection as $line)
     {
       $line = get_object_vars($line);
-      if($header === false)
+      if ($header === false)
       {
-        fputcsv($fp,array_keys($line));
+        fputcsv($fp, array_keys($line));
         $header = true;
       }
-      fputcsv($fp,$line);
+      fputcsv($fp, $line);
     }
     fclose($fp);
 
@@ -296,7 +296,7 @@ 
   public function export()
   {
     $format = $this->router()->params('format');
-    switch($format)
+    switch ($format)
     {
       case null:
         $filename = $this->model_type;
@@ -325,33 +325,33 @@ 
     $route_params = [];
 
     $route_name = get_class($model)::model_type().'_';
-    if($model->is_new())
-      $route_name.= 'new';
+    if ($model->is_new())
+      $route_name .= 'new';
     else
     {
-      $route_name.= 'default';
+      $route_name .= 'default';
       $route_params = ['id' => $model->get_id()];
     }
     $res = $this->router()->prehop($route_name, $route_params);
     return $res;
   }
 
-  public function route_factory($route=null, $route_params=[]) : string
+  public function route_factory($route = null, $route_params = []) : string
   {
-    if(is_null($route) && $this->router()->submits())
+    if (is_null($route) && $this->router()->submits())
       $route = $this->form_model;
 
-    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
+    if (!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
       $route = $this->route_model($route);
 
     return parent::route_factory($route, $route_params);
   }
 
-  private function sanitize_post_data($post_data=[])
+  private function sanitize_post_data($post_data = [])
   {
-    foreach($this->model_class_name::table()->columns() as $col)
+    foreach ($this->model_class_name::table()->columns() as $col)
     {
-      if($col->type()->is_boolean())
+      if ($col->type()->is_boolean())
       {
           $post_data[$col->name()] = !empty($post_data[$col->name()]);
       }

Braces +60 added lines, -43 removed lines

@@ -34,9 +34,12 @@ 
       {
         $res = $this->$chainling();
 
-        if($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
+        if($this->logger()->has_halting_messages()) {
+          // logger handled a critical error during the chailing execution
         {
-          break; // dont go on with other
+          break;
+        }
+        // dont go on with other
         }
 
         if($chainling === $method)
@@ -47,19 +50,23 @@ 
       }
     }
 
-    if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
+    if(method_exists($this, 'conclude')) {
+      // conclude always executed, even with has_halting_messages
     	$this->conclude();
+    }
 
-    if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+    if(method_exists($this, 'display')) {
+        	$template = $this->display($custom_template);
+    }
   }
 
   public function prepare()
   {
     parent::prepare();
 
-    if(!class_exists($this->model_class_name = $this->class_name()))
-      throw new \Exception("!class_exists($this->model_class_name)");
+    if(!class_exists($this->model_class_name = $this->class_name())) {
+          throw new \Exception("!class_exists($this->model_class_name)");
+    }
 
     $this->model_type = $this->model_class_name::model_type();
 
@@ -74,17 +81,18 @@ 
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->submitted());
 
       $this->load_model = $this->model_class_name::exists($pk_values);
-    }
-    elseif($this->router()->requests())
+    } elseif($this->router()->requests())
     {
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->params());
 
-      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
-        $this->form_model = clone $this->load_model;
+      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values))) {
+              $this->form_model = clone $this->load_model;
+      }
     }
 
-    if(!is_null($this->load_model) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable())
-      $this->viewport('load_model_history', $this->tracer()->traces_by_model($this->load_model));
+    if(!is_null($this->load_model) && is_subclass_of($this->load_model, '\HexMakina\Crudites\Interfaces\TraceableInterface') && $this->load_model->traceable()) {
+          $this->viewport('load_model_history', $this->tracer()->traces_by_model($this->load_model));
+    }
   }
 
   public function has_load_model()
@@ -112,8 +120,9 @@ 
       $this->logger()->nice(L('CRUDITES_INSTANCE_ALTERED', ['MODEL_'.get_class($model)::model_type().'_INSTANCE']));
       return $model;
     }
-    foreach($this->errors() as $field => $error_msg)
-      $this->logger()->warning(L($error_msg, [$field]));
+    foreach($this->errors() as $field => $error_msg) {
+          $this->logger()->warning(L($error_msg, [$field]));
+    }
 
     return null;
   }
@@ -127,8 +136,12 @@ 
   {
     $class_name = is_null($model) ? $this->model_class_name : get_class($model);
 
-    if(!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
-    if(!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    if(!isset($filters['date_start'])) {
+      $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
+    }
+    if(!isset($filters['date_stop'])) {
+      $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    }
 
     // dd($filters);
     $listing = $class_name::filter($filters);
@@ -144,15 +157,16 @@ 
       foreach($class_name::table()->columns() as $column)
       {
 
-        if(!$column->is_auto_incremented() && !$column->is_hidden())
-          $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        if(!$column->is_auto_incremented() && !$column->is_hidden()) {
+                  $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        }
       }
-    }
-    else
+    } else
     {
       $current = current($listing);
-      if(is_object($current))
-        $current = get_object_vars($current);
+      if(is_object($current)) {
+              $current = get_object_vars($current);
+      }
 
       foreach(array_keys($current) as $field)
       {
@@ -184,9 +198,9 @@ 
   {
     $model = $this->persist_model($this->form_model);
 
-    if(empty($this->errors()))
-      $this->route_back($model);
-    else
+    if(empty($this->errors())) {
+          $this->route_back($model);
+    } else
     {
       $this->edit();
       return 'edit';
@@ -226,8 +240,7 @@ 
     {
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']));
       $this->router()->hop($this->model_type);
-    }
-    elseif($this->load_model->immortal())
+    } elseif($this->load_model->immortal())
     {
 
       $this->logger()->warning(L('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', ['MODEL_'.$this->model_type.'_INSTANCE']));
@@ -237,15 +250,15 @@ 
 
   public function destroy()
   {
-    if(!$this->router()->submits())
-      throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
+    if(!$this->router()->submits()) {
+          throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
+    }
 
     if($this->load_model->destroy($this->operator()->operator_id(), $this->tracer()) === false)
     {
       $this->logger()->info(L('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]));
       $this->route_back($this->load_model);
-    }
-    else
+    } else
     {
       $this->logger()->nice(L('CRUDITES_INSTANCE_DESTROYED', ['MODEL_'.$this->model_type.'_INSTANCE']));
       $this->route_back($this->model_type);
@@ -263,11 +276,13 @@ 
 
     $this->viewport('form_model_type', $this->model_type);
 
-    if(isset($this->load_model))
-      $this->viewport('load_model', $this->load_model);
+    if(isset($this->load_model)) {
+          $this->viewport('load_model', $this->load_model);
+    }
 
-    if(isset($this->form_model))
-      $this->viewport('form_model', $this->form_model);
+    if(isset($this->form_model)) {
+          $this->viewport('form_model', $this->form_model);
+    }
   }
 
   public function collection_to_csv($collection, $filename)
@@ -325,9 +340,9 @@ 
     $route_params = [];
 
     $route_name = get_class($model)::model_type().'_';
-    if($model->is_new())
-      $route_name.= 'new';
-    else
+    if($model->is_new()) {
+          $route_name.= 'new';
+    } else
     {
       $route_name.= 'default';
       $route_params = ['id' => $model->get_id()];
@@ -338,11 +353,13 @@ 
 
   public function route_factory($route=null, $route_params=[]) : string
   {
-    if(is_null($route) && $this->router()->submits())
-      $route = $this->form_model;
+    if(is_null($route) && $this->router()->submits()) {
+          $route = $this->form_model;
+    }
 
-    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
-      $route = $this->route_model($route);
+    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface')) {
+          $route = $this->route_model($route);
+    }
 
     return parent::route_factory($route, $route_params);
   }

Controllers/ReceptionController.class.php

Spacing +8 added lines, -8 removed lines

@@ -3,8 +3,8 @@ 
 namespace HexMakina\kadro\Controllers;
 
 use \Psr\Container\ContainerInterface;
-use HexMakina\kadro\Auth\{Operator,Permission,ACL};
-use HexMakina\kadro\Auth\{OperatorInterface,AccessRefusedException};
+use HexMakina\kadro\Auth\{Operator, Permission, ACL};
+use HexMakina\kadro\Auth\{OperatorInterface, AccessRefusedException};
 
 class ReceptionController extends KadroController
 {
@@ -18,19 +18,19 @@ 
   public function welcome(OperatorInterface $operator)
   {
 
-    if($this->router()->name() === 'identify')
+    if ($this->router()->name() === 'identify')
       $this->identify($operator);
 
     $Controller = $this->router()->target_controller();
     $Controller = $this->box($Controller);
 
 
-    if($Controller->requires_operator())
+    if ($Controller->requires_operator())
     {
-      if(is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id())))
+      if (is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id())))
         $this->router()->hop('checkin');
 
-      if(!$operator->is_active())
+      if (!$operator->is_active())
       {
         $this->checkout();
         throw new AccessRefusedException();
@@ -62,10 +62,10 @@ 
 
       $operator = get_class($op)::exists(['username' => $username]);
 
-      if(is_null($operator) || !$operator->is_active())
+      if (is_null($operator) || !$operator->is_active())
         throw new \Exception('ERR_DISABLED');
 
-      if(!$operator->password_verify($password))
+      if (!$operator->password_verify($password))
         throw new \Exception('ERR_WRONG_LOGIN_OR_PASSWORD');
 
       $this->box('StateAgent')->operator_id($operator->get_id());

Braces +12 added lines, -8 removed lines

@@ -18,8 +18,9 @@ 
   public function welcome(OperatorInterface $operator)
   {
 
-    if($this->router()->name() === 'identify')
-      $this->identify($operator);
+    if($this->router()->name() === 'identify') {
+          $this->identify($operator);
+    }
 
     $Controller = $this->router()->target_controller();
     $Controller = $this->box($Controller);
@@ -27,8 +28,9 @@ 
 
     if($Controller->requires_operator())
     {
-      if(is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id())))
-        $this->router()->hop('checkin');
+      if(is_null($operator = get_class($operator)::exists($this->box('StateAgent')->operator_id()))) {
+              $this->router()->hop('checkin');
+      }
 
       if(!$operator->is_active())
       {
@@ -62,11 +64,13 @@ 
 
       $operator = get_class($op)::exists(['username' => $username]);
 
-      if(is_null($operator) || !$operator->is_active())
-        throw new \Exception('ERR_DISABLED');
+      if(is_null($operator) || !$operator->is_active()) {
+              throw new \Exception('ERR_DISABLED');
+      }
 
-      if(!$operator->password_verify($password))
-        throw new \Exception('ERR_WRONG_LOGIN_OR_PASSWORD');
+      if(!$operator->password_verify($password)) {
+              throw new \Exception('ERR_WRONG_LOGIN_OR_PASSWORD');
+      }
 
       $this->box('StateAgent')->operator_id($operator->get_id());
       $this->logger()->nice(L('PAGE_CHECKIN_WELCOME', [$operator->name()]));

Controllers/Abilities/__DEL__PictureManager.class.php

Indentation +47 added lines, -47 removed lines

@@ -16,8 +16,8 @@ 
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
 
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
-			return [];
+    if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
+      return [];
 
     $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/');// ID_SEQUENCENUMBER.ext
 
@@ -75,11 +75,11 @@ 
     $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 \Exception($this->get_type()." new path '$filepath' already exists");
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
-			throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+    if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
+      throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
 
     $this->make_thumbnail($filepath);
   }
@@ -95,64 +95,64 @@ 
   }
 
   public function make_thumbnail($filepath)
-	{
+  {
     global $settings;
 
-		$cover_iri = null;
-
-		$mime_type = mime_content_type($filepath);
-		switch($mime_type)
-		{
-			case 'image/jpeg':
-			case 'image/pjpeg':
-				$cover_iri = imagecreatefromjpeg($filepath);
-			break;
+    $cover_iri = null;
 
-			case 'image/png':
-				$cover_iri = imagecreatefrompng($filepath);
-			break;
-
-			case 'image/gif':
-				$cover_iri = imagecreatefromgif($filepath);
-			break;
-		}
+    $mime_type = mime_content_type($filepath);
+    switch($mime_type)
+    {
+      case 'image/jpeg':
+      case 'image/pjpeg':
+        $cover_iri = imagecreatefromjpeg($filepath);
+      break;
+
+      case 'image/png':
+        $cover_iri = imagecreatefrompng($filepath);
+      break;
+
+      case 'image/gif':
+        $cover_iri = imagecreatefromgif($filepath);
+      break;
+    }
 
-		if(!is_null($cover_iri))
-		{
-			$width = imagesx( $cover_iri );
-			$height = imagesy( $cover_iri );
+    if(!is_null($cover_iri))
+    {
+      $width = imagesx( $cover_iri );
+      $height = imagesy( $cover_iri );
 
-			// calculate thumbnail size
+      // 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_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
+      $new_height = floor( $height * ( $new_width / $width ) );
 
-			// create a new temporary image
-			$thumb_iri = imagecreatetruecolor($new_width, $new_height);
+      // 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 );
+      // copy and resize old image into new image
+      imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
 
-			// save thumbnail into a file
+      // save thumbnail into a file
       imagejpeg($thumb_iri, $this->locate_thumbnail(pathinfo($filepath, PATHINFO_BASENAME)));
-		}
-	}
+    }
+  }
 
   public function remove_all()
   {
     $filenames = $this->filenames();
 
     foreach($filenames as $filename)
-				$this->remove($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)
         throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
 
-   		if(rmdir($directory) === false)
-  			throw new \Exception("rmdir($directory) failed like a bitch");
+        if(rmdir($directory) === false)
+        throw new \Exception("rmdir($directory) failed like a bitch");
     }
     else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
   }
@@ -169,7 +169,7 @@ 
     foreach($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
+      if(!file_exists($path))
         $error = 'file does not exist';
       elseif(unlink($path)===false)
         $error = 'unlink() failed';
@@ -223,16 +223,16 @@ 
     global $settings;
     $pi_manager = new PictureManager($item, $picture_type);
 
-		$pictures = $pi_manager->filenames();
+    $pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
     if(count($pictures)===0)
       return $settings[$item_model_type][$picture_type]['generic_picture'];
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
-			$filename = $pictures[array_rand($pictures, 1)];
-		else
-			$filename = array_shift($pictures);
+    if($settings[$item_model_type][$picture_type]['cycle_on_load'])
+      $filename = $pictures[array_rand($pictures, 1)];
+    else
+      $filename = array_shift($pictures);
 
     return $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename);
   }

Spacing +45 added lines, -45 removed lines

@@ -11,35 +11,35 @@ 
 {
   use FileManager;
   
-  public function filenames($replace_by_thumbs_if_exists=false) : array
+  public function filenames($replace_by_thumbs_if_exists = false) : array
   {
     $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)
 			return [];
 
-    $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/');// ID_SEQUENCENUMBER.ext
+    $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/'); // ID_SEQUENCENUMBER.ext
 
     sort($filenames);
     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[] = $this->locate_file($filename);
 
     dd($uris);
@@ -55,7 +55,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;
   }
@@ -63,22 +63,22 @@ 
 
   public function upload()
   {
-    if(!array_key_exists($this->get_type(), $_FILES))
+    if (!array_key_exists($this->get_type(), $_FILES))
       throw new \Exception($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 \Exception('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 \Exception('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 \Exception($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 \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
 
     $this->make_thumbnail($filepath);
@@ -86,7 +86,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);
@@ -101,7 +101,7 @@ 
 		$cover_iri = null;
 
 		$mime_type = mime_content_type($filepath);
-		switch($mime_type)
+		switch ($mime_type)
 		{
 			case 'image/jpeg':
 			case 'image/pjpeg':
@@ -117,21 +117,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)));
@@ -142,16 +142,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 \Exception($this->get_type()."' directory '$directory' is not a directory");
 
-   		if(rmdir($directory) === false)
+   		if (rmdir($directory) === false)
   			throw new \Exception("rmdir($directory) failed like a bitch");
     }
     else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
@@ -162,27 +162,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)
@@ -196,11 +196,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];
@@ -218,7 +218,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);
@@ -226,24 +226,24 @@ 
 		$pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
-    if(count($pictures)===0)
+    if (count($pictures) === 0)
       return $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 $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename);
+    return $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 \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
 
       $last_index = $last_index[1];
@@ -257,9 +257,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
@@ -278,7 +278,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]);

Braces +61 added lines, -43 removed lines

@@ -16,8 +16,9 @@ 
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
 
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
-			return [];
+		if(!file_exists($picture_directory) && mkdir($picture_directory) === false) {
+					return [];
+		}
 
     $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/');// ID_SEQUENCENUMBER.ext
 
@@ -29,8 +30,9 @@ 
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $filepathes = [];
-    foreach($filenames as $filename)
-      $filepathes[] = $this->locate_thumbnail($filename);
+    foreach($filenames as $filename) {
+          $filepathes[] = $this->locate_thumbnail($filename);
+    }
 
     return $filepathes;
   }
@@ -39,8 +41,9 @@ 
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $uris = [];
-    foreach($filenames as $filename)
-      $uris[] = $this->locate_file($filename);
+    foreach($filenames as $filename) {
+          $uris[] = $this->locate_file($filename);
+    }
 
     dd($uris);
     return $uris;
@@ -55,31 +58,37 @@ 
       'image/gif' => 'imagecreatefromgif',
     );
     $mime = mime_content_type($filepath);
-    if(array_key_exists($mime, $picture_mime_to_gd_create_function))
-      return true;
+    if(array_key_exists($mime, $picture_mime_to_gd_create_function)) {
+          return true;
+    }
     return $mime;
   }
 
 
   public function upload()
   {
-    if(!array_key_exists($this->get_type(), $_FILES))
-      throw new \Exception($this->get_type()." not found in _FILES");
+    if(!array_key_exists($this->get_type(), $_FILES)) {
+          throw new \Exception($this->get_type()." not found in _FILES");
+    }
 
-    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0)
-      throw new \Exception('uploaded file has no size');
+    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0) {
+          throw new \Exception('uploaded file has no size');
+    }
 
-    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true)
-      throw new \Exception('data sent is not an image but a '.$file_type.'');
+    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true) {
+          throw new \Exception('data sent is not an image but a '.$file_type.'');
+    }
 
     $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
-      throw new \Exception($this->get_type()." new path '$filepath' already exists");
+		if(file_exists($filepath)) {
+		      throw new \Exception($this->get_type()." new path '$filepath' already exists");
+		}
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
-			throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false) {
+					throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+		}
 
     $this->make_thumbnail($filepath);
   }
@@ -142,19 +151,23 @@ 
   {
     $filenames = $this->filenames();
 
-    foreach($filenames as $filename)
-				$this->remove($filename);
+    foreach($filenames as $filename) {
+    				$this->remove($filename);
+    }
 
     $directory = $this->build_path_to_directory();
 		if(file_exists($directory) === true)
     {
-      if(is_dir($directory) === false)
-        throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
+      if(is_dir($directory) === false) {
+              throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
+      }
 
-   		if(rmdir($directory) === false)
-  			throw new \Exception("rmdir($directory) failed like a bitch");
+   		if(rmdir($directory) === false) {
+   		  			throw new \Exception("rmdir($directory) failed like a bitch");
+   		}
+    } else {
+      trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
     }
-    else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
   }
 
   public function remove($picture_filename)
@@ -169,14 +182,15 @@ 
     foreach($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
-        $error = 'file does not exist';
-      elseif(unlink($path)===false)
-        $error = 'unlink() failed';
-
-      if(is_null($error))
-        $deleted[]= $what;
-      else
+  		if(!file_exists($path)) {
+  		        $error = 'file does not exist';
+  		} elseif(unlink($path)===false) {
+              $error = 'unlink() failed';
+      }
+
+      if(is_null($error)) {
+              $deleted[]= $what;
+      } else
       {
         trigger_error(__FUNCTION__." '$picture_filename' ($what @ $path) impossible because ", E_USER_NOTICE);
         $still_walking[]=$what;
@@ -226,13 +240,15 @@ 
 		$pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
-    if(count($pictures)===0)
-      return $settings[$item_model_type][$picture_type]['generic_picture'];
+    if(count($pictures)===0) {
+          return $settings[$item_model_type][$picture_type]['generic_picture'];
+    }
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
-			$filename = $pictures[array_rand($pictures, 1)];
-		else
-			$filename = array_shift($pictures);
+		if($settings[$item_model_type][$picture_type]['cycle_on_load']) {
+					$filename = $pictures[array_rand($pictures, 1)];
+		} else {
+					$filename = array_shift($pictures);
+		}
 
     return $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename);
   }
@@ -243,8 +259,9 @@ 
     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)
-        throw new \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
+      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1) {
+              throw new \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
+      }
 
       $last_index = $last_index[1];
     }
@@ -259,8 +276,9 @@ 
 
   public function build_filename($index=null)
   {
-    if(is_null($index))
-      $index = $this->last_index()+1;
+    if(is_null($index)) {
+          $index = $this->last_index()+1;
+    }
 
     return $this->pmi->id.'_'.sprintf("%'.09d", $index); // prepend bean id
   }

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

Controllers/LingvoController.class.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     $headers = explode(',', trim($language_data[0]));
     array_shift($language_data);
 
-    foreach($language_data as $i => $lang)
+    foreach ($language_data as $i => $lang)
     {
       $data = array_combine($headers, explode(',', $lang));
 

TableToForm.class.php

Braces +37 added lines, -41 removed lines

@@ -9,11 +9,13 @@ 
 {
   private static function compute_field_value($model,$field_name)
   {
-    if(method_exists($model,$field_name))
-      return $model->$field_name();
+    if(method_exists($model,$field_name)) {
+          return $model->$field_name();
+    }
 
-    if(property_exists($model,$field_name))
-      return $model->$field_name;
+    if(property_exists($model,$field_name)) {
+          return $model->$field_name;
+    }
 
     return '';
   }
@@ -51,74 +53,66 @@ 
 
     $table = get_class($model)::table();
 
-    if(is_null($table->column($field_name)))
-      return Form::input($field_name,$field_value,$attributes,$errors);
+    if(is_null($table->column($field_name))) {
+          return Form::input($field_name,$field_value,$attributes,$errors);
+    }
 
     $ret = '';
 
     $field = $table->column($field_name);
 
 
-    if(isset($attributes['required']) && $attributes['required'] === false)
-      unset($attributes['required']);
-
-    elseif(!$field->is_nullable())
-      $attributes[] = 'required';
+    if(isset($attributes['required']) && $attributes['required'] === false) {
+          unset($attributes['required']);
+    } elseif(!$field->is_nullable()) {
+          $attributes[] = 'required';
+    }
 
     if($field->is_auto_incremented())
     {
       $ret .= Form::hidden($field->name(),$field_value);
-    }
-    elseif($field->type()->is_boolean())
+    } elseif($field->type()->is_boolean())
     {
       $option_list = $attributes['values'] ?? [0 => 0, 1 => 1];
       $ret .= Form::select($field->name(), $option_list ,$field_value, $attributes); //
-    }
-    elseif($field->type()->is_integer())
+    } elseif($field->type()->is_integer())
     {
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_year())
+    } elseif($field->type()->is_year())
     {
       $attributes['size'] = $attributes['maxlength'] = 4;
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_date())
+    } elseif($field->type()->is_date())
     {
       $ret .= Form::date($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_time())
+    } elseif($field->type()->is_time())
     {
       $ret .= Form::time($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_datetime())
+    } elseif($field->type()->is_datetime())
     {
       $ret .= Form::datetime($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_text())
+    } elseif($field->type()->is_text())
     {
       $ret .= Form::textarea($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_enum())
+    } elseif($field->type()->is_enum())
     {
 
       $enum_values = [];
-      foreach($field->type()->enum_values() as $e_val)
-        $enum_values[$e_val] = $e_val;
+      foreach($field->type()->enum_values() as $e_val) {
+              $enum_values[$e_val] = $e_val;
+      }
 
       $selected = $attributes['value'] ?? $field_value ?? '';
       // foreach($field->)
       $ret .= Form::select($field->name(), $enum_values, $selected, $attributes); //
 
       // throw new \Exception('ENUM IS NOT HANDLED BY TableToFom');
-    }
-    elseif($field->type()->is_string())
+    } elseif($field->type()->is_string())
     {
       $max_length = $field->type()->length();
       $attributes['size'] = $attributes['maxlength'] = $max_length;
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
-    }
-    else
+    } else
     {
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
     }
@@ -130,8 +124,9 @@ 
   public static function field_with_label($model,$field_name,$attributes=[],$errors=[]) : string
   {
     $field_attributes = $attributes;
-    if(isset($attributes['label']))
-      unset($field_attributes['label']);
+    if(isset($attributes['label'])) {
+          unset($field_attributes['label']);
+    }
 
     return sprintf('%s %s', self::label($model,$field_name,$attributes,$errors), self::field($model,$field_name,$field_attributes,$errors));
   }
@@ -148,14 +143,15 @@ 
       $form_field = '';
       if($column->is_auto_incremented())
       {
-        if(!$model->is_new())
-          $form_field = self::field($model,$column_name);
-      }
-      else
+        if(!$model->is_new()) {
+                  $form_field = self::field($model,$column_name);
+        }
+      } else
       {
         $form_field = self::field_with_label($model,$column_name);
-        if(!is_null($group_class))
-          $form_field = new Element('div',$form_field, ['class' => $group_class]);
+        if(!is_null($group_class)) {
+                  $form_field = new Element('div',$form_field, ['class' => $group_class]);
+        }
       }
       $ret .= PHP_EOL.$form_field;
     }

Spacing +44 added lines, -44 removed lines

@@ -3,26 +3,26 @@ 
 namespace HexMakina\kadro;
 
 use \HexMakina\Crudites\Interfaces\ModelInterface;
-use \HexMakina\Format\HTML\{Form,Element};
+use \HexMakina\Format\HTML\{Form, Element};
 
 class TableToForm
 {
-  private static function compute_field_value($model,$field_name)
+  private static function compute_field_value($model, $field_name)
   {
-    if(method_exists($model,$field_name))
+    if (method_exists($model, $field_name))
       return $model->$field_name();
 
-    if(property_exists($model,$field_name))
+    if (property_exists($model, $field_name))
       return $model->$field_name;
 
     return '';
   }
 
-  public static function label($model,$field_name,$attributes=[],$errors=[])
+  public static function label($model, $field_name, $attributes = [], $errors = [])
   {
     $label_content = $field_name;
 
-    if(isset($attributes['label']))
+    if (isset($attributes['label']))
     {
       $label_content = $attributes['label'];
       unset($attributes['label']);
@@ -44,66 +44,66 @@ 
     return $ret;
   }
 
-  public static function field(ModelInterface $model,$field_name,$attributes=[],$errors=[]) : string
+  public static function field(ModelInterface $model, $field_name, $attributes = [], $errors = []) : string
   {
-    $field_value = $attributes['value'] ?? self::compute_field_value($model,$field_name);
+    $field_value = $attributes['value'] ?? self::compute_field_value($model, $field_name);
     $attributes['name'] = $attributes['name'] ?? $field_name;
 
     $table = get_class($model)::table();
 
-    if(is_null($table->column($field_name)))
-      return Form::input($field_name,$field_value,$attributes,$errors);
+    if (is_null($table->column($field_name)))
+      return Form::input($field_name, $field_value, $attributes, $errors);
 
     $ret = '';
 
     $field = $table->column($field_name);
 
 
-    if(isset($attributes['required']) && $attributes['required'] === false)
+    if (isset($attributes['required']) && $attributes['required'] === false)
       unset($attributes['required']);
 
-    elseif(!$field->is_nullable())
+    elseif (!$field->is_nullable())
       $attributes[] = 'required';
 
-    if($field->is_auto_incremented())
+    if ($field->is_auto_incremented())
     {
-      $ret .= Form::hidden($field->name(),$field_value);
+      $ret .= Form::hidden($field->name(), $field_value);
     }
-    elseif($field->type()->is_boolean())
+    elseif ($field->type()->is_boolean())
     {
       $option_list = $attributes['values'] ?? [0 => 0, 1 => 1];
-      $ret .= Form::select($field->name(), $option_list ,$field_value, $attributes); //
+      $ret .= Form::select($field->name(), $option_list, $field_value, $attributes); //
     }
-    elseif($field->type()->is_integer())
+    elseif ($field->type()->is_integer())
     {
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_year())
+    elseif ($field->type()->is_year())
     {
       $attributes['size'] = $attributes['maxlength'] = 4;
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_date())
+    elseif ($field->type()->is_date())
     {
-      $ret .= Form::date($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::date($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_time())
+    elseif ($field->type()->is_time())
     {
-      $ret .= Form::time($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::time($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_datetime())
+    elseif ($field->type()->is_datetime())
     {
-      $ret .= Form::datetime($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::datetime($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_text())
+    elseif ($field->type()->is_text())
     {
-      $ret .= Form::textarea($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::textarea($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_enum())
+    elseif ($field->type()->is_enum())
     {
 
       $enum_values = [];
-      foreach($field->type()->enum_values() as $e_val)
+      foreach ($field->type()->enum_values() as $e_val)
         $enum_values[$e_val] = $e_val;
 
       $selected = $attributes['value'] ?? $field_value ?? '';
@@ -112,50 +112,50 @@ 
 
       // throw new \Exception('ENUM IS NOT HANDLED BY TableToFom');
     }
-    elseif($field->type()->is_string())
+    elseif ($field->type()->is_string())
     {
       $max_length = $field->type()->length();
       $attributes['size'] = $attributes['maxlength'] = $max_length;
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
     else
     {
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
 
 
     return $ret;
   }
 
-  public static function field_with_label($model,$field_name,$attributes=[],$errors=[]) : string
+  public static function field_with_label($model, $field_name, $attributes = [], $errors = []) : string
   {
     $field_attributes = $attributes;
-    if(isset($attributes['label']))
+    if (isset($attributes['label']))
       unset($field_attributes['label']);
 
-    return sprintf('%s %s', self::label($model,$field_name,$attributes,$errors), self::field($model,$field_name,$field_attributes,$errors));
+    return sprintf('%s %s', self::label($model, $field_name, $attributes, $errors), self::field($model, $field_name, $field_attributes, $errors));
   }
 
 
-  public static function fields(ModelInterface $model,$group_class=null) : string
+  public static function fields(ModelInterface $model, $group_class = null) : string
   {
     $table = get_class($model)::table();
     $ret = '';
-    foreach($table->columns() as $column_name => $column)
+    foreach ($table->columns() as $column_name => $column)
     {
       // vd($column_name);
 
       $form_field = '';
-      if($column->is_auto_incremented())
+      if ($column->is_auto_incremented())
       {
-        if(!$model->is_new())
-          $form_field = self::field($model,$column_name);
+        if (!$model->is_new())
+          $form_field = self::field($model, $column_name);
       }
       else
       {
-        $form_field = self::field_with_label($model,$column_name);
-        if(!is_null($group_class))
-          $form_field = new Element('div',$form_field, ['class' => $group_class]);
+        $form_field = self::field_with_label($model, $column_name);
+        if (!is_null($group_class))
+          $form_field = new Element('div', $form_field, ['class' => $group_class]);
       }
       $ret .= PHP_EOL.$form_field;
     }

Models/Lingvo.class.php

Indentation +7 added lines, -7 removed lines

@@ -31,10 +31,10 @@ 
     return $this->iso_name().' ('.$this->Part3.')';
   }
 
-	public function traceable() : bool
-	{
-		return false;
-	}
+  public function traceable() : bool
+  {
+    return false;
+  }
 
   public function iso_name()
   {
@@ -102,9 +102,9 @@ 
   public static function search_language($term, $authority=null)
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
-		$ret = [];
-		foreach($rows as $row)
-		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+    $ret = [];
+    foreach($rows as $row)
+        $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
 
     return $ret;
   }

Spacing +10 added lines, -10 removed lines

@@ -52,39 +52,39 @@ 
   }
 
 
-  public static function query_retrieve($filter=[], $options=[]) : \HexMakina\Crudites\Queries\BaseQuery
+  public static function query_retrieve($filter = [], $options = []) : \HexMakina\Crudites\Queries\BaseQuery
   {
 
     $searchable_fields = [self::ISO_NAME, self::ISO_3, self::ISO_2B, self::ISO_2T, self::ISO_1];
 
     $Query = static::table()->select();
 
-    if(isset($filter['name']))
+    if (isset($filter['name']))
     {
 
     }
 
-    if(isset($filter['code']))
+    if (isset($filter['code']))
     {
 
     }
 
-    if(isset($filter['term']))
+    if (isset($filter['term']))
     {
       $Query->aw_filter_content(['term' => $filter['term'], 'fields' => $searchable_fields], $Query->table_label(), 'OR');
     }
 
-    if(isset($filter['requires_authority']) && isset(self::ISO_SETS[$filter['requires_authority']]))
+    if (isset($filter['requires_authority']) && isset(self::ISO_SETS[$filter['requires_authority']]))
     {
       $Query->aw_not_empty($filter['requires_authority']);
     }
 
-    if(isset($filter['types']))
+    if (isset($filter['types']))
     {
       $wc = sprintf('AND Type IN (\'%s\') ', implode('\', \'', array_keys(self::types())));
       $Query->and_where($wc);
     }
-    if(isset($filter['scopes']))
+    if (isset($filter['scopes']))
     {
       $wc = sprintf('AND Scope IN (\'%s\') ', implode('\', \'', array_keys(self::scopes())));
       $Query->and_where($wc);
@@ -99,11 +99,11 @@ 
     return $Query;
   }
 
-  public static function search_language($term, $authority=null)
+  public static function search_language($term, $authority = null)
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
 		$ret = [];
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
 
     return $ret;
@@ -115,7 +115,7 @@ 
     $Query->aw_eq(self::ISO_3, $code);
     $rows = $Query->ret_col();
 
-    if(isset($rows[0])) // only 1 result
+    if (isset($rows[0])) // only 1 result
       return current($rows);
 
     return null; // no results

Braces +6 added lines, -3 removed lines

@@ -103,8 +103,9 @@ 
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
 		$ret = [];
-		foreach($rows as $row)
-		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+		foreach($rows as $row) {
+				   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+		}
 
     return $ret;
   }
@@ -115,8 +116,10 @@ 
     $Query->aw_eq(self::ISO_3, $code);
     $rows = $Query->ret_col();
 
-    if(isset($rows[0])) // only 1 result
+    if(isset($rows[0])) {
+      // only 1 result
       return current($rows);
+    }
 
     return null; // no results
   }