HexMakina / kadro

Models/Traduko.class.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     return false;
   }
 
-  public static function query_retrieve($filters=[], $options=[]) : SelectInterface
+  public static function query_retrieve($filters = [], $options = []) : SelectInterface
   {
     $Query = static::table()->select();
     $Query->order_by(['kategorio', 'ASC']);

Controllers/Interfaces/DisplayControllerInterface.class.php

Spacing +2 added lines, -2 removed lines

@@ -42,9 +42,9 @@
            returns null
    */
    
-   public function viewport($key=null, $value=null, $coercion=false);
+   public function viewport($key = null, $value = null, $coercion = false);
 
-   public function display($custom_template = null, $standalone=false);
+   public function display($custom_template = null, $standalone = false);
 
 }
 

Router/hopper.class.php

Spacing +27 added lines, -27 removed lines

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

common.inc.php

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
   require APP_BASE.'vendor/autoload.php';

 

   require 'PSR4Autoloader.class.php';

-  $loader=new PSR4Autoloader;

+  $loader = new PSR4Autoloader;

   $loader->register(); //Register loader with SPL autoloader stack.

 

   $loader->addNamespace('HexMakina', APP_BASE.'/lib/');

@@ -39,9 +39,9 @@ 
 

   //---------------------------------------------------------------     parametroj

   require_once APP_BASE.'configs/settings.php';

-  $box=new Container\LeMarchand($settings);

+  $box = new Container\LeMarchand($settings);

 

-  foreach($box->get('settings.app.namespaces') as $namespace => $path)

+  foreach ($box->get('settings.app.namespaces') as $namespace => $path)

   {

     $loader->addNamespace($namespace, $path);

   }

@@ -57,9 +57,9 @@ 
 

   //---------------------------------------------------------------        kuketoj

   setcookie('cookie_test', 'test_value', time()+(365 * 24 * 60 * 60), "/", "");

-  $cookies_enabled=isset($_COOKIE['cookie_test']); // houston, do we have cookies ?

+  $cookies_enabled = isset($_COOKIE['cookie_test']); // houston, do we have cookies ?

 

-  if($cookies_enabled === false)

+  if ($cookies_enabled === false)

   {

     ini_set('session.use_cookies', 0);

     ini_set('session.use_only_cookies', 0);

@@ -68,7 +68,7 @@ 
   }

 

 //---------------------------------------------------------------        Session Management

-  $StateAgent=new StateAgent($box->get('settings.app.session_start_options') ?? []);

+  $StateAgent = new StateAgent($box->get('settings.app.session_start_options') ?? []);

   $StateAgent->add_runtime_filters((array)$box->get('settings.filter'));

   $StateAgent->add_runtime_filters((array)($_SESSION['filter'] ?? []));

   $StateAgent->add_runtime_filters((array)($_REQUEST['filter'] ?? []));

@@ -92,24 +92,24 @@ 
   //---------------------------------------------------------------     ŝablonoj
   require_once 'smarty/smarty/libs/Smarty.class.php';
   // Load smarty template parser
-  if(is_null($box->get('settings.smarty.template_path')) || is_null($box->get('settings.smarty.compiled_path')))
+  if (is_null($box->get('settings.smarty.template_path')) || is_null($box->get('settings.smarty.compiled_path')))
       throw new \Exception("SMARTY CONFIG ERROR: missing parameters");
 
-  $smarty=new \Smarty();
+  $smarty = new \Smarty();
   $box->register('template_engine', $smarty);
 
-  $smarty->setTemplateDir($box->get('RouterInterface')->file_root() . $box->get('settings.smarty.template_path').'app');
-  $smarty->addTemplateDir($box->get('RouterInterface')->file_root() . $box->get('settings.smarty.template_path'));
-  $smarty->addTemplateDir(KADRO_BASE . 'Views/');
+  $smarty->setTemplateDir($box->get('RouterInterface')->file_root().$box->get('settings.smarty.template_path').'app');
+  $smarty->addTemplateDir($box->get('RouterInterface')->file_root().$box->get('settings.smarty.template_path'));
+  $smarty->addTemplateDir(KADRO_BASE.'Views/');
 
-  $smarty->setCompileDir(APP_BASE . $box->get('settings.smarty.compiled_path'));
+  $smarty->setCompileDir(APP_BASE.$box->get('settings.smarty.compiled_path'));
   $smarty->setDebugging($box->get('settings.smarty.debug'));
 
-  $smarty->registerClass('Lezer',       '\HexMakina\Lezer\Lezer');
-  $smarty->registerClass('Marker',       '\HexMakina\Marker\Marker');
-  $smarty->registerClass('Form',         '\HexMakina\Marker\Form');
-  $smarty->registerClass('TableToForm',  '\HexMakina\kadro\TableToForm');
-  $smarty->registerClass('Dato',         '\HexMakina\Format\Tempo\Dato');
+  $smarty->registerClass('Lezer', '\HexMakina\Lezer\Lezer');
+  $smarty->registerClass('Marker', '\HexMakina\Marker\Marker');
+  $smarty->registerClass('Form', '\HexMakina\Marker\Form');
+  $smarty->registerClass('TableToForm', '\HexMakina\kadro\TableToForm');
+  $smarty->registerClass('Dato', '\HexMakina\Format\Tempo\Dato');
 
   $smarty->assign('APP_NAME', $box->get('settings.app.name'));
 
@@ -124,7 +124,7 @@ 
   $lezer->init();
 
   $smarty->assign('language', $language);
-  if($cookies_enabled === true)
+  if ($cookies_enabled === true)
     setcookie('lang', $language, time()+(365 * 24 * 60 * 60), "/", "");
 
 }

TableToForm.class.php

Spacing +44 added lines, -44 removed lines

@@ -3,26 +3,26 @@ 
 namespace HexMakina\kadro;
 
 use \HexMakina\Crudites\Interfaces\ModelInterface;
-use \HexMakina\Marker\{Form,Element};
+use \HexMakina\Marker\{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;
     }