psfs / core

src/base/Security.php

Spacing +6 added lines, -6 removed lines

@@ -122,12 +122,12 @@ 
     {
         $saved = true;
         try {
-            $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: [];
-            $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+            $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: [];
+            $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
             $admins[$user['username']]['profile'] = $user['profile'];
 
-            Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true);
-        } catch(\Exception $e) {
+            Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             $saved = false;
         }
@@ -164,7 +164,7 @@ 
      */
     public function getAdmins()
     {
-        return Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true);
+        return Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true);
     }
 
     /**
@@ -191,7 +191,7 @@ 
                 }
                 if (!empty($user) && !empty($admins[$user])) {
                     $auth = $admins[$user]['hash'];
-                    $this->authorized = ($auth == sha1($user . $pass));
+                    $this->authorized = ($auth == sha1($user.$pass));
                     if ($this->authorized) {
                         $this->admin = array(
                             'alias' => $user,

src/base/types/helpers/SecurityHelper.php

Spacing +21 added lines, -21 removed lines

@@ -29,7 +29,7 @@ 
         if (!Config::getInstance()->checkTryToSaveConfig()
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || NULL !== Config::getInstance()->get('restricted'))
         ) {
-            if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) {
+            if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) {
                 throw new AdminCredentialsException();
             }
             if (!Security::getInstance()->checkAdmin()) {
@@ -49,8 +49,8 @@ 
         $token = '';
         $ct = strlen($ts);
         for ($i = 0; $i < $ct; $i++) {
-            $token = substr($hash, $i, 1) .
-                    substr($ts, $i, 1) .
+            $token = substr($hash, $i, 1).
+                    substr($ts, $i, 1).
                     $token;
         }
         return $token;
@@ -68,16 +68,16 @@ 
         $charsLength = strlen(self::RAND_SEP) - 1;
         $tsLength = strlen($ts);
         $i = 0;
-        $ct = ceil($hashRest / 4);
-        $part = substr($hash, $tsLength + $ct * $i, $ct);
-        while(false !== $part) {
-            $mixedToken .= $part .
-                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) .
+        $ct = ceil($hashRest/4);
+        $part = substr($hash, $tsLength + $ct*$i, $ct);
+        while (false !== $part) {
+            $mixedToken .= $part.
+                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1).
                 substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1);
-            $part = substr($hash, $tsLength + $ct * $i, $ct);
+            $part = substr($hash, $tsLength + $ct*$i, $ct);
             $i++;
         }
-        return $mixedToken . $token;
+        return $mixedToken.$token;
     }
 
     /**
@@ -86,10 +86,10 @@ 
      */
     private static function getTs($isOdd = null) {
         $ts = time();
-        $tsIsOdd = (bool)((int)substr($ts, -1) % 2);
-        if(false === $isOdd && !$tsIsOdd) {
+        $tsIsOdd = (bool)((int)substr($ts, -1)%2);
+        if (false === $isOdd && !$tsIsOdd) {
             $ts--;
-        } elseif(true === $isOdd && !$tsIsOdd) {
+        } elseif (true === $isOdd && !$tsIsOdd) {
             $ts--;
         }
         return $ts;
@@ -121,10 +121,10 @@ 
         $partToken = '';
         $ts = '';
         $part = strrev($part);
-        for($i = 0, $ct = strlen($part); $i < $ct; $i++) {
-            if($i % 2 == 0) {
+        for ($i = 0, $ct = strlen($part); $i < $ct; $i++) {
+            if ($i%2 == 0) {
                 $ts .= substr($part, $i, 1);
-            } else {
+            }else {
                 $partToken .= substr($part, $i, 1);
             }
         }
@@ -139,11 +139,11 @@ 
     private static function parseTokenParts(array $parts) {
         $token = '';
         list($partToken, $ts) = self::extractTs(array_pop($parts));
-        if($ts > 0) {
-            foreach($parts as $part) {
+        if ($ts > 0) {
+            foreach ($parts as $part) {
                 $token .= $part;
             }
-            $token = $partToken . $token;
+            $token = $partToken.$token;
         }
         return [$token, $ts];
     }
@@ -171,8 +171,8 @@ 
      * @return array
      */
     private static function extractTokenParts($token) {
-        for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) {
-            $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token);
+        for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) {
+            $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token);
         }
         return array_unique(explode('||', $token));
     }

src/base/extension/AssetsParser.php

Spacing +50 added lines, -50 removed lines

@@ -32,7 +32,7 @@ 
     public function __construct($type = 'js')
     {
         $this->type = $type;
-        $this->path = WEB_DIR . DIRECTORY_SEPARATOR;
+        $this->path = WEB_DIR.DIRECTORY_SEPARATOR;
         $this->domains = Template::getDomains(true);
         $this->debug = Config::getInstance()->getDebugMode();
     }
@@ -54,7 +54,7 @@ 
             $source_file = explode("?", $source_file);
             $source_file = $source_file[0];
         }
-        $orig = realpath(dirname($filename_path) . DIRECTORY_SEPARATOR . $source_file);
+        $orig = realpath(dirname($filename_path).DIRECTORY_SEPARATOR.$source_file);
         return $orig;
     }
 
@@ -67,12 +67,12 @@ 
      */
     public function addFile($filename)
     {
-        if (file_exists($this->path . $filename) && preg_match('/\.' . $this->type . '$/i', $filename)) {
+        if (file_exists($this->path.$filename) && preg_match('/\.'.$this->type.'$/i', $filename)) {
             $this->files[] = $filename;
         } elseif (!empty($this->domains)) {
             foreach ($this->domains as $domain => $paths) {
                 $domain_filename = str_replace($domain, $paths["public"], $filename);
-                if (file_exists($domain_filename) && preg_match('/\.' . $this->type . '$/i', $domain_filename)) {
+                if (file_exists($domain_filename) && preg_match('/\.'.$this->type.'$/i', $domain_filename)) {
                     $this->files[] = $domain_filename;
                 }
             }
@@ -89,7 +89,7 @@ 
     public function setHash($hash)
     {
         $cache = Config::getParam('cache.var', '');
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -123,15 +123,15 @@ 
      */
     protected function compileCss()
     {
-        $base = $this->path . "css" . DIRECTORY_SEPARATOR;
-        if ($this->debug || !file_exists($base . $this->hash . ".css")) {
+        $base = $this->path."css".DIRECTORY_SEPARATOR;
+        if ($this->debug || !file_exists($base.$this->hash.".css")) {
             $data = '';
             if (0 < count($this->files)) {
                 foreach ($this->files as $file) {
                     $data = $this->processCssLine($file, $base, $data);
                 }
             }
-            $this->storeContents($base . $this->hash . ".css", \CssMin::minify($data));
+            $this->storeContents($base.$this->hash.".css", \CssMin::minify($data));
             unset($cssMinifier);
         }
         return $this;
@@ -144,8 +144,8 @@ 
      */
     protected function compileJs()
     {
-        $base = $this->path . "js" . DIRECTORY_SEPARATOR;
-        if ($this->debug || !file_exists($base . $this->hash . ".js")) {
+        $base = $this->path."js".DIRECTORY_SEPARATOR;
+        if ($this->debug || !file_exists($base.$this->hash.".js")) {
             $data = '';
             if (0 < count($this->files)) {
                 foreach ($this->files as $file) {
@@ -153,7 +153,7 @@ 
                     if (file_exists($file)) {
                         if ($this->debug) {
                             $data = $this->putDebugJs($path_parts, $base, $file);
-                        } elseif (!file_exists($base . $this->hash . ".js")) {
+                        } elseif (!file_exists($base.$this->hash.".js")) {
                             $data = $this->putProductionJs($base, $file, $data);
                         }
                     }
@@ -161,11 +161,11 @@ 
             }
             try {
                 $minifiedJs = Minifier::minify($data);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
                 $minifiedJs = false;
             }
-            $this->storeContents($base . $this->hash . ".js", (false !== $minifiedJs) ? $minifiedJs : $data);
+            $this->storeContents($base.$this->hash.".js", (false !== $minifiedJs) ? $minifiedJs : $data);
         }
         return $this;
     }
@@ -180,7 +180,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if ("" !== $content && false === file_put_contents($path, $content)) {
-            throw new ConfigException(_('No se tienen permisos para escribir en ' . $path));
+            throw new ConfigException(_('No se tienen permisos para escribir en '.$path));
         }
     }
 
@@ -209,8 +209,8 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
-            echo "\t\t<script type='text/javascript' src='/js/" . $this->hash . ".js'></script>\n";
+        }else {
+            echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n";
         }
     }
 
@@ -223,8 +223,8 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
-            echo "\t\t<link href='/css/" . $this->hash . ".css' rel='stylesheet'>";
+        }else {
+            echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet'>";
         }
     }
 
@@ -235,20 +235,20 @@ 
     protected function extractCssResources($source, $file)
     {
         $source_file = $this->extractSourceFilename($source);
-        $orig = realpath(dirname($file) . DIRECTORY_SEPARATOR . $source_file);
+        $orig = realpath(dirname($file).DIRECTORY_SEPARATOR.$source_file);
         $orig_part = preg_split('/(\/|\\\)public(\/|\\\)/i', $orig);
         try {
             if (count($source) > 1 && array_key_exists(1, $orig_part)) {
-                $dest = $this->path . $orig_part[1];
+                $dest = $this->path.$orig_part[1];
                 GeneratorHelper::createDir(dirname($dest));
                 if (!file_exists($dest) || filemtime($orig) > filemtime($dest)) {
                     if (@copy($orig, $dest) === FALSE) {
-                        throw new \RuntimeException('Can\' copy ' . $dest . '');
+                        throw new \RuntimeException('Can\' copy '.$dest.'');
                     }
                     Logger::log("$orig copiado a $dest", LOG_INFO);
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -265,21 +265,21 @@ 
     {
         if (file_exists($file)) {
             $path_parts = explode("/", $file);
-            $file_path = $this->hash . "_" . $path_parts[count($path_parts) - 1];
-            if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($file) || $this->debug) {
+            $file_path = $this->hash."_".$path_parts[count($path_parts) - 1];
+            if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($file) || $this->debug) {
                 //Si tenemos modificaciones tenemos que compilar de nuevo todos los ficheros modificados
-                if (file_exists($base . $this->hash . ".css") && @unlink($base . $this->hash . ".css") === false) {
-                    throw new ConfigException("Can't unlink file " . $base . $this->hash . ".css");
+                if (file_exists($base.$this->hash.".css") && @unlink($base.$this->hash.".css") === false) {
+                    throw new ConfigException("Can't unlink file ".$base.$this->hash.".css");
                 }
                 $this->loopCssLines($file);
             }
             if ($this->debug) {
                 $data = file_get_contents($file);
-                $this->storeContents($base . $file_path, $data);
-            } else {
+                $this->storeContents($base.$file_path, $data);
+            }else {
                 $data .= file_get_contents($file);
             }
-            $this->compiled_files[] = "/css/" . $file_path;
+            $this->compiled_files[] = "/css/".$file_path;
         }
 
         return $data;
@@ -294,12 +294,12 @@ 
      */
     protected function putDebugJs($path_parts, $base, $file)
     {
-        $file_path = $this->hash . "_" . $path_parts[count($path_parts) - 1];
-        $this->compiled_files[] = "/js/" . $file_path;
+        $file_path = $this->hash."_".$path_parts[count($path_parts) - 1];
+        $this->compiled_files[] = "/js/".$file_path;
         $data = "";
-        if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($file)) {
+        if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($file)) {
             $data = file_get_contents($file);
-            $this->storeContents($base . $file_path, $data);
+            $this->storeContents($base.$file_path, $data);
         }
         return $data;
     }
@@ -316,8 +316,8 @@ 
     {
         $js = file_get_contents($file);
         try {
-            $data .= ";\n" . $js;
-        } catch (\Exception $e) {
+            $data .= ";\n".$js;
+        }catch (\Exception $e) {
             throw new ConfigException($e->getMessage());
         }
         return $data;
@@ -360,53 +360,53 @@ 
     {
         $ppath = explode("/", $string);
         $original_filename = $ppath[count($ppath) - 1];
-        $base = WEB_DIR . DIRECTORY_SEPARATOR;
+        $base = WEB_DIR.DIRECTORY_SEPARATOR;
         $file = "";
         $html_base = "";
         $debug = Config::getInstance()->getDebugMode();
         $cache = Config::getInstance()->get('cache.var');
-        $cache = $cache ? '.' . $cache : '';
+        $cache = $cache ? '.'.$cache : '';
         $finfo = finfo_open(FILEINFO_MIME_TYPE); // devuelve el tipo mime de su extensión
         $mime = finfo_file($finfo, $filename_path);
         finfo_close($finfo);
         if (preg_match('/\.css$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.css";
+            $file = "/".substr(md5($string), 0, 8)."$cache.css";
             $html_base = "css";
             if ($debug) {
-                $file = str_replace(".css", "_" . $original_filename, $file);
+                $file = str_replace(".css", "_".$original_filename, $file);
             }
         } elseif (preg_match('/\.js$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.js";
+            $file = "/".substr(md5($string), 0, 8)."$cache.js";
             $html_base = "js";
             if ($debug) {
-                $file = str_replace(".js", "_" . $original_filename, $file);
+                $file = str_replace(".js", "_".$original_filename, $file);
             }
         } elseif (preg_match("/image/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "img";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (preg_match("/(doc|pdf)/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "docs";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (preg_match("/(video|audio|ogg)/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "media";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (!$return && !is_null($name)) {
             $html_base = '';
             $file = $name;
         }
-        $file_path = $html_base . $file;
+        $file_path = $html_base.$file;
 
         return array($base, $html_base, $file_path);
     }
@@ -425,10 +425,10 @@ 
             foreach ($urls as $source) {
                 $orig = self::calculateResourcePathname($filename_path, $source);
                 $orig_part = explode("Public", $orig);
-                $dest = WEB_DIR . $orig_part[1];
+                $dest = WEB_DIR.$orig_part[1];
                 GeneratorHelper::createDir(dirname($dest));
                 if (@copy($orig, $dest) === false) {
-                    throw new ConfigException("Can't copy " . $orig . " to " . $dest);
+                    throw new ConfigException("Can't copy ".$orig." to ".$dest);
                 }
             }
         }

src/base/types/SingletonTrait.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace PSFS\base\types;
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php';
+require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'bootstrap.php';
 /**
  * Class SingletonTrait
  * @package PSFS\base\types

src/bootstrap.php

Spacing +10 added lines, -10 removed lines

@@ -5,17 +5,17 @@
 
 if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'vendor');
+if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
 
 defined('PSFS_BOOTSTRAP_LOADED') or define('PSFS_BOOTSTRAP_LOADED', true);
 

Braces +35 added lines, -13 removed lines

@@ -1,21 +1,43 @@
 <?php
 namespace PSFS;
 
-if (defined('PSFS_BOOTSTRAP_LOADED')) return;
+if (defined('PSFS_BOOTSTRAP_LOADED')) {
+    return;
+}
 
-if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
+if (!defined('SOURCE_DIR')) {
+    define('SOURCE_DIR', __DIR__);
+}
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
-}
-if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
+    }
+    } else {
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    }
+    }
+if (!defined('VENDOR_DIR')) {
+    define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
+}
+if (!defined('LOG_DIR')) {
+    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+}
+if (!defined('CACHE_DIR')) {
+    define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
+}
+if (!defined('CONFIG_DIR')) {
+    define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
+}
+if (!defined('WEB_DIR')) {
+    define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+}
 
 defined('PSFS_BOOTSTRAP_LOADED') or define('PSFS_BOOTSTRAP_LOADED', true);
 

src/services/GeneratorService.php

Doc Comments +3 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 
     /**
      * Método que revisa las traducciones directorio a directorio
-     * @param $path
+     * @param string $path
      * @param $locale
      * @return array
      */
@@ -85,7 +85,6 @@ 
      * Service that creates the root paths for the modules
      * @param string $module
      * @param string $mod_path
-     * @param boolean $isModule
      */
     private function createModulePath($module, $mod_path)
     {
@@ -99,7 +98,7 @@ 
      * Servicio que genera la estructura base
      * @param string $module
      * @param boolean $mod_path
-     * @return boolean
+     * @return boolean|null
      */
     private function createModulePathTree($module, $mod_path)
     {
@@ -464,7 +463,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 +63 added lines, -63 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())) {
                 GeneratorHelper::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 = "", $apiClass = "")
     {
-        $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);
@@ -92,7 +92,7 @@ 
         // Creates the src folder
         GeneratorHelper::createDir($mod_path);
         // Create module path
-        GeneratorHelper::createDir($mod_path . $module);
+        GeneratorHelper::createDir($mod_path.$module);
     }
 
     /**
@@ -108,14 +108,14 @@ 
         $paths = [
             "Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test"
         ];
-        $module_path = $mod_path . $module;
+        $module_path = $mod_path.$module;
         foreach ($paths as $path) {
-            GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR.$path);
         }
         //Creamos las carpetas de los assets
         $htmlPaths = array("css", "js", "img", "media", "font");
         foreach ($htmlPaths as $path) {
-            GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
         }
     }
 
@@ -128,7 +128,7 @@ 
      */
     private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '')
     {
-        $module_path = $mod_path . $module;
+        $module_path = $mod_path.$module;
         $this->generateControllerTemplate($module, $module_path, $force, $controllerType);
         $this->generateServiceTemplate($module, $module_path, $force);
         $this->genereateAutoloaderTemplate($module, $module_path, $force);
@@ -146,28 +146,28 @@ 
      */
     private function createModuleModels($module, $path)
     {
-        $module_path = $path . $module;
-        $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
+        $module_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");
 
         $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array(
             "module" => $module,
         ));
-        $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config" .
-            DIRECTORY_SEPARATOR . "config.php", true);
+        $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config".
+            DIRECTORY_SEPARATOR."config.php", true);
         $this->log->infoLog("Generado config genérico para propel:\n $ret");
     }
 
@@ -188,32 +188,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);
     }
 
@@ -227,8 +227,8 @@ 
     private function generateBaseApiTemplate($module, $mod_path, $force = false, $apiClass = "")
     {
         $created = true;
-        $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
-        $api_path = $mod_path . $module . DIRECTORY_SEPARATOR . 'Api';
+        $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
+        $api_path = $mod_path.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             while ($file = $dir->read()) {
@@ -256,7 +256,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);
     }
 
@@ -271,10 +271,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);
     }
@@ -296,7 +296,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);
     }
 
@@ -315,13 +315,13 @@ 
             "autoloader" => preg_replace('/(\\\|\/)/', '_', $module),
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
         ));
-        $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,
         ));
