psfs / core

src/base/types/helpers/ApiHelper.php

Spacing +4 added lines, -4 removed lines

@@ -42,9 +42,9 @@ 
                 $fDto = self::generatePasswordField($field, $required);
             } elseif (in_array($mappedColumn->getType(), [PropelTypes::TIMESTAMP])) {
                 //$fDto = self::generateDateField($field, $required);
-            } elseif(in_array($mappedColumn->getType(), [PropelTypes::ENUM, PropelTypes::SET])) {
+            } elseif (in_array($mappedColumn->getType(), [PropelTypes::ENUM, PropelTypes::SET])) {
                 $fDto = self::generateEnumField($field, $required);
-                foreach($mappedColumn->getValueSet() as $value) {
+                foreach ($mappedColumn->getValueSet() as $value) {
                     $fDto->data[] = [
                         $field => $value,
                         "Label" => _($value),
@@ -52,7 +52,7 @@ 
                 }
             }
 
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $form->addField($fDto);
             }
         }
@@ -72,7 +72,7 @@ 
         $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');
         return $fDto;
     }
 

src/controller/base/Admin.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
  * @package PSFS\controller
  * @domain ROOT
  */
-abstract class Admin extends AuthAdminController{
+abstract class Admin extends AuthAdminController {
 
     const DOMAIN = 'ROOT';
 
@@ -45,10 +45,10 @@ 
      * @throws \PSFS\base\exception\FormException
      */
     public static function staticAdminLogon($route = null) {
-        if(file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
-            if('login' !== Config::getInstance()->get('admin_login')) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
+            if ('login' !== Config::getInstance()->get('admin_login')) {
                 return AdminServices::getInstance()->setAdminHeaders();
-            } else {
+            }else {
                 $form = new LoginForm();
                 $form->setData(array("route" => $route));
                 $form->build();
@@ -58,7 +58,7 @@ 
                     'form' => $form,
                 ));
             }
-        } else {
+        }else {
             return UserController::showAdminManager();
         }
     }

src/services/GeneratorService.php

Doc Comments +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 
     /**
      * Método que revisa las traducciones directorio a directorio
-     * @param $path
+     * @param string $path
      * @param $locale
      * @return array
      */
@@ -102,7 +102,7 @@ 
      * @param string $module
      * @param boolean $mod_path
      * @param boolean $isModule
-     * @return boolean
+     * @return boolean|null
      */
     private function createModulePathTree($module, $mod_path, $isModule = false)
     {
@@ -474,7 +474,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)

Spacing +65 added lines, -67 removed lines

@@ -32,24 +32,24 @@ 
      */
     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)) {
             $d = dir($path);
             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 .
+                $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) {
-                    $res = _('Revisando directorio: ') . $inspect_path;
-                    $res .= _('Comando ejecutado: ') . $cmd_php;
+                if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) {
+                    $res = _('Revisando directorio: ').$inspect_path;
+                    $res .= _('Comando ejecutado: ').$cmd_php;
                     $res .= shell_exec($cmd_php);
                     usleep(10);
                     $translations[] = $res;
@@ -70,7 +70,7 @@ 
      */
     public function createStructureModule($module, $force = false, $type = "", $isModule = false)
     {
-        $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
+        $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
         $module = ucfirst($module);
         $this->createModulePath($module, $mod_path, $isModule);
         $this->createModulePathTree($module, $mod_path, $isModule);
@@ -93,7 +93,7 @@ 
         Config::createDir($mod_path);
         // Create module path
         if (false === $isModule) {
-            Config::createDir($mod_path . $module);
+            Config::createDir($mod_path.$module);
         }
     }
 
@@ -111,20 +111,20 @@ 
         $paths = [
             "Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test"
         ];
-        $module_path = $isModule ? $mod_path : $mod_path . $module;
+        $module_path = $isModule ? $mod_path : $mod_path.$module;
         foreach ($paths as $path) {
-            Config::createDir($module_path . DIRECTORY_SEPARATOR . $path);
+            Config::createDir($module_path.DIRECTORY_SEPARATOR.$path);
         }
         //Creamos las carpetas de los assets
         $htmlPaths = array("css", "js", "img", "media", "font");
         foreach ($htmlPaths as $path) {
-            Config::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            Config::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
         }
 
         if ($isModule) {
             return $this->writeTemplateToFile(json_encode([
-                "module" => "\\" . preg_replace('/(\\\|\/)/', '\\\\', $module),
-            ], JSON_PRETTY_PRINT), $mod_path . DIRECTORY_SEPARATOR . "module.json", true);
+                "module" => "\\".preg_replace('/(\\\|\/)/', '\\\\', $module),
+            ], JSON_PRETTY_PRINT), $mod_path.DIRECTORY_SEPARATOR."module.json", true);
         }
     }
 
