HexMakina / kadro

Controllers/ORM.php

Spacing +17 added lines, -17 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(Configuration::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;
@@ -155,11 +155,11 @@ 
         $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'));
     }
 
-    private function listing_fields_from_listing($class_name, $listing){
+    private function listing_fields_from_listing($class_name, $listing) {
       $ret = [];
 
       $current = current($listing);
@@ -173,7 +173,7 @@ 
       return $listing_fields;
     }
 
-    private function listing_fields_from_table($class_name){
+    private function listing_fields_from_table($class_name) {
       $ret = [];
       $hidden_columns = ['created_by', 'created_on', 'password'];
       foreach ($class_name::table()->columns() as $column) {
@@ -184,7 +184,7 @@ 
       return $ret;
     }
 
-    private function listing_fields($class_name, $listing){
+    private function listing_fields($class_name, $listing) {
       $listing_fields = [];
 
 
@@ -219,7 +219,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) {
@@ -232,7 +232,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());
         }
     }
@@ -251,7 +251,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);
         }
 
@@ -263,10 +263,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));
         }
     }
@@ -278,10 +278,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);
         }
     }
@@ -305,7 +305,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;
@@ -342,7 +342,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
@@ -354,7 +354,7 @@ 
     {
         $route_params = [];
 
-        $route_name = get_class($model)::model_type() . '_';
+        $route_name = get_class($model)::model_type().'_';
         if ($model->isNew()) {
             $route_name .= 'new';
         } else {