-        $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;
     }
 
@@ -342,7 +342,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);
     }
 
@@ -365,7 +365,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);
     }
 
@@ -383,7 +383,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);
     }
 
@@ -401,11 +401,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;
     }
@@ -434,7 +434,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);
     }
 
     /**
@@ -457,7 +457,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);
     }
 
     /**
@@ -471,12 +471,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);
                     }
                 }
             }
@@ -495,10 +495,10 @@ 
         GeneratorHelper::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);
                 }
             }
         }

src/base/config/ModuleForm.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             "Auth" => _("Requiere autenticación de usuario"),
             "AuthAdmin" => _("Requiere autenticación de administrador"),
         );
-        if(Config::getParam('psfs.auth')) {
+        if (Config::getParam('psfs.auth')) {
             $controllerTypes['SessionAuthApi'] = _('Requiere autenticación usando PSFS AUTH');
         }
         $this->add('module', array(

src/base/types/helpers/AdminHelper.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
     {
         $routes = [];
         foreach ($systemRoutes as $route => $params) {
-            if(isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
+            if (isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
                 $module = strtoupper($params['module']);
                 $mode = $params["visible"] ? 'visible' : 'hidden';
                 $routes[$module][$mode][] = [
@@ -41,11 +41,11 @@ 
                 ];
             }
         }
-        foreach($routes as $module => &$route) {
-            if(array_key_exists('visible', $route)) {
+        foreach ($routes as $module => &$route) {
+            if (array_key_exists('visible', $route)) {
                 uasort($route["visible"], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
-            if(array_key_exists('hidden', $route)) {
+            if (array_key_exists('hidden', $route)) {
                 uasort($route["hidden"], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
         }

src/controller/GeneratorController.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function generateModule()
     {
-        Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri());
+        Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri());
         /* @var $form \PSFS\base\config\ConfigForm */
         $form = new ModuleForm();
         $form->build();
@@ -61,8 +61,8 @@ 
                 $this->gen->createStructureModule($module, false, $type, $apiClass);
                 Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, _("Módulo %s generado correctamente")));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch (\Exception $e) {
-                Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (\Exception $e) {
+                Logger::getInstance()->infoLog($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 Security::getInstance()->setFlash("callback_message", $e->getMessage());
             }
         }