psfs / core

src/services/GeneratorService.php

Spacing +27 added lines, -27 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function createStructureModule($module, $force = false, $type = "", $apiClass = "")
     {
-        $modPath = CORE_DIR . DIRECTORY_SEPARATOR;
+        $modPath = CORE_DIR.DIRECTORY_SEPARATOR;
         $module = ucfirst($module);
         $this->createModulePath($module, $modPath);
         $this->createModulePathTree($module, $modPath);
@@ -59,7 +59,7 @@ 
      */
     private function createModuleBaseFiles($module, $modPath, $force = false, $controllerType = '')
     {
-        $modulePath = $modPath . $module;
+        $modulePath = $modPath.$module;
         $this->generateControllerTemplate($module, $modulePath, $force, $controllerType);
         $this->generateServiceTemplate($module, $modulePath, $force);
         $this->genereateAutoloaderTemplate($module, $modulePath, $force);
@@ -87,28 +87,28 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
             "class" => $class,
-            "controllerType" => $class . "Base",
+            "controllerType" => $class."Base",
             "is_base" => false
         ));
-        $controller = $this->writeTemplateToFile($controllerBody, $modPath . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
+        $controller = $this->writeTemplateToFile($controllerBody, $modPath.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."{$class}Controller.php", $force);
 
         $controllerBody = $this->tpl->dump("generator/controller.template.twig", array(
             "module" => $module,
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
-            "class" => $class . "Base",
+            "class" => $class."Base",
             "service" => $class,
             "controllerType" => $controllerType,
             "is_base" => true,
             "domain" => $class,
         ));
-        $controllerBase = $this->writeTemplateToFile($controllerBody, $modPath . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $modPath.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
 
-        $filename = $modPath . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php";
+        $filename = $modPath.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php";
         $test = true;
-        if(!file_exists($filename)) {
+        if (!file_exists($filename)) {
             $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
                 "module" => $module,
                 "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
@@ -127,8 +127,8 @@ 
      */
     private function createModuleModels($module, $path)
     {
-        $modulePath = $path . $module;
-        $modulePath = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $modulePath);
+        $modulePath = $path.$module;
+        $modulePath = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $modulePath);
 
         $configGenerator = $this->getConfigGenerator($modulePath);
 
@@ -138,8 +138,8 @@ 
         $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array(
             "module" => $module,
         ));
-        $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $modulePath . DIRECTORY_SEPARATOR . "Config" .
-            DIRECTORY_SEPARATOR . "config.php", true);
+        $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$modulePath.DIRECTORY_SEPARATOR."Config".
+            DIRECTORY_SEPARATOR."config.php", true);
         Logger::log("Generado config genérico para propel");
     }
 
@@ -154,8 +154,8 @@ 
     private function generateBaseApiTemplate($module, $modPath, $force = false, $apiClass = "")
     {
         $created = true;
-        $modelPath = $modPath . $module . DIRECTORY_SEPARATOR . 'Models';
-        $apiPath = $modPath . $module . DIRECTORY_SEPARATOR . 'Api';
+        $modelPath = $modPath.$module.DIRECTORY_SEPARATOR.'Models';
+        $apiPath = $modPath.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             $this->generateApiFiles($module, $force, $apiClass, $dir, $apiPath);
@@ -173,7 +173,7 @@ 
         //Generamos el fichero de configuración
         Logger::log("Generamos fichero vacío de configuración");
         return $this->writeTemplateToFile("<?php\n\t",
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
             $force);
     }
 
@@ -194,7 +194,7 @@ 
             "db" => $this->config->get("db_name"),
         ));
         return $this->writeTemplateToFile($schema,
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
             $force);
     }
 
@@ -212,7 +212,7 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
         ));
         return $this->writeTemplateToFile($buildProperties,
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml",
             $force);
     }
 
@@ -230,7 +230,7 @@ 
             "module" => $module,
         ));
         return $this->writeTemplateToFile($index,
-            $modPath . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
+            $modPath.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
             $force);
     }
 
