HexMakina / kadro

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