psfs / core

src/command/PSFSConsole.php

Braces +6 added lines, -2 removed lines

@@ -31,14 +31,18 @@
     //Hidratamos con los comandos de PSFS
     $commands = new Finder();
     $commands->in(__DIR__)->notName("PSFSConsole.php");
-    foreach ($commands as $com) include_once($com->getRealPath());
+    foreach ($commands as $com) {
+        include_once($com->getRealPath());
+    }
 
     //Hidratamos con los comandos de los módulos
     if (file_exists(CORE_DIR))
     {
         $commands = new Finder();
         $commands->in(CORE_DIR)->path("Command")->name("*.php");
-        foreach ($commands as $com) include_once($com->getRealPath());
+        foreach ($commands as $com) {
+            include_once($com->getRealPath());
+        }
     }
 
     $console->run();

src/base/dto/Form.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         {
             $array = array();
             $array['fields'] = array();
-            foreach($this->fields as $field) {
+            foreach ($this->fields as $field) {
                 $array['fields'][] = $field->__toArray();
             }
             return $array;

src/base/types/AuthApi.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
         {
             $namespace = explode('\\', $this->getModelTableMap());
             $module = strtolower($namespace[0]);
-            $secret = Config::getInstance()->get($module . '.api.secret');
+            $secret = Config::getInstance()->get($module.'.api.secret');
             if (NULL === $secret) {
                 $secret = Config::getInstance()->get("api.secret");
             }
             if (NULL === $secret) {
                 $auth = TRUE;
-            } else {
+            }else {
                 $token = Request::getInstance()->getHeader('X-API-SEC-TOKEN');
                 if (array_key_exists('API_TOKEN', $this->query)) {
                     $token = $this->query['API_TOKEN'];

src/base/types/interfaces/AuthInterface.php

Doc Comments +12 added lines

@@ -7,7 +7,19 @@
  * @package PSFS\base\types\interfaces
  */
 interface AuthInterface {
+
+    /**
+     * @return boolean
+     */
     function isLogged();
+
+    /**
+     * @return boolean
+     */
     function isAdmin();
+
+    /**
+     * @return boolean
+     */
     function canDo($action);
 }

src/base/types/interfaces/ControllerInterface.php

Doc Comments +8 added lines

@@ -7,6 +7,14 @@
  * @package PSFS\base\types\interfaces
  */
 interface ControllerInterface {
+
+    /**
+     * @return string|null
+     */
     public function render($template, Array $vars = null);
+
+    /**
+     * @return void
+     */
     public function response($response, $type = 'text/html');
 }

src/services/GeneratorService.php

Spacing +42 added lines, -42 removed lines

@@ -5,7 +5,7 @@ 
     use PSFS\base\config\Config;
     use PSFS\base\Service;
 
-    class GeneratorService extends Service{
+    class GeneratorService extends Service {
         /**
          * @Inyectable
          * @var \PSFS\base\config\Config Servicio de configuración
@@ -30,25 +30,25 @@ 
          */
         public static function findTranslations($path, $locale)
         {
-            $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+            $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
             $translations = array();
-            if(file_exists($path))
+            if (file_exists($path))
             {
                 $d = dir($path);
-                while(false !== ($dir = $d->read()))
+                while (false !== ($dir = $d->read()))
                 {
                     Config::createDir($locale_path);
-                    if(!file_exists($locale_path . 'translations.po')) {
-                        file_put_contents($locale_path . 'translations.po', '');
+                    if (!file_exists($locale_path.'translations.po')) {
+                        file_put_contents($locale_path.'translations.po', '');
                     }
                     $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir);
-                    $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ". $inspect_path . DIRECTORY_SEPARATOR ."*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po";
-                    if(is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./',$dir) == 0)
+                    $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ".$inspect_path.DIRECTORY_SEPARATOR."*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po";
+                    if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0)
                     {
-                        $res = _('Revisando directorio: ') . $inspect_path;
-                        $res .= _('Comando ejecutado: '). $cmd_php;
+                        $res = _('Revisando directorio: ').$inspect_path;
+                        $res .= _('Comando ejecutado: ').$cmd_php;
                         $res .= shell_exec($cmd_php);
                         usleep(10);
                         $translations[] = $res;
@@ -68,7 +68,7 @@ 
          */
         public function createStructureModule($module, $force = false, $type = "")
         {
-            $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
+            $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
             $module = ucfirst($module);
             $this->createModulePath($module, $mod_path);
             $this->createModulePathTree($module, $mod_path);
@@ -89,7 +89,7 @@ 
             //Creamos el directorio base de los módulos
             Config::createDir($mod_path);
             //Creamos la carpeta del módulo
-            Config::createDir($mod_path . $module);
+            Config::createDir($mod_path.$module);
         }
 
         /**
@@ -102,13 +102,13 @@ 
             //Creamos las carpetas CORE del módulo
             $this->log->infoLog("Generamos la estructura");
             $paths = array("Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test");
-            foreach($paths as $path) {
-                Config::createDir($mod_path . $module . DIRECTORY_SEPARATOR . $path);
+            foreach ($paths as $path) {
+                Config::createDir($mod_path.$module.DIRECTORY_SEPARATOR.$path);
             }
             //Creamos las carpetas de los assets
             $htmlPaths = array("css", "js", "img", "media", "font");
-            foreach($htmlPaths as $path) {
-                Config::createDir($mod_path . $module . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            foreach ($htmlPaths as $path) {
+                Config::createDir($mod_path.$module.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
             }
         }
 
@@ -138,15 +138,15 @@ 
         private function createModuleModels($module)
         {
             //Generamos las clases de propel y la configuración
-            $exec = "export PATH=\$PATH:/opt/local/bin; " . BASE_DIR . DIRECTORY_SEPARATOR . "vendor" . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "propel ";
-            $schemaOpt = " --schema-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Config";
-            $opt = " --config-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Config --output-dir=" . CORE_DIR . " --verbose";
-            $ret = shell_exec($exec . "build" . $opt . $schemaOpt);
+            $exec = "export PATH=\$PATH:/opt/local/bin; ".BASE_DIR.DIRECTORY_SEPARATOR."vendor".DIRECTORY_SEPARATOR."bin".DIRECTORY_SEPARATOR."propel ";
+            $schemaOpt = " --schema-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Config";
+            $opt = " --config-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Config --output-dir=".CORE_DIR." --verbose";
+            $ret = shell_exec($exec."build".$opt.$schemaOpt);
 
             $this->log->infoLog("Generamos clases invocando a propel:\n $ret");
-            $ret = shell_exec($exec . "sql:build" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Config" . $schemaOpt);
+            $ret = shell_exec($exec."sql:build".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Config".$schemaOpt);
             $this->log->infoLog("Generamos sql invocando a propel:\n $ret");
-            $ret = shell_exec($exec . "config:convert" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Config");
+            $ret = shell_exec($exec."config:convert".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Config");
             $this->log->infoLog("Generamos configuración invocando a propel:\n $ret");
         }
 
@@ -165,7 +165,7 @@ 
                 "module" => $module,
                 "controllerType" => $controllerType,
             ));
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Controller" . DIRECTORY_SEPARATOR . "{$module}Controller.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Controller".DIRECTORY_SEPARATOR."{$module}Controller.php", $force);
         }
 
         /**
@@ -178,11 +178,11 @@ 
         private function generateBaseApiTemplate($module, $mod_path, $force = false, $controllerType = "")
         {
             $created = true;
-            $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
-            if(file_exists($modelPath)) {
+            $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
+            if (file_exists($modelPath)) {
                 $dir = dir($modelPath);
-                while($file = $dir->read()) {
-                    if(!in_array($file, array('.', '..')) && !preg_match('/Query\.php$/i', $file) && preg_match('/\.php$/i', $file)) {
+                while ($file = $dir->read()) {
+                    if (!in_array($file, array('.', '..')) && !preg_match('/Query\.php$/i', $file) && preg_match('/\.php$/i', $file)) {
                         $filename = str_replace(".php", "", $file);
                         $this->log->infoLog("Generamos Api BASES para {$filename}");
                         $this->createApiBaseFile($module, $mod_path, $filename);
@@ -203,7 +203,7 @@ 
         {
             //Generamos el fichero de configuración
             $this->log->infoLog("Generamos fichero vacío de configuración");
-            return $this->writeTemplateToFile("<?php\n\t", $mod_path . $module . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php", $force);
+            return $this->writeTemplateToFile("<?php\n\t", $mod_path.$module.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php", $force);
         }
 
         /**
@@ -216,8 +216,8 @@ 
         {
             //Generamos el fichero de configuración
             $this->log->infoLog("Generamos ficheros para assets base");
-            $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", $mod_path . $module . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css", false);
-            $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", $mod_path . $module . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js", false);
+            $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", $mod_path.$module.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css", false);
+            $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", $mod_path.$module.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js", false);
             return ($css && $js);
         }
 
@@ -234,7 +234,7 @@ 
             $controller = $this->tpl->dump("generator/service.template.twig", array(
                 "module" => $module,
             ));
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$module}Service.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$module}Service.php", $force);
         }
 
         /**
@@ -250,7 +250,7 @@ 
             $autoloader = $this->tpl->dump("generator/autoloader.template.twig", array(
                 "module" => $module,
             ));
-            return $this->writeTemplateToFile($autoloader, $mod_path . $module . DIRECTORY_SEPARATOR . "autoload.php", $force);
+            return $this->writeTemplateToFile($autoloader, $mod_path.$module.DIRECTORY_SEPARATOR."autoload.php", $force);
         }
 
         /**
@@ -267,7 +267,7 @@ 
                 "module" => $module,
                 "db"     => $this->config->get("db_name"),
             ));
-            return $this->writeTemplateToFile($schema, $mod_path . $module . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml", $force);
+            return $this->writeTemplateToFile($schema, $mod_path.$module.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml", $force);
         }
 
         /**
@@ -287,7 +287,7 @@ 
                 "pass"   => $this->config->get("db_password"),
                 "db"     => $this->config->get("db_name"),
             ));
-            return $this->writeTemplateToFile($build_properties, $mod_path . $module . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml", $force);
+            return $this->writeTemplateToFile($build_properties, $mod_path.$module.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml", $force);
         }
 
         /**
@@ -303,7 +303,7 @@ 
             $index = $this->tpl->dump("generator/index.template.twig", array(
                 "module" => $module,
             ));
-            return $this->writeTemplateToFile($index, $mod_path . $module . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig", $force);
+            return $this->writeTemplateToFile($index, $mod_path.$module.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig", $force);
         }
 
         /**
@@ -317,13 +317,13 @@ 
             $created = false;
             if ($force || !file_exists($filename)) {
                 try {
-                    $this->cache->storeData($filename, $fileContent, Cache::TEXT,true);
+                    $this->cache->storeData($filename, $fileContent, Cache::TEXT, true);
                     $created = true;
-                } catch(\Exception $e) {
+                }catch (\Exception $e) {
                     $this->log->errorLog($e->getMessage());
                 }
-            } else{
-                $this->log->errorLog($filename . _(' not exists or cant write'));
+            }else {
+                $this->log->errorLog($filename._(' not exists or cant write'));
             }
             return $created;
         }
@@ -343,7 +343,7 @@ 
                 "api"            => $api
             ));
 
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Api" . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Api".DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
         }
 
         /**
@@ -362,6 +362,6 @@ 
                 "api"            => $api
             ));
 
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Api" . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Api".DIRECTORY_SEPARATOR."{$api}.php", $force);
         }
     }

Doc Comments +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 
         /**
          * Método que revisa las traducciones directorio a directorio
-         * @param $path
+         * @param string $path
          * @param $locale
          * @return array
          */
@@ -95,8 +95,8 @@ 
 
         /**
          * Servicio que genera la estructura base
-         * @param $module
-         * @param $mod_path
+         * @param string $module
+         * @param string $mod_path
          */
         private function createModulePathTree($module, $mod_path)
         {
@@ -370,7 +370,7 @@ 
          * Method that copy resources recursively
          * @param string $dest
          * @param boolean $force
-         * @param $filename_path
+         * @param string $filename_path
          * @param boolean $debug
          */
         public static function copyResources($dest, $force, $filename_path, $debug)

Braces +1 added lines, -1 removed lines

@@ -380,7 +380,7 @@
                 if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
                     if (is_dir($filename_path)) {
                         self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
-                    }else {
+                    } else {
                         if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
                             throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
                         }

src/services/DocumentorService.php

Doc Comments +1 added lines, -1 removed lines

@@ -371,7 +371,7 @@
          * @param array $parts
          * @param int $partLength
          *
-         * @return array
+         * @return string[]
          */
         private static function extractTsAndMod(array &$parts, $partLength)
         {

Indentation +1 added lines, -1 removed lines

@@ -422,7 +422,7 @@
                                 "type" => $type,
                             ];
                             if (strlen($format)) {
-                               $dto['properties'][$field]['format'] = $format;
+                                $dto['properties'][$field]['format'] = $format;
                             }
                         }
                     }

Spacing +15 added lines, -15 removed lines

@@ -33,7 +33,7 @@ 
                         if (!preg_match('/^\@ROOT/i', $domain)) {
                             $modules[] = str_replace('/', '', str_replace('@', '', $domain));
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         $modules[] = $e->getMessage();
                     }
                 }
@@ -51,7 +51,7 @@ 
          */
         public function extractApiEndpoints($module)
         {
-            $module_path = CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Api";
+            $module_path = CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Api";
             $endpoints = [];
             if (file_exists($module_path)) {
                 $finder = new Finder();
@@ -59,7 +59,7 @@ 
                 if (count($finder)) {
                     /** @var \SplFileInfo $file */
                     foreach ($finder as $file) {
-                        $namespace = "\\{$module}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                        $namespace = "\\{$module}\\Api\\".str_replace('.php', '', $file->getFilename());
                         $endpoints[$namespace] = $this->extractApiInfo($namespace);
                     }
                 }
@@ -88,7 +88,7 @@ 
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
                 }
@@ -221,9 +221,9 @@ 
             if ($reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 foreach ($reflector->getProperties(\ReflectionMethod::IS_PUBLIC) as $property) {
                     $type = $this->extractVarType($property->getDocComment());
-                    if(class_exists($type)) {
+                    if (class_exists($type)) {
                         $properties[$property->getName()] = $this->extractModelFields($type);
-                    } else {
+                    }else {
                         $properties[$property->getName()] = $type;
                     }
                 }
@@ -242,7 +242,7 @@ 
          */
         protected function extractReturn($model, $comments = '')
         {
-            $modelDto  = [];
+            $modelDto = [];
             preg_match('/\@return\ (.*)\((.*)\)\n/i', $comments, $returnTypes);
             if (count($returnTypes)) {
                 // Extract principal DTO information
@@ -295,7 +295,7 @@ 
                 } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                     $payload = $this->extractDtoProperties($namespace);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
             }
 
@@ -331,7 +331,7 @@ 
                         if (in_array($methodInfo['method'], ['POST', 'PUT'])) {
                             $methodInfo['payload'] = $this->extractPayload($modelNamespace, $docComments);
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         jpre($e->getMessage());
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
@@ -349,7 +349,7 @@ 
          */
         public static function translateSwaggerFormats($format)
         {
-            switch(strtolower($format)) {
+            switch (strtolower($format)) {
                 case 'bool':
                 case 'boolean':
                     $swaggerType = 'boolean';
@@ -410,13 +410,13 @@ 
                             ]]);
                             if (array_key_exists($subDtoName, $subDto)) {
                                 $definitions = $subDto;
-                            } else {
+                            }else {
                                 $definitions[$subDtoName] = $subDto;
                             }
                             $dto['properties'][$field] = [
-                                '$ref' => "#/definitions/" . $subDtoName,
+                                '$ref' => "#/definitions/".$subDtoName,
                             ];
-                        } else {
+                        }else {
                             list($type, $format) = self::translateSwaggerFormats($format);
                             $dto['properties'][$field] = [
                                 "type" => $type,
@@ -453,7 +453,7 @@ 
                     "url" => Router::getInstance()->getRoute(''),
                 ]
             ];
-            foreach($endpoints as $model) {
+            foreach ($endpoints as $model) {
                 foreach ($model as $endpoint) {
                     $dtos += self::extractSwaggerDefinition($endpoint);
                 }
@@ -472,7 +472,7 @@ 
         protected function extractDtoName($dto, $isArray = false)
         {
             $dto = explode('\\', $dto);
-            $modelDto = array_pop($dto) . "Dto";
+            $modelDto = array_pop($dto)."Dto";
             if ($isArray) {
                 $modelDto .= "List";
             }

src/base/types/Api.php

Spacing +19 added lines, -19 removed lines

@@ -180,7 +180,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -188,7 +188,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($field);
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($field);
                     }
                 }
@@ -203,7 +203,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
             if (!empty($this->extraColumns)) {
                 foreach ($this->extraColumns as $expression => $columnName) {
@@ -217,7 +217,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -227,7 +227,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addFilters(ModelCriteria &$query)
+        private function addFilters(ModelCriteria & $query)
         {
             if (count($this->query) > 0) {
                 foreach ($this->query as $field => $value) {
@@ -245,7 +245,7 @@ 
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $text = preg_replace('/\ /', '%', $text);
                             $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
                     }
@@ -268,10 +268,10 @@ 
                 list($page, $limit) = $this->extractPagination();
                 if ($limit == -1) {
                     $this->list = $query->find($this->con);
-                } else {
+                }else {
                     $this->list = $query->paginate($page, $limit, $this->con);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -288,7 +288,7 @@ 
                 $this->joinTables($query);
                 $this->addExtraColumns($query);
                 $this->model = $query->findPk($pk);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -376,7 +376,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 jpre($e->getMessage(), TRUE);
                 Logger::getInstance()->errorLog($e->getMessage());
             }
@@ -405,7 +405,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -449,7 +449,7 @@ 
          */
         private function extractQuery()
         {
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
             $query = $queryReflector->getMethod('create')->invoke(NULL);
 
@@ -493,7 +493,7 @@ 
             if ($this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -537,7 +537,7 @@ 
             return $this->render('api.admin.html.twig', array(
                 "api"    => $this->getApi(),
                 "domain" => $this->domain,
-                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
+                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
             ));
         }
 
@@ -559,16 +559,16 @@ 
             /** @var TableMap $map */
             $map = $this->getModelTableMap();
             $fields = $map::getTableMap();
-            foreach($fields->getFieldNames() as $field) {
+            foreach ($fields->getFieldNames() as $field) {
                 $fDto = new Field($field, _($field));
                 /** @var ColumnMap $mappedColumn */
                 $mappedColumn = $fields->getColumn($field);
-                if($mappedColumn->isForeignKey()) {
+                if ($mappedColumn->isForeignKey()) {
                     $fDto->type = Field::COMBO_TYPE;
                     $fDto->required = $mappedColumn->isNotNull();
                     $relatedModel = strtolower($mappedColumn->getRelation()->getForeignTable()->getPhpName());
                     $fDto->entity = $relatedModel;
-                    $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel . '-pk');
+                    $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel.'-pk');
                 } elseif ($mappedColumn->isPrimaryKey()) {
                     $fDto->type = Field::HIDDEN_TYPE;
                     $fDto->required = false;
@@ -595,7 +595,7 @@ 
                 $return = $this->list->toArray();
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
 
@@ -615,7 +615,7 @@ 
             $return = array();
             if (NULL === $model) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 

src/services/AdminServices.php

Spacing +19 added lines, -19 removed lines

@@ -6,7 +6,7 @@ 
     use PSFS\controller\Admin;
     use Symfony\Component\Finder\Finder;
 
-    class AdminServices extends Service{
+    class AdminServices extends Service {
 
         /**
          * @Inyectable
@@ -30,10 +30,10 @@ 
          */
         public function setAdminHeaders()
         {
-            if("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
+            if ("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
-            header('WWW-Authenticate: Basic Realm="' . $platform. '"');
+            header('WWW-Authenticate: Basic Realm="'.$platform.'"');
             echo _("Zona restringida");
             exit();
         }
@@ -45,9 +45,9 @@ 
         public function getAdmins()
         {
             $admins = $this->security->getAdmins();
-            if(!empty($admins))
+            if (!empty($admins))
             {
-                if(!$this->security->checkAdmin())
+                if (!$this->security->checkAdmin())
                 {
                     $this->setAdminHeaders();
                 }
@@ -62,17 +62,17 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if (!empty($admins)) foreach ($admins as &$admin)
             {
-                if(isset($admin["profile"]))
+                if (isset($admin["profile"]))
                 {
-                    switch($admin["profile"]) {
+                    switch ($admin["profile"]) {
                         case sha1('admin'): $admin['class'] = 'warning'; break;
                         case sha1('superadmin'): $admin['class'] = 'info'; break;
                         default:
                         case sha1('user'): $admin['class'] = 'primary'; break;
                     }
-                }else{
+                }else {
                     $admin["class"] = "primary";
                 }
             }
@@ -88,12 +88,12 @@ 
             $files->files()->in(LOG_DIR)->name("*.log")->sortByModifiedTime();
             $logs = array();
             /** @var \SplFileInfo $file */
-            foreach($files as $file)
+            foreach ($files as $file)
             {
-                $size = $file->getSize() / 8 / 1024;
+                $size = $file->getSize()/8/1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -117,27 +117,27 @@ 
             $files->files()->in(LOG_DIR)->name($selectedLog);
             $file = null;
             $log = array();
-            foreach($files as $match)
+            foreach ($files as $match)
             {
                 $file = $match;
                 break;
             }
             /** @var \SplFileInfo $file */
-            if(!empty($file))
+            if (!empty($file))
             {
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
                 $monthOpen = $dateTime->format("m");
-                $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename());
+                $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename());
                 krsort($content);
                 $detailLog = array();
-                foreach($content as &$line)
+                foreach ($content as &$line)
                 {
                     list($line, $detail) = $this->parseLogLine($line, $match);
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if (count($detailLog) >= 1000) break;
                 }
                 $log = $detailLog;
             }
@@ -166,7 +166,7 @@ 
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';
                 $type = explode(".", $type);
-                $type = count($type)>1 ? $type[1] : $type[0];
+                $type = count($type) > 1 ? $type[1] : $type[0];
                 switch ($type) {
                     case 'INFO':
                         $detail["type"] = "success";
@@ -182,7 +182,7 @@ 
                         break;
                 }
 
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $detail = array(
                     "type" => "danger",
                 );

Braces +18 added lines, -7 removed lines

@@ -31,7 +31,9 @@ 
          */
         public function setAdminHeaders()
         {
-            if("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
+            if("login" === $this->config->get("admin_login")) {
+                return Admin::getInstance()->adminLogin("admin-setup");
+            }
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
             header('WWW-Authenticate: Basic Realm="' . $platform. '"');
@@ -63,17 +65,20 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if(!empty($admins)) {
+                foreach($admins as &$admin)
             {
                 if(isset($admin["profile"]))
                 {
                     switch($admin["profile"]) {
-                        case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; break;
+                        case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning';
+            }
+            break;
                         case Security::ADMIN_ID_TOKEN: $admin['class'] = 'info'; break;
                         default:
                         case Security::USER_ID_TOKEN: $admin['class'] = 'primary'; break;
                     }
-                }else{
+                } else{
                     $admin["class"] = "primary";
                 }
             }
@@ -94,7 +99,9 @@ 
                 $size = $file->getSize() / 8 / 1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if(!isset($logs[$dateTime->format("Y")])) {
+                    $logs[$dateTime->format("Y")] = array();
+                }
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -138,7 +145,9 @@ 
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if(count($detailLog) >= 1000) {
+                        break;
+                    }
                 }
                 $log = $detailLog;
             }
@@ -162,7 +171,9 @@ 
 
                     $detail = json_decode($match[0][0], TRUE);
                 }
-                if (empty($detail)) $detail = array();
+                if (empty($detail)) {
+                    $detail = array();
+                }
                 preg_match_all('/\>\ (.*):/i', $line, $match);
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';