psfs / core

src/base/types/Api.php

Unused Use Statements -3 removed lines

@@ -5,12 +5,9 @@
     use Propel\Runtime\ActiveQuery\ModelCriteria;
     use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
     use Propel\Runtime\Connection\ConnectionInterface;
-    use Propel\Runtime\Map\ColumnMap;
     use Propel\Runtime\Map\TableMap;
     use Propel\Runtime\Propel;
     use PSFS\base\config\Config;
-    use PSFS\base\dto\Field;
-    use PSFS\base\dto\Form;
     use PSFS\base\dto\JsonResponse;
     use PSFS\base\dto\Order;
     use PSFS\base\Logger;

Spacing +16 added lines, -16 removed lines

@@ -179,7 +179,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -187,7 +187,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($field);
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($field);
                     }
                 }
@@ -202,7 +202,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
             if (!empty($this->extraColumns)) {
                 foreach ($this->extraColumns as $expression => $columnName) {
@@ -216,7 +216,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -226,7 +226,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) {
@@ -244,7 +244,7 @@ 
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $text = preg_replace('/\ /', '%', $text);
                             $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
                     }
@@ -267,10 +267,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());
             }
         }
@@ -287,7 +287,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());
             }
         }
@@ -375,7 +375,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 jpre($e->getMessage(), TRUE);
                 Logger::getInstance()->errorLog($e->getMessage());
             }
@@ -404,7 +404,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -448,7 +448,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);
 
@@ -492,7 +492,7 @@ 
             if ($this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -536,7 +536,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)),
             ));
         }
 
@@ -573,7 +573,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());
             }
 
@@ -592,7 +592,7 @@ 
             $return = array();
             if (NULL === $model && method_exists($model, 'toArray')) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 

src/base/types/helpers/ApiHelper.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
                 $fDto = self::generateNumericField($field);
             }
 
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $form->addField($fDto);
             }
         }
@@ -54,7 +54,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/services/GeneratorService.php

Spacing +62 added lines, -64 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);
         }
     }
 
@@ -110,20 +110,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);
         }
     }
 
@@ -137,7 +137,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);
@@ -156,24 +156,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");
     }
 
@@ -194,23 +194,23 @@ 
             "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
         ));
-        $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);
         return ($controller && $controllerBase);
     }
 
@@ -225,11 +225,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()) {
@@ -257,7 +255,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);
     }
 
@@ -272,10 +270,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);
     }
@@ -297,7 +295,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);
     }
 
@@ -318,7 +316,7 @@ 
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
             "is_module" => $isModule,
         ));
-        return $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
+        return $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
     }
 
     /**
@@ -338,7 +336,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);
     }
 
@@ -361,7 +359,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);
     }
 
@@ -379,7 +377,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);
     }
 
@@ -397,11 +395,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;
     }
@@ -426,7 +424,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);
     }
 
     /**
@@ -449,7 +447,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);
     }
 
     /**
@@ -463,12 +461,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);
                     }
                 }
             }
@@ -487,10 +485,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);
                 }
             }
         }