HexMakina / kadro

Controllers/DisplayController.php

Spacing +5 added lines, -5 removed lines

@@ -49,9 +49,9 @@ 
         $this->viewport('user_messages', $this->logger()->getUserReport());
 
         $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);
@@ -81,8 +81,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())) {

Controllers/ORMController.php

Spacing +14 added lines, -14 removed lines

@@ -57,7 +57,7 @@ 
         $ret = $this->modelType();
 
         if (!is_null($suffix)) {
-            $ret .= '_' . $suffix;
+            $ret .= '_'.$suffix;
         }
 
         return $ret;
@@ -107,7 +107,7 @@ 
     {
         if (is_null($this->model_class_name)) {
             preg_match(LeMarchand::RX_CLASS_NAME, get_called_class(), $m);
-            $this->model_class_name = $this->get($m[1] . 'Class');
+            $this->model_class_name = $this->get($m[1].'Class');
         }
 
         return $this->model_class_name;
@@ -175,8 +175,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()
@@ -207,7 +207,7 @@ 
     {
         $this->errors = $model->save($this->operator()->operator_id()); // returns [errors]
         if (empty($this->errors())) {
-            $this->logger()->nice($this->l('CRUDITES_INSTANCE_ALTERED', [$this->l('MODEL_' . get_class($model)::model_type() . '_INSTANCE')]));
+            $this->logger()->nice($this->l('CRUDITES_INSTANCE_ALTERED', [$this->l('MODEL_'.get_class($model)::model_type().'_INSTANCE')]));
             return $model;
         }
         foreach ($this->errors() as $field => $error_msg) {
@@ -220,7 +220,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());
         }
     }
@@ -239,7 +239,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);
         }
 
@@ -251,10 +251,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));
         }
     }
@@ -266,10 +266,10 @@ 
         }
 
         if ($this->load_model->destroy($this->operator()->operator_id()) === 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->route_back($this->load_model);
         } else {
-            $this->logger()->nice($this->l('CRUDITES_INSTANCE_DESTROYED', [$this->l('MODEL_' . $this->model_type . '_INSTANCE')]));
+            $this->logger()->nice($this->l('CRUDITES_INSTANCE_DESTROYED', [$this->l('MODEL_'.$this->model_type.'_INSTANCE')]));
             $this->route_back($this->model_type);
         }
     }
@@ -293,7 +293,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;
@@ -330,7 +330,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
@@ -342,7 +342,7 @@ 
     {
         $route_params = [];
 
-        $route_name = get_class($model)::model_type() . '_';
+        $route_name = get_class($model)::model_type().'_';
         if ($model->is_new()) {
             $route_name .= 'new';
         } else {