HexMakina / kadro

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/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 {

kadro.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 
         //-- router
         $router = self::$box->get('HexMakina\BlackBox\RouterInterface');
-        $router->addRoutes(require(__DIR__ . '/routes.php'));
+        $router->addRoutes(require(__DIR__.'/routes.php'));
 
         //-- session
         $StateAgent = self::$box->get('HexMakina\BlackBox\StateAgentInterface');
@@ -51,7 +51,7 @@ 
         self::$box->get('\Smarty')->assign('lezer', $lezer);
         self::$box->get('\Smarty')->assign('language', $language);
 
-        setcookie('lang', $language, time() + (365 * 24 * 60 * 60), "/", "");
+        setcookie('lang', $language, time()+(365 * 24 * 60 * 60), "/", "");
 
         return self::$box;
     }
@@ -62,7 +62,7 @@ 
         $setting = 'settings.default.charset';
         if (is_string(self::$box->get($setting))) {
             ini_set('default_charset', self::$box->get($setting));
-            header('Content-type: text/html; charset=' . strtolower(self::$box->get($setting)));
+            header('Content-type: text/html; charset='.strtolower(self::$box->get($setting)));
         } else {
             throw new \UnexpectedValueException($setting);
         }
@@ -70,7 +70,7 @@ 
         // ----     parametroj:linguo
         $setting = 'settings.default.language';
         if (is_string(self::$box->get($setting))) {
-            putenv('LANG=' . self::$box->get($setting));
+            putenv('LANG='.self::$box->get($setting));
             setlocale(LC_ALL, self::$box->get($setting));
         } else {
             throw new \UnexpectedValueException($setting);
@@ -94,7 +94,7 @@ 
         foreach (self::$box->get('settings.smarty.template_extra_directories') as $i => $template_dir) {
             $smarty->addTemplateDir($template_dir);
         }
-        $smarty->addTemplateDir(__DIR__ . '/Views/'); //kadro templates
+        $smarty->addTemplateDir(__DIR__.'/Views/'); //kadro templates
 
         $setting = 'settings.smarty.compiled_path';
         if (is_string(self::$box->get($setting))) {

Auth/HasOperator.php

Spacing +3 added lines, -3 removed lines

@@ -50,12 +50,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']);