psfs / core

src/base/config/ModuleForm.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             "Auth" => _("Requiere autenticación de usuario"),
             "AuthAdmin" => _("Requiere autenticación de administrador"),
         );
-        if(Config::getParam('psfs.auth')) {
+        if (Config::getParam('psfs.auth')) {
             $controllerTypes['SessionAuthApi'] = _('Requiere autenticación usando PSFS AUTH');
         }
         $this->add('module', array(

src/base/types/helpers/AdminHelper.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
     {
         $routes = [];
         foreach ($systemRoutes as $route => $params) {
-            if(isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
+            if (isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
                 $module = strtoupper($params['module']);
                 $mode = $params["visible"] ? 'visible' : 'hidden';
                 $routes[$module][$mode][] = [
@@ -41,11 +41,11 @@ 
                 ];
             }
         }
-        foreach($routes as $module => &$route) {
-            if(array_key_exists('visible', $route)) {
+        foreach ($routes as $module => &$route) {
+            if (array_key_exists('visible', $route)) {
                 uasort($route["visible"], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
-            if(array_key_exists('hidden', $route)) {
+            if (array_key_exists('hidden', $route)) {
                 uasort($route["hidden"], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
         }

src/controller/GeneratorController.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function generateModule()
     {
-        Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri());
+        Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri());
         /* @var $form \PSFS\base\config\ConfigForm */
         $form = new ModuleForm();
         $form->build();
@@ -61,8 +61,8 @@ 
                 $this->gen->createStructureModule($module, false, $type, $apiClass);
                 Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, _("Módulo %s generado correctamente")));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch (\Exception $e) {
-                Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (\Exception $e) {
+                Logger::getInstance()->infoLog($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 Security::getInstance()->setFlash("callback_message", $e->getMessage());
             }
         }

src/base/types/helpers/GeneratorHelper.php

Spacing +16 added lines, -16 removed lines

@@ -19,10 +19,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::deleteDir($dir . "/" . $object);
-                    } else {
-                        unlink($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::deleteDir($dir."/".$object);
+                    }else {
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -38,10 +38,10 @@ 
     {
         $rootDirs = array("css", "js", "media", "font");
         foreach ($rootDirs as $dir) {
-            if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) {
+            if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
-                    self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (\Exception $e) {
+                    self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage());
                 }
             }
@@ -57,12 +57,12 @@ 
     {
         try {
             if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                throw new \Exception(_('Can\'t create directory ') . $dir);
+                throw new \Exception(_('Can\'t create directory ').$dir);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
             if (!file_exists(dirname($dir))) {
-                throw new GeneratorException($e->getMessage() . $dir);
+                throw new GeneratorException($e->getMessage().$dir);
             }
         }
     }
@@ -73,7 +73,7 @@ 
      */
     public static function getTemplatePath()
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -91,15 +91,15 @@ 
      * @throws GeneratorException
      */
     public static function checkCustomNamespaceApi($namespace) {
-        if(!empty($namespace)) {
-            if(class_exists($namespace)) {
+        if (!empty($namespace)) {
+            if (class_exists($namespace)) {
                 $reflector = new \ReflectionClass($namespace);
-                if(!$reflector->isSubclassOf(\PSFS\base\types\Api::class)) {
+                if (!$reflector->isSubclassOf(\PSFS\base\types\Api::class)) {
                     throw new GeneratorException(_('La clase definida debe extender de PSFS\\\base\\\types\\\Api'), 501);
-                } elseif(!$reflector->isAbstract()) {
+                } elseif (!$reflector->isAbstract()) {
                     throw new GeneratorException(_('La clase definida debe ser abstracta'), 501);
                 }
-            } else {
+            }else {
                 throw new GeneratorException(_('La clase definida para extender la API no existe'), 501);
             }
         }

src/base/Cache.php

Doc Comments +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
 
     /**
      * Método que guarda en fichero los datos pasados
-     * @param $path
+     * @param string $path
      * @param $data
      * @param int $transform
      * @param boolean $absolute
@@ -201,7 +201,7 @@ 
 
     /**
      * Método estático que revisa si se necesita cachear la respuesta de un servicio o no
-     * @return integer|boolean
+     * @return integer
      */
     public static function needCache()
     {

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if (false === FileHelper::writeFile($path, $data)) {
-            throw new ConfigException(_('No se tienen los permisos suficientes para escribir en el fichero ') . $path);
+            throw new ConfigException(_('No se tienen los permisos suficientes para escribir en el fichero ').$path);
         }
     }
 
@@ -59,7 +59,7 @@ 
     public function getDataFromFile($path, $transform = Cache::TEXT, $absolute = false)
     {
         $data = null;
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         if (file_exists($absolutePath)) {
             $data = FileHelper::readFile($absolutePath);
         }
@@ -75,7 +75,7 @@ 
      */
     private function hasExpiredCache($path, $expires = 300, $absolute = false)
     {
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $lasModificationDate = filemtime($absolutePath);
         return ($lasModificationDate + $expires <= time());
     }
@@ -141,7 +141,7 @@ 
     public function storeData($path, $data, $transform = Cache::TEXT, $absolute = false, $expires = 600)
     {
         $data = Cache::transformData($data, $transform);
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $this->saveTextToFile($data, $absolutePath);
     }
 
@@ -156,11 +156,11 @@ 
     public function readFromCache($path, $expires = 300, callable $function, $transform = Cache::TEXT)
     {
         $data = null;
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) {
+        if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$path)) {
             if (null !== $function && $this->hasExpiredCache($path, $expires)) {
                 $data = call_user_func($function);
                 $this->storeData($path, $data, $transform, false, $expires);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -202,9 +202,9 @@ 
         $action = Security::getInstance()->getSessionKey("__CACHE__");
         if (null !== $action && $action["cache"] > 0) {
             $class = GeneratorHelper::extractClassFromNamespace($action['class']);
-            $filename = sha1($action["http"] . " " . $action["slug"]);
-            $subPath = substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2);
-            $hashPath = $action['module'] . DIRECTORY_SEPARATOR . $class . DIRECTORY_SEPARATOR . $action['method'] . DIRECTORY_SEPARATOR . $subPath . DIRECTORY_SEPARATOR;
+            $filename = sha1($action["http"]." ".$action["slug"]);
+            $subPath = substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2);
+            $hashPath = $action['module'].DIRECTORY_SEPARATOR.$class.DIRECTORY_SEPARATOR.$action['method'].DIRECTORY_SEPARATOR.$subPath.DIRECTORY_SEPARATOR;
         }
         return [$hashPath, $filename];
     }

src/base/config/Config.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
      */
     protected function init()
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) {
             $this->loadConfigData();
         }
         return $this;
@@ -182,10 +182,10 @@ 
             $final_data = array_filter($final_data, function($key, $value) {
                 return in_array($key, Config::$required) || !empty($value);
             }, ARRAY_FILTER_USE_BOTH);
-            $saved = (false !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, json_encode($final_data, JSON_PRETTY_PRINT)));
+            $saved = (false !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, json_encode($final_data, JSON_PRETTY_PRINT)));
             Config::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -217,7 +217,7 @@ 
      */
     public function loadConfigData()
     {
-        $this->config = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE), true) ?: [];
+        $this->config = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE), true) ?: [];
         $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE;
     }
 

Doc Comments +2 added lines, -2 removed lines

@@ -192,7 +192,7 @@ 
     /**
      * Method that returns a config value
      * @param string $param
-     * @param mixed $defaultValue
+     * @param string $defaultValue
      *
      * @return mixed|null
      */
@@ -230,7 +230,7 @@ 
     /**
      * Static wrapper for extracting params
      * @param string $key
-     * @param mixed|null $defaultValue
+     * @param string|boolean $defaultValue
      * @return mixed|null
      */
     public static function getParam($key, $defaultValue = null)

src/base/types/Api.php

Doc Comments +6 added lines

@@ -603,6 +603,9 @@ 
         $this->con->useDebug($this->debug);
     }
 
+    /**
+     * @return string
+     */
     private function getApi()
     {
         $model = explode("\\", $this->getModelNamespace());
@@ -610,6 +613,9 @@ 
         return $model[count($model) - 1];
     }
 
+    /**
+     * @return string
+     */
     public function getDomain()
     {
         $model = explode("\\", $this->getModelNamespace());

Unused Use Statements -2 removed lines

@@ -14,12 +14,10 @@
 use PSFS\base\Request;
 use PSFS\base\Router;
 use PSFS\base\Singleton;
-use PSFS\base\Template;
 use PSFS\base\types\helpers\ApiFormHelper;
 use PSFS\base\types\helpers\ApiHelper;
 use PSFS\base\types\traits\JsonTrait;
 use PSFS\base\types\traits\RouteTrait;
-use PSFS\base\types\traits\SingletonTrait;
 
 /**
  * Class Api

Spacing +27 added lines, -27 removed lines

@@ -186,7 +186,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addOrders(ModelCriteria &$query)
+    private function addOrders(ModelCriteria & $query)
     {
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
@@ -195,7 +195,7 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
@@ -210,8 +210,8 @@ 
         $pks = $tableMap->getPrimaryKeys();
         if (count($pks) == 1) {
             $pks = array_keys($pks);
-            return $tableMap::TABLE_NAME . '.' . $pks[0];
-        } else {
+            return $tableMap::TABLE_NAME.'.'.$pks[0];
+        }else {
             throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta'));
         }
     }
@@ -242,7 +242,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = self::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -253,7 +253,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addExtraColumns(ModelCriteria &$query)
+    private function addExtraColumns(ModelCriteria & $query)
     {
         if (self::API_ACTION_LIST === $this->action) {
             $this->addDefaultListField();
@@ -271,7 +271,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function joinTables(ModelCriteria &$query)
+    protected function joinTables(ModelCriteria & $query)
     {
         //TODO for specific implementations
     }
@@ -293,14 +293,14 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addFilters(ModelCriteria &$query)
+    private function addFilters(ModelCriteria & $query)
     {
         if (count($this->query) > 0) {
             $tableMap = $this->getTableMap();
             foreach ($this->query as $field => $value) {
                 if (self::API_COMBO_FIELD === $field) {
                     ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
-                } else {
+                }else {
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
                 }
             }
@@ -310,7 +310,7 @@ 
     /**
      * @param ModelCriteria $query
      */
-    private function checkReturnFields(ModelCriteria &$query)
+    private function checkReturnFields(ModelCriteria & $query)
     {
         $returnFields = $this->getRequest()->getQuery('__fields');
         if (null !== $returnFields) {
@@ -346,10 +346,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::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -366,7 +366,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());
         }
     }
@@ -457,8 +457,8 @@ 
                 $saved = TRUE;
                 $model = $this->model->toArray();
             }
-        } catch (\Exception $e) {
-            $model = _('Ha ocurrido un error intentando guardar el elemento: ') . $e->getMessage();
+        }catch (\Exception $e) {
+            $model = _('Ha ocurrido un error intentando guardar el elemento: ').$e->getMessage();
             Logger::log($e->getMessage(), LOG_ERR);
         }
 
@@ -488,7 +488,7 @@ 
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = _('Ha ocurrido un error intentando eliminar el elemento, por favor verifica que no tenga otros elementos relacionados');
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
@@ -523,14 +523,14 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray();
-                } else {
+                }else {
                     $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $model = $e->getMessage();
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
-        } else {
+        }else {
             $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
         }
 
@@ -542,7 +542,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($this->con);
 
@@ -586,7 +586,7 @@ 
         if (null !== $this->con && $this->con->inTransaction()) {
             if ($status === 200) {
                 $this->con->commit();
-            } else {
+            }else {
                 $this->con->rollBack();
             }
         }
@@ -638,8 +638,8 @@ 
             "domain" => $this->getDomain(),
             "listLabel" => self::API_LIST_NAME_FIELD,
             'modelId' => self::API_MODEL_KEY_FIELD,
-            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-' . $this->getDomain() . '-' . $this->getApi()), TRUE)),
-            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain() . '-' . 'api-' . $this->getApi() . "-pk"), TRUE)),
+            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-'.$this->getDomain().'-'.$this->getApi()), TRUE)),
+            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain().'-'.'api-'.$this->getApi()."-pk"), TRUE)),
         ), [], '');
     }
 
