HexMakina / kadro

Auth/HasOperator.php

Spacing +7 added lines, -7 removed lines

@@ -13,12 +13,12 @@ 
 
   abstract public function get($prop_name);
 
-  public function operator(OperatorInterface $setter=null)
+  public function operator(OperatorInterface $setter = null)
   {
-    if(!is_null($setter))
+    if (!is_null($setter))
       $this->operator = $setter;
 
-    if(is_null($this->operator))
+    if (is_null($this->operator))
     {
       $extract_attempt = self::extract(new Operator(), $this, true);
       if (!is_null($extract_attempt)) {
@@ -32,7 +32,7 @@ 
       }
     }
 
-    if(is_null($this->operator) && !empty($this->get('operator_id')))
+    if (is_null($this->operator) && !empty($this->get('operator_id')))
       $this->operator = Operator::exists($this->get('operator_id'));
 
     return $this->operator;
@@ -41,12 +41,12 @@ 
 
   public static function enhance_query_retrieve($Query, $filters, $options)
   {
-      $Query->autoJoin([ACL::table(),'ACL'], null, 'LEFT OUTER');
+      $Query->autoJoin([ACL::table(), 'ACL'], null, 'LEFT OUTER');
       $permission_alias = $Query->autoJoin([Permission::table(), 'permission'], null, 'LEFT OUTER');
 
       $permission_ids_and_names = [];
-      $permission_ids_and_names [] = sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $permission_alias, 'id', $permission_alias . '_ids');
-      $permission_ids_and_names [] = sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $permission_alias, 'name', $permission_alias . '_names');
+      $permission_ids_and_names [] = sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $permission_alias, 'id', $permission_alias.'_ids');
+      $permission_ids_and_names [] = sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $permission_alias, 'name', $permission_alias.'_names');
       $Query->selectAlso($permission_ids_and_names);
 
       $Query->selectAlso(['operator.name as operator_name', 'operator.active as operator_active']);

Braces +6 added lines, -4 removed lines

@@ -15,8 +15,9 @@ 
 
   public function operator(OperatorInterface $setter=null)
   {
-    if(!is_null($setter))
-      $this->operator = $setter;
+    if(!is_null($setter)) {
+          $this->operator = $setter;
+    }
 
     if(is_null($this->operator))
     {
@@ -32,8 +33,9 @@ 
       }
     }
 
-    if(is_null($this->operator) && !empty($this->get('operator_id')))
-      $this->operator = Operator::exists($this->get('operator_id'));
+    if(is_null($this->operator) && !empty($this->get('operator_id'))) {
+          $this->operator = Operator::exists($this->get('operator_id'));
+    }
 
     return $this->operator;
   }

Controllers/ORM.php

Spacing +13 added lines, -13 removed lines

@@ -58,7 +58,7 @@ 
         $ret = $this->modelType();
 
         if (!is_null($suffix)) {
-            $ret .= '_' . $suffix;
+            $ret .= '_'.$suffix;
         }
 
         return $ret;
@@ -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 {