HexMakina / kadro

Models/Abilities/Event.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     public function event_label()
     {
-        return '' . $this;
+        return ''.$this;
     }
 
     public static function today($format = Dato::FORMAT)

Controllers/Kadro.php

Spacing +3 added lines, -3 removed lines

@@ -58,15 +58,15 @@
 
     private function trim_request_data()
     {
-        array_walk_recursive($_GET, function (&$value) {
+        array_walk_recursive($_GET, function(&$value) {
             $value = trim($value);
         });
-        array_walk_recursive($_REQUEST, function (&$value) {
+        array_walk_recursive($_REQUEST, function(&$value) {
             $value = trim($value);
         });
 
         if ($this->router()->submits()) {
-            array_walk_recursive($_POST, function (&$value) {
+            array_walk_recursive($_POST, function(&$value) {
                 $value = trim($value);
             });
         }

Controllers/Operator.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 namespace HexMakina\kadro\Controllers;
 
 use HexMakina\Crudites\Crudites;
-use HexMakina\kadro\Auth\{ACL,AccessRefusedException};
+use HexMakina\kadro\Auth\{ACL, AccessRefusedException};
 
 class Operator extends \HexMakina\kadro\Controllers\ORM
 {
@@ -56,7 +56,7 @@ 
     public function dashboard()
     {
         $real_operator_class = get_class($this->operator());
-        $this->viewport('users', $real_operator_class::filter([], ['order_by' => [null,'username', 'ASC']]));
+        $this->viewport('users', $real_operator_class::filter([], ['order_by' => [null, 'username', 'ASC']]));
     }
 
     public function destroy()

TableToForm.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 namespace HexMakina\kadro;
 
 use HexMakina\BlackBox\ORM\ModelInterface;
-use HexMakina\Marker\{Form,Element};
+use HexMakina\Marker\{Form, Element};
 
 class TableToForm
 {
@@ -82,7 +82,7 @@ 
                     $form_field = new Element('div', $form_field, ['class' => $group_class]);
                 }
             }
-            $ret .= PHP_EOL . $form_field;
+            $ret .= PHP_EOL.$form_field;
         }
 
         return $ret;

Braces +12 added lines, -21 removed lines

@@ -12,7 +12,7 @@ 
         $ret = '';
         if (method_exists($model, $field_name)) {
             $ret = $model->$field_name();
-        }elseif (property_exists($model, $field_name)) {
+        } elseif (property_exists($model, $field_name)) {
             $ret = $model->$field_name;
         }
 
@@ -93,31 +93,23 @@ 
         $ret = null;
         if ($field->isAutoIncremented()) {
             $ret = Form::hidden($field->name(), $field_value);
-        }
-        elseif ($field->type()->isBoolean()) {
+        } elseif ($field->type()->isBoolean()) {
             $option_list = $attributes['values'] ?? [0 => 0, 1 => 1];
             $ret = Form::select($field->name(), $option_list, $field_value, $attributes); //
-        }
-        elseif ($field->type()->isInteger()) {
+        } elseif ($field->type()->isInteger()) {
             $ret = Form::input($field->name(), $field_value, $attributes, $errors);
-        }
-        elseif ($field->type()->isYear()) {
+        } elseif ($field->type()->isYear()) {
             $attributes['size'] = $attributes['maxlength'] = 4;
             $ret = Form::input($field->name(), $field_value, $attributes, $errors);
-        }
-        elseif ($field->type()->isDate()) {
+        } elseif ($field->type()->isDate()) {
             $ret = Form::date($field->name(), $field_value, $attributes, $errors);
-        }
-        elseif ($field->type()->isTime()) {
+        } elseif ($field->type()->isTime()) {
             $ret = Form::time($field->name(), $field_value, $attributes, $errors);
-        }
-        elseif ($field->type()->isDatetime()) {
+        } elseif ($field->type()->isDatetime()) {
             $ret = Form::datetime($field->name(), $field_value, $attributes, $errors);
-        }
-        elseif ($field->type()->isText()) {
+        } elseif ($field->type()->isText()) {
             $ret = Form::textarea($field->name(), $field_value, $attributes, $errors);
-        }
-        elseif ($field->type()->isEnum()) {
+        } elseif ($field->type()->isEnum()) {
             $enum_values = [];
             foreach ($field->type()->getEnumValues() as $e_val) {
                 $enum_values[$e_val] = $e_val;
@@ -125,14 +117,13 @@ 
 
             $selected = $attributes['value'] ?? $field_value ?? '';
             $ret = Form::select($field->name(), $enum_values, $selected, $attributes); //
-        }
-        elseif ($field->type()->isString()) {
+        } elseif ($field->type()->isString()) {
             $max_length = $field->type()->getLength();
             $attributes['size'] = $attributes['maxlength'] = $max_length;
             $ret = Form::input($field->name(), $field_value, $attributes, $errors);
+        } else {
+                  $ret = Form::input($field->name(), $field_value, $attributes, $errors);
         }
-        else
-          $ret = Form::input($field->name(), $field_value, $attributes, $errors);
 
         return $ret;
     }

Controllers/Base.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace HexMakina\kadro\Controllers;
 
-use Psr\Container\{ContainerInterface,ContainerExceptionInterface,NotFoundExceptionInterface};
+use Psr\Container\{ContainerInterface, ContainerExceptionInterface, NotFoundExceptionInterface};
 use HexMakina\BlackBox\RouterInterface;
 use HexMakina\BlackBox\Controllers\BaseControllerInterface;
 use Psr\Log\LoggerInterface;

Controllers/Display.php

Spacing +5 added lines, -5 removed lines

@@ -51,9 +51,9 @@ 
         $this->viewport('user_messages', $this->get('HexMakina\BlackBox\StateAgentInterface')->messages());
 
         $this->viewport('web_root', $this->router()->webRoot());
-        $this->viewport('view_path', $this->router()->filePath() . $this->get('settings.smarty.template_path') . 'app/');
-        $this->viewport('view_url', $this->router()->webRoot() . $this->get('settings.smarty.template_path'));
-        $this->viewport('images_url', $this->router()->webRoot() . $this->get('settings.smarty.template_path') . 'images/');
+        $this->viewport('view_path', $this->router()->filePath().$this->get('settings.smarty.template_path').'app/');
+        $this->viewport('view_url', $this->router()->webRoot().$this->get('settings.smarty.template_path'));
+        $this->viewport('images_url', $this->router()->webRoot().$this->get('settings.smarty.template_path').'images/');
 
         foreach ($this->viewport() as $template_var_name => $value) {
             $smarty->assign($template_var_name, $value);
@@ -83,8 +83,8 @@ 
           // 1. check for custom template in the current controller directory
             $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()->targetMethod())) {

Models/Lingvo.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 
     public function __toString()
     {
-        return $this->iso_name() . ' (' . $this->get(self::ISO_3) . ')';
+        return $this->iso_name().' ('.$this->get(self::ISO_3).')';
     }
 
     public function traceable(): bool
@@ -74,11 +74,11 @@ 
         }
 
         if (isset($filter['types'])) {
-            $wc = sprintf("AND " . self::ISO_TYPE . " IN ('%s') ", implode('\', \'', array_keys(self::ISO_TYPES)));
+            $wc = sprintf("AND ".self::ISO_TYPE." IN ('%s') ", implode('\', \'', array_keys(self::ISO_TYPES)));
             $Query->where($wc);
         }
         if (isset($filter['scopes'])) {
-            $wc = sprintf("AND " . self::ISO_SCOPE . " IN ('%s') ", implode('\', \'', array_keys(self::ISO_SCOPES)));
+            $wc = sprintf("AND ".self::ISO_SCOPE." IN ('%s') ", implode('\', \'', array_keys(self::ISO_SCOPES)));
             $Query->where($wc);
         }
 

Controllers/Reception.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace HexMakina\kadro\Controllers;
 
-use HexMakina\kadro\Auth\{Operator,Permission,ACL};
+use HexMakina\kadro\Auth\{Operator, Permission, ACL};
 use HexMakina\kadro\Auth\AccessRefusedException;
 use HexMakina\BlackBox\Auth\OperatorInterface;
 
@@ -25,7 +25,7 @@ 
         }
 
         // MVC Cascade
-        $target_controller = $this->get('Controllers\\' . $router->targetController());
+        $target_controller = $this->get('Controllers\\'.$router->targetController());
 
         if ($target_controller->requiresOperator()) {
             if (is_null($operator_id = $this->get('HexMakina\BlackBox\StateAgentInterface')->operatorId())) {
@@ -72,7 +72,7 @@ 
             $this->logger()->notice('PAGE_CHECKIN_WELCOME', [$operator->name()]);
             $this->router()->hop();
         } catch (\Exception $e) {
-            $this->logger()->warning('KADRO_operator_' . $e->getMessage());
+            $this->logger()->warning('KADRO_operator_'.$e->getMessage());
             $this->router()->hop('checkin');
         }
     }

Controllers/ORM.php

Spacing +14 added lines, -14 removed lines

@@ -58,7 +58,7 @@ 
         $ret = $this->modelType();
 
         if (!is_null($suffix)) {
-            $ret .= '_' . $suffix;
+            $ret .= '_'.$suffix;
         }
 
         return $ret;
@@ -103,7 +103,7 @@ 
     {
         if (is_null($this->model_class_name)) {
             preg_match(LeMarchand::RX_MVC, get_called_class(), $m);
-            $this->model_class_name = $this->get('Models\\' . $m[2] . '::class');
+            $this->model_class_name = $this->get('Models\\'.$m[2].'::class');
         }
 
         return $this->model_class_name;
@@ -167,8 +167,8 @@ 
         $this->viewport('listing_fields', $listing_fields);
         $this->viewport('listing_template', $listing_template);
 
-        $this->viewport('route_new', $this->router()->hyp($class_name::model_type() . '_new'));
-        $this->viewport('route_export', $this->router()->hyp($class_name::model_type() . '_export'));
+        $this->viewport('route_new', $this->router()->hyp($class_name::model_type().'_new'));
+        $this->viewport('route_export', $this->router()->hyp($class_name::model_type().'_export'));
     }
 
     public function copy()
@@ -199,7 +199,7 @@ 
     {
         $this->errors = $model->save($this->operator()->getId()); // returns [errors]
         if (empty($this->errors())) {
-            $this->logger()->notice($this->l('CRUDITES_INSTANCE_ALTERED', [$this->l('MODEL_' . get_class($model)::model_type() . '_INSTANCE')]));
+            $this->logger()->notice($this->l('CRUDITES_INSTANCE_ALTERED', [$this->l('MODEL_'.get_class($model)::model_type().'_INSTANCE')]));
             return $model;
         }
         foreach ($this->errors() as $field => $error_msg) {
@@ -212,7 +212,7 @@ 
     public function before_edit()
     {
         if (!is_null($this->router()->params('id')) && is_null($this->load_model)) {
-            $this->logger()->warning($this->l('CRUDITES_ERR_INSTANCE_NOT_FOUND', [$this->l('MODEL_' . $this->modelClassName()::model_type() . '_INSTANCE')]));
+            $this->logger()->warning($this->l('CRUDITES_ERR_INSTANCE_NOT_FOUND', [$this->l('MODEL_'.$this->modelClassName()::model_type().'_INSTANCE')]));
             $this->router()->hop($this->modelClassName()::model_type());
         }
     }
@@ -231,7 +231,7 @@ 
     public function destroy_confirm()
     {
         if (is_null($this->load_model)) {
-            $this->logger()->warning($this->l('CRUDITES_ERR_INSTANCE_NOT_FOUND', [$this->l('MODEL_' . $this->model_type . '_INSTANCE')]));
+            $this->logger()->warning($this->l('CRUDITES_ERR_INSTANCE_NOT_FOUND', [$this->l('MODEL_'.$this->model_type.'_INSTANCE')]));
             $this->router()->hop($this->model_type);
         }
 
@@ -243,10 +243,10 @@ 
     public function before_destroy() // default: checks for load_model and immortality, hops back to object on failure
     {
         if (is_null($this->load_model)) {
-            $this->logger()->warning($this->l('CRUDITES_ERR_INSTANCE_NOT_FOUND', [$this->l('MODEL_' . $this->model_type . '_INSTANCE')]));
+            $this->logger()->warning($this->l('CRUDITES_ERR_INSTANCE_NOT_FOUND', [$this->l('MODEL_'.$this->model_type.'_INSTANCE')]));
             $this->router()->hop($this->model_type);
         } elseif ($this->load_model->immortal()) {
-            $this->logger()->warning($this->l('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', [$this->l('MODEL_' . $this->model_type . '_INSTANCE')]));
+            $this->logger()->warning($this->l('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', [$this->l('MODEL_'.$this->model_type.'_INSTANCE')]));
             $this->router()->hop($this->route_model($this->load_model));
         }
     }
@@ -258,10 +258,10 @@ 
         }
 
         if ($this->load_model->destroy($this->operator()->getId()) === false) {
-            $this->logger()->info($this->l('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', ['' . $this->load_model]));
+            $this->logger()->info($this->l('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]));
             $this->routeBack($this->load_model);
         } else {
-            $this->logger()->notice($this->l('CRUDITES_INSTANCE_DESTROYED', [$this->l('MODEL_' . $this->model_type . '_INSTANCE')]));
+            $this->logger()->notice($this->l('CRUDITES_INSTANCE_DESTROYED', [$this->l('MODEL_'.$this->model_type.'_INSTANCE')]));
             $this->routeBack($this->model_type);
         }
     }
@@ -285,7 +285,7 @@ 
     public function collection_to_csv($collection, $filename)
     {
       // TODO use Format/File/CSV class to generate file
-        $file_path = $this->get('settings.export.directory') . $filename . '.csv';
+        $file_path = $this->get('settings.export.directory').$filename.'.csv';
         $fp = fopen($file_path, 'w');
 
         $header = false;
@@ -322,7 +322,7 @@ 
 
     public function route_new(ModelInterface $model): string
     {
-        return $this->router()->hyp(get_class($model)::model_type() . '_new');
+        return $this->router()->hyp(get_class($model)::model_type().'_new');
     }
 
     public function route_list(ModelInterface $model): string
@@ -334,7 +334,7 @@ 
     {
         $route_params = [];
 
-        $route_name = get_class($model)::model_type() . '_';
+        $route_name = get_class($model)::model_type().'_';
         if ($model->isNew()) {
             $route_name .= 'new';
         } else {