@@ -679,7 +679,7 @@ 
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::getInstance(get_class($this))->errorLog($e->getMessage());
         }
 
@@ -698,7 +698,7 @@ 
         $return = array();
         if (NULL === $model && method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray();
         }
 
@@ -713,9 +713,9 @@ 
         $pks = '';
         $sep = '';
         foreach ($tableMap->getPrimaryKeys() as $pk) {
-            $pks .= $sep . $pk->getFullyQualifiedName();
+            $pks .= $sep.$pk->getFullyQualifiedName();
             $sep = ', "|", ';
         }
-        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = self::API_LIST_NAME_FIELD;
+        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = self::API_LIST_NAME_FIELD;
     }
 }

src/base/types/helpers/ApiFormHelper.php

Spacing +3 added lines, -3 removed lines

@@ -17,11 +17,11 @@
     public static function checkApiActions($namespace, $domain, $api) {
         $actions = [];
         $reflector = new \ReflectionClass($namespace);
-        if(null !== $reflector) {
-            foreach($reflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $apiAction) {
+        if (null !== $reflector) {
+            foreach ($reflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $apiAction) {
                 $docComments = $apiAction->getDocComment();
                 $action = self::extractAction($docComments);
-                if(null !== $action) {
+                if (null !== $action) {
                     list($route, $info) = RouterHelper::extractRouteInfo($apiAction, $api, $domain);
                     list($method, $cleanRoute) = RouterHelper::extractHttpRoute($route);
                     $formAction = new FormAction();

src/base/dto/Form.php

Spacing +1 added lines, -1 removed lines

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