psfs / core

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/Api.php

Spacing +14 added lines, -14 removed lines

@@ -174,7 +174,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -182,7 +182,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($field);
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($field);
                     }
                 }
@@ -197,7 +197,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) {
@@ -214,7 +214,7 @@ 
                         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $query->filterBy($tableField, $text, Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
                     }
@@ -235,10 +235,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());
             }
         }
@@ -253,7 +253,7 @@ 
             try {
                 $query = $this->extractQuery();
                 $this->model = $query->findPk($pk);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -281,10 +281,10 @@ 
                     $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());
                 }
-            } else {
+            }else {
                 $this->hydrateModel($pk);
                 $return = ($this->getModel() instanceof ActiveRecordInterface) ? $this->getModel()->toArray() : NULL;
                 if (NULL === $return) {
@@ -326,7 +326,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
             }
 
@@ -354,7 +354,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -397,7 +397,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);
 
@@ -441,7 +441,7 @@ 
             if ($this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -484,7 +484,7 @@ 
             return $this->render('api.admin.html.twig', array(
                 "api"    => $this->getApi(),
                 "domain" => $this->domain,
-                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
+                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
             ));
         }
 

src/services/GeneratorService.php

Spacing +43 added lines, -43 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,26 +30,26 @@ 
          */
         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 .= shell_exec($cmd_php);// . " >> " . __DIR__ . DIRECTORY_SEPARATOR . "debug.log 2>&1");
+                        $res = _('Revisando directorio: ').$inspect_path;
+                        $res .= _('Comando ejecutado: ').$cmd_php;
+                        $res .= shell_exec($cmd_php); // . " >> " . __DIR__ . DIRECTORY_SEPARATOR . "debug.log 2>&1");
                         usleep(10);
                         $translations[] = $res;
                         $translations = array_merge($translations, self::findTranslations($inspect_path, $locale));
@@ -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);
         }
     }