@@ -138,7 +138,7 @@ 
      */
     private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '', $isModule = false)
     {
-        $module_path = $isModule ? $mod_path : $mod_path . $module;
+        $module_path = $isModule ? $mod_path : $mod_path.$module;
         $this->generateControllerTemplate($module, $module_path, $force, $controllerType);
         $this->generateServiceTemplate($module, $module_path, $force);
         $this->genereateAutoloaderTemplate($module, $module_path, $force, $isModule);
@@ -157,24 +157,24 @@ 
      */
     private function createModuleModels($module, $path, $isModule = false)
     {
-        $module_path = $isModule ? $path : $path . $module;
-        $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
+        $module_path = $isModule ? $path : $path.$module;
+        $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path);
         //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_path .
-            DIRECTORY_SEPARATOR . "Config";
-        $opt = " --config-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR .
-            "Config --output-dir=" . CORE_DIR . " --verbose";
-        $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n" . $exec . "build" . $opt . $schemaOpt);
-        $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_path.
+            DIRECTORY_SEPARATOR."Config";
+        $opt = " --config-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR.
+            "Config --output-dir=".CORE_DIR." --verbose";
+        $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n".$exec."build".$opt.$schemaOpt);
+        $ret = shell_exec($exec."build".$opt.$schemaOpt);
 
         $this->log->infoLog("[GENERATOR] Generamos clases invocando a propel:\n $ret");
-        $ret = shell_exec($exec . "sql:build" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR .
-            $module_path . DIRECTORY_SEPARATOR . "Config" . $schemaOpt);
+        $ret = shell_exec($exec."sql:build".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.
+            $module_path.DIRECTORY_SEPARATOR."Config".$schemaOpt);
         $this->log->infoLog("[GENERATOR] Generamos sql invocando a propel:\n $ret");
-        $ret = shell_exec($exec . "config:convert" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR .
-            $module_path . DIRECTORY_SEPARATOR . "Config");
+        $ret = shell_exec($exec."config:convert".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.
+            $module_path.DIRECTORY_SEPARATOR."Config");
         $this->log->infoLog("[GENERATOR] Generamos configuración invocando a propel:\n $ret");
     }
 
@@ -195,32 +195,32 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
             "class" => $class,
-            "controllerType" => $class . "Base",
+            "controllerType" => $class."Base",
             "is_base" => false
         ));
-        $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
+        $controller = $this->writeTemplateToFile($controllerBody, $mod_path.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, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
 
         $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
             "module" => $module,
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "class" => $class,
         ));
-        $test = $this->writeTemplateToFile($testTemplate, $mod_path . DIRECTORY_SEPARATOR . "Test" .
-            DIRECTORY_SEPARATOR . "{$class}Test.php", true);
+        $test = $this->writeTemplateToFile($testTemplate, $mod_path.DIRECTORY_SEPARATOR."Test".
+            DIRECTORY_SEPARATOR."{$class}Test.php", true);
         return ($controller && $controllerBase && $test);
     }
 
@@ -235,11 +235,9 @@ 
     {
         $created = true;
         $modelPath = $isModule ?
-            $mod_path . DIRECTORY_SEPARATOR . 'Models' :
-            $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
+            $mod_path.DIRECTORY_SEPARATOR.'Models' : $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
         $api_path = $isModule ?
-            $mod_path . DIRECTORY_SEPARATOR . 'Api' :
-            $mod_path . $module . DIRECTORY_SEPARATOR . 'Api';
+            $mod_path.DIRECTORY_SEPARATOR.'Api' : $mod_path.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             while ($file = $dir->read()) {
@@ -267,7 +265,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 . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
             $force);
     }
 
@@ -282,10 +280,10 @@ 
         //Generamos el fichero de configuración
         $this->log->infoLog("Generamos ficheros para assets base");
         $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n",
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css",
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css",
             $force);
         $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();",
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js",
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js",
             $force);
         return ($css && $js);
     }
@@ -307,7 +305,7 @@ 
             "class" => $class,
         ));
         return $this->writeTemplateToFile($controller,
-            $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php",
+            $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php",
             $force);
     }
 
@@ -328,14 +326,14 @@ 
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
             "is_module" => $isModule,
         ));
-        $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
+        $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
 
         $this->log->infoLog("Generamos el phpunit");
         $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array(
             "module" => $module,
             "is_module" => $isModule,
         ));
-        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force);
+        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force);
         return $autoload && $phpunit;
     }
 
@@ -356,7 +354,7 @@ 
             "db" => $this->config->get("db_name"),
         ));
         return $this->writeTemplateToFile($schema,
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
             $force);
     }
 
@@ -379,7 +377,7 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
         ));
         return $this->writeTemplateToFile($build_properties,
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml",
             $force);
     }
 
@@ -397,7 +395,7 @@ 
             "module" => $module,
         ));
         return $this->writeTemplateToFile($index,
-            $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
+            $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
             $force);
     }
 
@@ -415,11 +413,11 @@ 
             try {
                 $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;
     }
@@ -444,7 +442,7 @@ 
         ));
 
         return $this->writeTemplateToFile($controller,
-            $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
     }
 
     /**
@@ -467,7 +465,7 @@ 
             "class" => $class,
         ));
 
-        return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+        return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force);
     }
 
     /**
@@ -481,12 +479,12 @@ 
     {
         if (file_exists($filename_path)) {
             $destfolder = basename($filename_path);
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
+            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 {
-                    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);
+                    self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
+                }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);
                     }
                 }
             }
@@ -505,10 +503,10 @@ 
         Config::createDir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
+                if (is_dir($src.'/'.$file)) {
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
                 }
             }
         }