@@ -260,7 +260,7 @@ 
         ));
 
         return $this->writeTemplateToFile($controller,
-            $modPath . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            $modPath.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
     }
 
     /**
@@ -285,7 +285,7 @@ 
             "package" => $package,
         ));
 
-        return $this->writeTemplateToFile($controller, $modPath . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+        return $this->writeTemplateToFile($controller, $modPath.DIRECTORY_SEPARATOR."{$api}.php", $force);
     }
 
     /**
@@ -302,15 +302,15 @@ 
         $base = $dir->path;
         while ($file = $dir->read()) {
             if (!in_array(strtolower($file), ['.', '..', 'base', 'map'])) {
-                if (is_dir($base . DIRECTORY_SEPARATOR . $file)) {
-                    $this->generateApiFiles($module, $force, $apiClass, dir($base . DIRECTORY_SEPARATOR . $file), $apiPath . DIRECTORY_SEPARATOR . $file, $file);
-                } else if (!preg_match('/Query\.php$/i', $file)
+                if (is_dir($base.DIRECTORY_SEPARATOR.$file)) {
+                    $this->generateApiFiles($module, $force, $apiClass, dir($base.DIRECTORY_SEPARATOR.$file), $apiPath.DIRECTORY_SEPARATOR.$file, $file);
+                }else if (!preg_match('/Query\.php$/i', $file)
                     && !preg_match('/I18n\.php$/i', $file)
                     && preg_match('/\.php$/i', $file)
                 ) {
                     $filename = str_replace(".php", "", $file);
                     $this->log->addLog("Generamos Api BASES para {$filename}");
-                    if($this->checkIfIsModel($module, $filename, $package)) {
+                    if ($this->checkIfIsModel($module, $filename, $package)) {
                         $this->createApiBaseFile($module, $apiPath, $filename, $apiClass, $package);
                         $this->createApi($module, $apiPath, $force, $filename, $package);
                     }
@@ -333,7 +333,7 @@ 
             $parts[] = $package;
         }
         $parts[] = $filename;
-        $namespace = '\\' . implode('\\', $parts);
+        $namespace = '\\'.implode('\\', $parts);
         $reflectorClass = new \ReflectionClass($namespace);
         $isModel = $reflectorClass->isInstantiable();
         return $isModel;

src/services/DocumentorService.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
      */
     public function extractApiEndpoints(array $module)
     {
-        $modulePath = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
+        $modulePath = $module['path'].DIRECTORY_SEPARATOR.'Api';
         $moduleName = $module['name'];
         $endpoints = [];
         if (file_exists($modulePath)) {
@@ -54,7 +54,7 @@ 
                 /** @var SplFileInfo $file */
                 foreach ($finder as $file) {
                     $filename = str_replace([$modulePath, '/'], ['', '\\'], $file->getPathname());
-                    $namespace = "\\{$moduleName}\\Api" . str_replace('.php', '', $filename);
+                    $namespace = "\\{$moduleName}\\Api".str_replace('.php', '', $filename);
                     $info = $this->extractApiInfo($namespace, $moduleName);
                     if (!empty($info)) {
                         $endpoints[$namespace] = $info;
@@ -84,7 +84,7 @@ 
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (Exception $e) {
+                    }catch (Exception $e) {
                         Logger::log($e->getMessage(), LOG_ERR);
                     }
                 }

src/base/extension/CustomTranslateExtension.php

Spacing +11 added lines, -11 removed lines

@@ -48,7 +48,7 @@ 
     {
         // Gather always the base translations
         $standardTranslations = [];
-        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']);
+        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']);
         if (file_exists(self::$filename)) {
             $standardTranslations = json_decode(file_get_contents(self::$filename), true);
         }
@@ -66,32 +66,32 @@ 
         $session = Security::getInstance();
         self::$locale = I18nHelper::extractLocale($session->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY));
         $version = $session->getSessionKey(self::LOCALE_CACHED_VERSION);
-        $configVersion = self::$locale . '_' . Config::getParam('cache.var', 'v1');
+        $configVersion = self::$locale.'_'.Config::getParam('cache.var', 'v1');
         if ($forceReload) {
             Inspector::stats('[translationsCheckLoad] Force translations reload', Inspector::SCOPE_DEBUG);
             self::dropInstance();
             $version = null;
             self::$translations = [];
         }
-        if(count(self::$translations) === 0) {
+        if (count(self::$translations) === 0) {
             Inspector::stats('[translationsCheckLoad] Extracting translations', Inspector::SCOPE_DEBUG);
             self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
-            if(null !== $version && $version === $configVersion) {
+            if (null !== $version && $version === $configVersion) {
                 Inspector::stats('[translationsCheckLoad] Translations loaded from session', Inspector::SCOPE_DEBUG);
                 self::$translations = $session->getSessionKey(self::LOCALE_CACHED_TAG);
-            } else {
+            }else {
                 if (!$useBase) {
                     $customKey = $customKey ?: $session->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
                 }
                 $standardTranslations = self::extractBaseTranslations();
                 // If the project has custom translations, gather them
                 if (null !== $customKey) {
-                    Logger::log('[' . self::class . '] Custom key detected: ' . $customKey, LOG_INFO);
-                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale . '.json']);
+                    Logger::log('['.self::class.'] Custom key detected: '.$customKey, LOG_INFO);
+                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale.'.json']);
                 }
                 // Finally we merge base and custom translations to complete all the i18n set
                 if (file_exists(self::$filename)) {
-                    Logger::log('[' . self::class . '] Custom locale detected: ' . $customKey . ' [' . self::$locale . ']', LOG_INFO);
+                    Logger::log('['.self::class.'] Custom locale detected: '.$customKey.' ['.self::$locale.']', LOG_INFO);
                     self::$translations = array_merge($standardTranslations, json_decode(file_get_contents(self::$filename), true));
                     $session->setSessionKey(self::LOCALE_CACHED_TAG, self::$translations);
                     $session->setSessionKey(self::LOCALE_CACHED_VERSION, $configVersion);
@@ -117,7 +117,7 @@ 
     public function getFilters()
     {
         return array(
-            new TwigFilter('trans', function ($message) {
+            new TwigFilter('trans', function($message) {
                 return self::_($message);
             }),
         );
@@ -139,12 +139,12 @@ 
      */
     public static function _($message, $customKey = null, $forceReload = false)
     {
-        if(0 === count(self::$translations) || $forceReload) {
+        if (0 === count(self::$translations) || $forceReload) {
             self::translationsCheckLoad($customKey, $forceReload);
         }
         if (is_array(self::$translations) && array_key_exists($message, self::$translations)) {
             $translation = self::$translations[$message];
-        } else {
+        }else {
             $translation = gettext($message);
         }
         if (self::$generate) {

src/base/types/traits/Api/DocumentorHelperTrait.php

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
             $payload = $this->extractModelFields($namespace);
             $reflector = new ReflectionClass($namespace);
             $shortName = $reflector->getShortName();
-        } else {
+        }else {
             $namespace = $model;
             $shortName = $model;
         }
@@ -170,10 +170,10 @@ 
                     if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) {
                         $modules = [
                             'name' => $module,
-                            'path' => realpath(dirname($info['base'] . DIRECTORY_SEPARATOR . '..')),
+                            'path' => realpath(dirname($info['base'].DIRECTORY_SEPARATOR.'..')),
                         ];
                     }
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -216,7 +216,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
 

src/base/types/traits/Api/SwaggerFormaterTrait.php

Spacing +11 added lines, -11 removed lines

@@ -86,10 +86,10 @@ 
         $formatted = [
             "swagger" => "2.0",
             "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)),
-            "basePath" => '/' . $module['name'] . '/api',
+            "basePath" => '/'.$module['name'].'/api',
             "schemes" => [Request::getInstance()->getServer('HTTPS') === 'on' ? 'https' : 'http'],
             "info" => [
-                "title" => t('Documentación API módulo ') . $module['name'],
+                "title" => t('Documentación API módulo ').$module['name'],
                 "version" => Config::getParam('api.version', '1.0.0'),
                 "contact" => [
                     "name" => Config::getParam("author", "Fran López"),
@@ -101,7 +101,7 @@ 
         foreach ($endpoints as $model) {
             foreach ($model as $endpoint) {
                 if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) {
-                    $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']);
+                    $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']);
                     $description = $endpoint['description'];
                     $method = strtolower($endpoint['method']);
                     $paths[$url][$method] = [
@@ -142,7 +142,7 @@ 
             }
         }
         ksort($dtos);
-        uasort($paths, function ($path1, $path2) {
+        uasort($paths, function($path1, $path2) {
             $key1 = array_keys($path1)[0];
             $key2 = array_keys($path2)[0];
             return strcmp($path1[$key1]['tags'][0], $path2[$key2]['tags'][0]);
@@ -166,13 +166,13 @@ 
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'array',
                         'items' => [
-                            '$ref' => '#/definitions/' . $info['type'],
+                            '$ref' => '#/definitions/'.$info['type'],
                         ]
                     ];
-                } else {
+                }else {
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'object',
-                        '$ref' => '#/definitions/' . $info['type'],
+                        '$ref' => '#/definitions/'.$info['type'],
                     ];
                 }
                 $modelDto['objects'][$info['class']] = $info['properties'];
@@ -180,7 +180,7 @@ 
                 if (array_key_exists('objects', $paramDto)) {
                     $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']);
                 }
-            } else {
+            }else {
                 $modelDto['objects'][$dtoName][$param] = $info;
             }
         }
@@ -211,7 +211,7 @@ 
                     $return = $this->extractReturn($modelNamespace, $docComments);
                     $url = array_pop($route);
                     $methodInfo = [
-                        'url' => str_replace('/' . $module . '/api', '', $url),
+                        'url' => str_replace('/'.$module.'/api', '', $url),
                         'method' => $info['http'],
                         'description' => $info['label'],
                         'return' => $return,
@@ -222,7 +222,7 @@ 
                     $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments);
                     $this->setQueryParams($method, $methodInfo);
                     $this->setRequestHeaders($reflection, $methodInfo);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                 }
             }
@@ -322,7 +322,7 @@ 
             foreach ($method->getParameters() as $parameter) {
                 $parameterName = $parameter->getName();
                 $types = [];
-                preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types);
+                preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types);
                 if (count($types) > 1 && count($types[1]) > 0) {
                     $methodInfo['parameters'][$parameterName] = $types[1][0];
                 }

src/base/types/helpers/DocumentorHelper.php

Spacing +6 added lines, -6 removed lines

@@ -43,10 +43,10 @@ 
         ];
         if ($endpoint['payload']['is_array']) {
             $schema['items'] = [
-                '$ref' => '#/definitions/' . $endpoint['payload']['type'],
+                '$ref' => '#/definitions/'.$endpoint['payload']['type'],
             ];
-        } else {
-            $schema['$ref'] = '#/definitions/' . $endpoint['payload']['type'];
+        }else {
+            $schema['$ref'] = '#/definitions/'.$endpoint['payload']['type'];
         }
         if (!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) {
             $paths[$url][$method]['parameters'][] = [
@@ -77,13 +77,13 @@ 
             if (array_key_exists('data', $endpoint['return']) && count(array_keys($object)) === count(array_keys($endpoint['return']['data']))) {
                 $classDefinition = [
                     'type' => 'object',
-                    '$ref' => '#/definitions/' . $class,
+                    '$ref' => '#/definitions/'.$class,
                 ];
-            } else {
+            }else {
                 $classDefinition = [
                     'type' => 'array',
                     'items' => [
-                        '$ref' => '#/definitions/' . $class,
+                        '$ref' => '#/definitions/'.$class,
                     ],
                 ];
             }

src/base/types/helpers/ApiHelper.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
     {
         if ($mappedColumn->getSize() > 100) {
             $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required);
-        } else {
+        }else {
             $fDto = self::generateStringField($field, $required);
         }
         return $fDto;

src/base/types/helpers/RequestHelper.php

Spacing +3 added lines, -3 removed lines

@@ -45,10 +45,10 @@ 
                 if (!headers_sent()) {
                     // TODO include this headers in Template class output method
                     header('Access-Control-Allow-Credentials: true');
-                    header('Access-Control-Allow-Origin: ' . Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
+                    header('Access-Control-Allow-Origin: '.Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
                     header('Vary: Origin');
                     header('Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS, HEAD');
-                    header('Access-Control-Allow-Headers: ' . implode(', ', self::getCorsHeaders()));
+                    header('Access-Control-Allow-Headers: '.implode(', ', self::getCorsHeaders()));
                 }
                 if (Request::getInstance()->getMethod() === Request::VERB_OPTIONS) {
                     Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG);
@@ -78,7 +78,7 @@ 
                         return $ip;
                     }
                 }
-            } else {
+            }else {
                 if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                     return $_SERVER['HTTP_X_FORWARDED_FOR'];
                 }

src/services/AdminServices.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     {
         $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 t('Zona restringida');
         exit();
     }
@@ -75,7 +75,7 @@ 
                             $admin['class'] = 'primary';
                             break;
                     }
-                } else {
+                }else {
                     $admin['class'] = 'primary';
                 }
             }