psfs / core

src/bootstrap.php

Spacing +11 added lines, -11 removed lines

@@ -4,16 +4,16 @@ 
 
 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('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('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');
 
 //Cargamos en memoria la función de desarrollo PRE
 if (!function_exists('pre')) {
@@ -22,7 +22,7 @@ 
         $html = '<pre style="padding:10px;margin:0;display:block;background: #EEE; box-shadow: inset 0 0 3px 3px #DDD; color: #666; text-shadow: 1px 1px 1px #CCC;border-radius: 5px;">';
         $html .= (is_null($var)) ? '<b>NULL</b>' : print_r($var, TRUE);
         $html .= '</pre>';
-        if(class_exists('\\PSFS\\Dispatcher')) {
+        if (class_exists('\\PSFS\\Dispatcher')) {
             $html .= '<pre>['.round(\PSFS\Dispatcher::getInstance()->getMem('MBytes'), 3).'Mb - '.round(\PSFS\Dispatcher::getInstance()->getTs(), 3).'s]</pre>';
         }
         ob_start();
@@ -30,7 +30,7 @@ 
         ob_flush();
         ob_end_clean();
         if ($die) {
-            if(class_exists('\\PSFS\\base\\Logger')) {
+            if (class_exists('\\PSFS\\base\\Logger')) {
                 \PSFS\base\Logger::log('Execution finished via pre', LOG_WARNING);
             }
             die;

Braces +31 added lines, -11 removed lines

@@ -1,19 +1,39 @@
 <?php
-if (defined('PSFS_BOOTSTRAP_LOADED')) return;
+if (defined('PSFS_BOOTSTRAP_LOADED')) {
+    return;
+}
 use Symfony\Component\Finder\Finder;
 
-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('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('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('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');
 
 //Cargamos en memoria la función de desarrollo PRE
 if (!function_exists('pre')) {

src/base/dto/Dto.php

Spacing +7 added lines, -7 removed lines

@@ -30,14 +30,14 @@ 
             try {
                 $reflectionClass = new \ReflectionClass($this);
                 $properties = $reflectionClass->getProperties(\ReflectionProperty::IS_PUBLIC);
-                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) {
-                Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+            }catch (\Exception $e) {
+                Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
             }
             return $dto;
         }
@@ -57,9 +57,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/types/SingletonTrait.php

Spacing +2 added lines, -2 removed lines

@@ -33,10 +33,10 @@
          */
         private static function __init($instance) {
             $loaded = false;
-            if(method_exists($instance, 'isLoaded')) {
+            if (method_exists($instance, 'isLoaded')) {
                 $loaded = $instance->isLoaded();
             }
-            if(false === $loaded && method_exists($instance, "init")) {
+            if (false === $loaded && method_exists($instance, "init")) {
                 $instance->init();
             }
         }

src/base/types/helpers/InjectorHelper.php

Spacing +3 added lines, -3 removed lines

@@ -54,13 +54,13 @@ 
      */
     public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace);
+        Logger::log('Create inyectable instance for '.$classNameSpace);
         $reflector = new \ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, "getInstance")) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;
@@ -74,7 +74,7 @@ 
     public static function getClassProperties($class)
     {
         $properties = [];
-        Logger::log('Extracting annotations properties from class ' . $class);
+        Logger::log('Extracting annotations properties from class '.$class);
         $selfReflector = new \ReflectionClass($class);
         if (false !== $selfReflector->getParentClass()) {
             $properties = self::getClassProperties($selfReflector->getParentClass()->getName());

src/base/types/helpers/SecurityHelper.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || NULL !== Config::getInstance()->get('restricted'))
         ) {
 
-            if(!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+            if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
                 //Si no hay fichero de usuarios redirigimos directamente al gestor
                 return UserController::getInstance()->adminers();
             }

src/base/types/helpers/AdminHelper.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
                 if (null !== $function && $this->hasExpiredCache($path, $expires)) {
                     $data = call_user_func($function);
                     $this->storeData($path, $data, $transform);
-                } else {
+                }else {
                     $data = $this->getDataFromFile($path, $transform);
                 }
             }

src/base/types/helpers/I18nHelper.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $translations = array();
         if (file_exists($absoluteTranslationFileName)) {
             @include($absoluteTranslationFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 

src/Dispatcher.php

Spacing +14 added lines, -14 removed lines

@@ -16,7 +16,7 @@ 
 use PSFS\base\Singleton;
 use PSFS\controller\ConfigController;
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . "bootstrap.php";
+require_once __DIR__.DIRECTORY_SEPARATOR."bootstrap.php";
 
 /**
  * Class Dispatcher
@@ -77,13 +77,13 @@ 
     private function setLocale()
     {
         $this->locale = $this->config->get("default_language");
-        Logger::log('Set locale to project [' . $this->locale . ']');
+        Logger::log('Set locale to project ['.$this->locale.']');
         // Load translations
-        putenv("LC_ALL=" . $this->locale);
+        putenv("LC_ALL=".$this->locale);
         setlocale(LC_ALL, $this->locale);
         // Load the locale path
-        $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
-        Logger::log('Set locale dir ' . $locale_path);
+        $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$locale_path);
         Config::createDir($locale_path);
         bindtextdomain('translations', $locale_path);
         textdomain('translations');
@@ -104,18 +104,18 @@ 
                 if (!$this->parser->isFile()) {
                     return $this->router->execute($this->actualUri);
                 }
-            } else {
+            }else {
                 return ConfigController::getInstance()->config();
             }
-        } catch (ConfigException $c) {
+        }catch (ConfigException $c) {
             return $this->dumpException($c);
-        } catch (SecurityException $s) {
+        }catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
-        } catch (UserAuthException $u) {
+        }catch (UserAuthException $u) {
             Request::getInstance()->redirect($this->router->getRoute($this->config->get('home_action')));
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             return $this->router->httpNotFound($r);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $this->dumpException($e);
         }
     }
@@ -157,7 +157,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -183,7 +183,7 @@ 
         if ($this->config->getDebugMode()) {
             Logger::log('Added handlers for errors');
             //Warning & Notice handler
-            set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+            set_error_handler(function($errno, $errstr, $errfile, $errline) {
                 Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline]);
                 throw new \Exception($errstr, 500);
             });
@@ -198,7 +198,7 @@ 
         Logger::log('Initialicing stats (mem + ts)');
         if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
             $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
-        } else {
+        }else {
             $this->ts = $this->parser->getTs();
         }
         $this->mem = memory_get_usage();

src/base/Template.php

Unused Use Statements -3 removed lines

@@ -7,10 +7,7 @@
 use PSFS\base\extension\AssetsTokenParser;
 use PSFS\base\extension\TemplateFunctions;
 use PSFS\base\types\helpers\ResponseHelper;
-use PSFS\base\types\helpers\SecurityHelper;
-use PSFS\base\types\helpers\TemplateHelper;
 use PSFS\base\types\SingletonTrait;
-use PSFS\Dispatcher;
 
 
 class Template

Spacing +14 added lines, -14 removed lines

@@ -130,7 +130,7 @@ 
         ResponseHelper::setStatusHeader($this->status_code);
         ResponseHelper::setAuthHeaders($this->public_zone);
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -146,14 +146,14 @@ 
         Logger::log('Start output response');
         ob_start();
         $this->setReponseHeaders($contentType, $cookies);
-        header('Content-length: ' . strlen($output));
+        header('Content-length: '.strlen($output));
 
         $cache = Cache::needCache();
         if (false !== $cache && $this->status_code === Template::STATUS_OK && $this->debug === false) {
             Logger::log('Saving output response into cache');
             $cacheName = $this->cache->getRequestCacheHash();
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $cacheName, $output);
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $cacheName . ".headers", headers_list(), Cache::JSON);
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$cacheName, $output);
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$cacheName.".headers", headers_list(), Cache::JSON);
         }
         echo $output;
 
@@ -170,11 +170,11 @@ 
     {
         Logger::log('Close template render');
         Security::getInstance()->setSessionKey("lastRequest", array(
-            "url" => Request::getInstance()->getRootUrl() . Request::requestUri(),
+            "url" => Request::getInstance()->getRootUrl().Request::requestUri(),
             "ts" => microtime(true),
         ));
         Security::getInstance()->updateSession();
-        Logger::log('End request: ' . Request::requestUri(), LOG_INFO);
+        Logger::log('End request: '.Request::requestUri(), LOG_INFO);
         exit;
     }
 
@@ -223,7 +223,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -337,7 +337,7 @@ 
     public function regenerateTemplates()
     {
         $this->generateTemplatesCache();
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true);
         $translations = [];
         if (is_array($domains)) {
             $translations = $this->parsePathTranslations($domains);
@@ -359,8 +359,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->load(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->load(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]);
                 }
             }
@@ -434,9 +434,9 @@ 
      */
     private function loadDomains()
     {
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true);
-        if(null !== $domains) {
-            foreach($domains as $domain => $paths) {
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true);
+        if (null !== $domains) {
+            foreach ($domains as $domain => $paths) {
                 $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain));
             }
         }
@@ -451,7 +451,7 @@ 
         $this->cache = Cache::getInstance();
         $loader = new \Twig_Loader_Filesystem(Config::getInstance()->getTemplatePath());
         $this->tpl = new \Twig_Environment($loader, array(
-            'cache' => Config::getInstance()->getCachePath() . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => Config::getInstance()->getCachePath().DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => Config::getParam('twig.auto_reload', TRUE),
         ));