psfs / core

src/services/GeneratorService.php

Doc Comments +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 
         /**
          * Método que revisa las traducciones directorio a directorio
-         * @param $path
+         * @param string $path
          * @param $locale
          * @return array
          */
@@ -94,8 +94,8 @@ 
 
         /**
          * Servicio que genera la estructura base
-         * @param $module
-         * @param $mod_path
+         * @param string $module
+         * @param string $mod_path
          */
         private function createModulePathTree($module, $mod_path)
         {

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);
         }
     }

src/Dispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -95,14 +95,14 @@
                 if (!$this->parser->isFile()) {
                     return $this->router->execute($this->actualUri);
                 }
-            } else {
+            }else {
                 return $this->router->getAdmin()->config();
             }
         }catch (ConfigException $c) {
             return $this->dumpException($c);
         }catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
-        } catch(RouterException $r) {
+        }catch (RouterException $r) {
             return $this->router->httpNotFound($r);
         }catch (\Exception $e) {
             return $this->dumpException($e);

Braces +3 added lines, -3 removed lines

@@ -98,13 +98,13 @@
             } else {
                 return $this->router->getAdmin()->config();
             }
-        }catch (ConfigException $c) {
+        } catch (ConfigException $c) {
             return $this->dumpException($c);
-        }catch (SecurityException $s) {
+        } catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
         } catch(RouterException $r) {
             return $this->router->httpNotFound($r);
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             return $this->dumpException($e);
         }
     }

src/base/Template.php

Spacing +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
             if ($file->isFile()) {
                 try {
                     $this->tpl->loadTemplate(str_replace($tplDir.'/', '', $file));
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }

Braces +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             echo $e->getMessage()."<pre>".$e->getTraceAsString()."</pre>";
         }
         return $dump;
@@ -394,7 +394,7 @@ 
             unset($_SERVER["PHP_AUTH_USER"]);
             unset($_SERVER["PHP_AUTH_PW"]);
             header_remove("Authorization");
-        }else {
+        } else {
             header('Authorization:');
         }
     }

src/base/config/Config.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
         {
             $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", Cache::JSON, true) ?: array();
             $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : false;
-        } else {
+        }else {
             $this->debug = true;
         }
         return $this;
@@ -198,7 +198,7 @@ 
             if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
                     @shell_exec("rm -rf ".WEB_DIR.DIRECTORY_SEPARATOR.$dir);
-                } catch(\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }

Braces +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
         try {
             Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", $final_data, Cache::JSON, true);
             $saved = true;
-        }catch (ConfigException $e) {
+        } catch (ConfigException $e) {
             Logger::getInstance()->errorLog($e->getMessage());
         }
         return $saved;
@@ -182,7 +182,7 @@ 
             if (@mkdir($dir, 0775, true) === false) {
                 throw new \Exception(_('Can\'t create directory ').$dir);
             }
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             if (!file_exists(dirname($dir))) {
                 throw new ConfigException($e->getMessage().$dir);
             }

src/base/dto/Dto.php

Spacing +6 added lines, -6 removed lines

@@ -20,13 +20,13 @@ 
             try {
                 $reflectionClass = new \ReflectionClass($this);
                 $properties = $reflectionClass->getProperties();
-                if(count($properties) > 0) {
+                if (count($properties) > 0) {
                     /** @var \ReflectionProperty $property */
-                    foreach($properties as $property) {
+                    foreach ($properties as $property) {
                         $dto[$property->getName()] = $property->getValue($this);
                     }
                 }
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
             return $dto;
@@ -47,9 +47,9 @@ 
          */
         public function fromArray(array $object = array())
         {
-            if(count($object) > 0) {
-                foreach($object as $key => $value) {
-                    if(property_exists($this, $key)) {
+            if (count($object) > 0) {
+                foreach ($object as $key => $value) {
+                    if (property_exists($this, $key)) {
                         $this->$key = $value;
                     }
                 }

src/base/dto/Order.php

Spacing +4 added lines, -4 removed lines

@@ -31,8 +31,8 @@ 
         {
             $order = array();
             if (count($order) > 0) {
-                foreach($this->fields as $field => $direction) {
-                    if(strtolower($fieldToRemove) === strtolower($field)) {
+                foreach ($this->fields as $field => $direction) {
+                    if (strtolower($fieldToRemove) === strtolower($field)) {
                         continue;
                     }
                     $order[$field] = $direction;
@@ -60,9 +60,9 @@ 
          */
         public static function parseDirection($direction = Order::ASC)
         {
-            if(preg_match('/^asc$/i', $direction)) {
+            if (preg_match('/^asc$/i', $direction)) {
                 return Order::ASC;
-            } else {
+            }else {
                 return Order::DESC;
             }
         }

src/base/extension/AssetsParser.php

Spacing +5 added lines, -5 removed lines

@@ -157,7 +157,7 @@ 
             }
         }
         if (!$this->debug && !file_exists($base.$this->hash.".js")) {
-            $this->storeContents($base.$this->hash.".js", $data);//Minifier::minify($data));
+            $this->storeContents($base.$this->hash.".js", $data); //Minifier::minify($data));
         }
         return $this;
     }
@@ -196,7 +196,7 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
+        }else {
             echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n";
         }
     }
@@ -210,7 +210,7 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
+        }else {
             echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet' media='screen, print'>";
         }
     }
@@ -235,7 +235,7 @@ 
                     $this->log->infoLog("$orig copiado a $dest");
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->log->errorLog($e->getMessage());
         }
     }
@@ -264,7 +264,7 @@ 
             if ($this->debug) {
                 $data = file_get_contents($file);
                 $this->storeContents($base.$file_path, $data);
-            } else {
+            }else {
                 $data .= file_get_contents($file);
             }
             $this->compiled_files[] = "/css/".$file_path;

Braces +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
         $js = file_get_contents($file);
         try {
             $data .= ";\n".$js;
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             throw new ConfigException($e->getMessage());
         }
         return $data;

src/base/extension/AssetsTokenParser.php

Braces +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
         $tmp = array();
         if (NULL === $node) {
             $node = $value;
-        }else {
+        } else {
             $tmp = $this->getTmpAttribute($node);
         }
         $tmp[] = $value->getAttribute("value");

src/base/types/AuthApi.php

Spacing +3 added lines, -3 removed lines

@@ -26,14 +26,14 @@
         {
             $namespace = explode('\\', $this->getModelTableMap());
             $module = $namespace[0];
-            $secret = Config::getInstance()->get($module . '.api.secret');
+            $secret = Config::getInstance()->get($module.'.api.secret');
             if (NULL === $secret) {
                 $secret = Config::getInstance()->get("api.secret");
             }
             if (NULL === $secret) {
                 $auth = TRUE;
-            } else {
-                $token = Request::getInstance()->getHeader('X-' . strtoupper($module) . '-SEC-TOKEN');
+            }else {
+                $token = Request::getInstance()->getHeader('X-'.strtoupper($module).'-SEC-TOKEN');
                 if (array_key_exists('API_TOKEN', $this->query)) {
                     $token = $this->query['API_TOKEN'];
                 }