HexMakina / kadro

Controllers/ORMController.php

Spacing +17 added lines, -17 removed lines

@@ -32,10 +32,10 @@ 
 
     public function formModel(ModelInterface $setter = null): ModelInterface
     {
-      if(!is_null($setter)){
+      if (!is_null($setter)) {
         $this->form_model = $setter;
       }
-      elseif(is_null($this->form_model)){
+      elseif (is_null($this->form_model)) {
         $reflection = new \ReflectionClass($this->modelClassName());
         $this->form_model = $reflection->newInstanceWithoutConstructor(); //That's it!
       }
@@ -46,17 +46,17 @@ 
     public function modelType(): string
     {
       // have to go through the model to garantee model_type existence via interface
-      if(is_null($this->model_type))
+      if (is_null($this->model_type))
         $this->model_type = get_class($this->formModel())::model_type();
 
       return $this->model_type;
     }
 
-    public function modelPrefix($suffix=null): string
+    public function modelPrefix($suffix = null): string
     {
       $ret = $this->modelType();
 
-      if(!is_null($suffix))
+      if (!is_null($suffix))
         $ret .= '_'.$suffix;
 
       return $ret;
@@ -174,8 +174,8 @@ 
         $this->viewport('listing_fields', $listing_fields);
         $this->viewport('listing_template', $listing_template);
 
-        $this->viewport('route_new', $this->router()->prehop($class_name::model_type() . '_new'));
-        $this->viewport('route_export', $this->router()->prehop($class_name::model_type() . '_export'));
+        $this->viewport('route_new', $this->router()->prehop($class_name::model_type().'_new'));
+        $this->viewport('route_export', $this->router()->prehop($class_name::model_type().'_export'));
     }
 
     public function copy()
@@ -206,7 +206,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) {
@@ -219,7 +219,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());
         }
     }
@@ -238,7 +238,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);
         }
 
@@ -250,10 +250,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));
         }
     }
@@ -265,10 +265,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);
         }
     }
@@ -294,7 +294,7 @@ 
     public function collection_to_csv($collection, $filename)
     {
       // TODO use Format/File/CSV class to generate file
-        $file_path = $this->box('settings.export.directory') . $filename . '.csv';
+        $file_path = $this->box('settings.export.directory').$filename.'.csv';
         $fp = fopen($file_path, 'w');
 
         $header = false;
@@ -331,7 +331,7 @@ 
 
     public function route_new(ModelInterface $model): string
     {
-        return $this->router()->prehop(get_class($model)::model_type() . '_new');
+        return $this->router()->prehop(get_class($model)::model_type().'_new');
     }
 
     public function route_list(ModelInterface $model): string
@@ -343,7 +343,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 {

Braces +7 added lines, -6 removed lines

@@ -34,8 +34,7 @@ 
     {
       if(!is_null($setter)){
         $this->form_model = $setter;
-      }
-      elseif(is_null($this->form_model)){
+      } elseif(is_null($this->form_model)){
         $reflection = new \ReflectionClass($this->modelClassName());
         $this->form_model = $reflection->newInstanceWithoutConstructor(); //That's it!
       }
@@ -46,8 +45,9 @@ 
     public function modelType(): string
     {
       // have to go through the model to garantee model_type existence via interface
-      if(is_null($this->model_type))
-        $this->model_type = get_class($this->formModel())::model_type();
+      if(is_null($this->model_type)) {
+              $this->model_type = get_class($this->formModel())::model_type();
+      }
 
       return $this->model_type;
     }
@@ -56,8 +56,9 @@ 
     {
       $ret = $this->modelType();
 
-      if(!is_null($suffix))
-        $ret .= '_'.$suffix;
+      if(!is_null($suffix)) {
+              $ret .= '_'.$suffix;
+      }
 
       return $ret;
     }