psfs / core

src/base/Singleton.php

Braces +3 added lines, -1 removed lines

@@ -135,9 +135,11 @@
                 $cacheService->storeData($cacheFilename, $properties, Cache::JSON);
             }
             /** @var \ReflectionProperty $property */
-            if (!empty($properties) && is_array($properties)) foreach ($properties as $property => $class) {
+            if (!empty($properties) && is_array($properties)) {
+                foreach ($properties as $property => $class) {
                 $this->load($property, true, $class);
             }
+            }
             $this->setLoaded();
         } else {
             Logger::log(get_class($this) . ' already loaded', LOG_INFO);

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 
     public function __construct()
     {
-        Logger::log(get_class($this) . ' constructor invoked');
+        Logger::log(get_class($this).' constructor invoked');
         $this->init();
     }
 
@@ -90,14 +90,14 @@ 
         $calledClass = get_called_class();
         try {
             $instance = InjectorHelper::constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass);
-            $setter = "set" . ucfirst($variable);
+            $setter = "set".ucfirst($variable);
             if (method_exists($calledClass, $setter)) {
                 $this->$setter($instance);
-            } else {
+            }else {
                 $this->$variable = $instance;
             }
-        } catch (\Exception $e) {
-            Logger::log($e->getMessage() . ': ' . $e->getFile() . ' [' . $e->getLine() . ']', LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log($e->getMessage().': '.$e->getFile().' ['.$e->getLine().']', LOG_ERR);
         }
         return $this;
     }
@@ -109,7 +109,7 @@ 
     {
         if (!$this->isLoaded()) {
             $filename = sha1(get_class($this));
-            $cacheFilename = "reflections" . DIRECTORY_SEPARATOR . substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2) . DIRECTORY_SEPARATOR . $filename . ".json";
+            $cacheFilename = "reflections".DIRECTORY_SEPARATOR.substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2).DIRECTORY_SEPARATOR.$filename.".json";
             /** @var \PSFS\base\Cache $cacheService */
             $cacheService = Cache::getInstance();
             /** @var \PSFS\base\config\Config $configService */
@@ -124,8 +124,8 @@ 
                 $this->load($property, true, $class);
             }
             $this->setLoaded();
-        } else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+        }else {
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 }

src/base/Service.php

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
         $this->url = NULL;
         $this->params = array();
         $this->headers = array();
-        Logger::log("Context service for " . get_called_class() . " cleared!");
+        Logger::log("Context service for ".get_called_class()." cleared!");
     }
 
     /**

Doc Comments +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
     /**
      * Add request param
      *
-     * @param $key
+     * @param integer $key
      * @param null $value
      *
      * @return \PSFS\base\Service
@@ -153,8 +153,8 @@ 
     }
 
     /**
-     * @param $header
-     * @param null $content
+     * @param string $header
+     * @param string $content
      *
      * @return $this
      */

src/autoload.php

Spacing +4 added lines, -4 removed lines

@@ -21,11 +21,11 @@
             $path = str_replace("\\", DIRECTORY_SEPARATOR, $class);
 
             // filepath
-            $abs_path = SOURCE_DIR . DIRECTORY_SEPARATOR . $path . ".php";
+            $abs_path = SOURCE_DIR.DIRECTORY_SEPARATOR.$path.".php";
             if (!file_exists($abs_path)) {
-                pre('→ ' . $class);
-                pre('→ ' . $path);
-                pre('→ ' . $abs_path);
+                pre('→ '.$class);
+                pre('→ '.$path);
+                pre('→ '.$abs_path);
             }
 
             // require the file

src/base/Cache.php

Doc Comments +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
 
     /**
      * Método que guarda en fichero los datos pasados
-     * @param $path
+     * @param string $path
      * @param $data
      * @param int $transform
      * @param boolean $absolutePath
@@ -156,7 +156,7 @@ 
 
     /**
      * Método estático que revisa si se necesita cachear la respuesta de un servicio o no
-     * @return integer|boolean
+     * @return integer
      */
     public static function needCache()
     {

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
      */
     private function saveTextToFile($data, $path, $absolute = false)
     {
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $filename = basename($absolutePath);
         GeneratorHelper::createDir(str_replace($filename, "", $absolutePath));
         if (false === file_put_contents($absolutePath, $data)) {
@@ -48,7 +48,7 @@ 
     public function getDataFromFile($path, $transform = Cache::TEXT, $absolute = false)
     {
         $data = null;
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         if (file_exists($absolutePath)) {
             $data = file_get_contents($absolutePath);
         }
@@ -64,7 +64,7 @@ 
      */
     private function hasExpiredCache($path, $expires = 300, $absolute = false)
     {
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $lasModificationDate = filemtime($absolutePath);
         return ($lasModificationDate + $expires <= time());
     }
@@ -144,11 +144,11 @@ 
     public function readFromCache($path, $expires = 300, callable $function, $transform = Cache::TEXT)
     {
         $data = null;
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) {
+        if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$path)) {
             if (null !== $function && $this->hasExpiredCache($path, $expires)) {
                 $data = call_user_func($function);
                 $this->storeData($path, $data, $transform);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -194,7 +194,7 @@ 
         $hash = "";
         $action = Security::getInstance()->getSessionKey("__CACHE__");
         if (null !== $action && $action["cache"] > 0) {
-            $hash = $action["http"] . " " . $action["slug"];
+            $hash = $action["http"]." ".$action["slug"];
         }
         return sha1($hash);
     }

src/controller/I18nController.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();
 
-        $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;
 
         //xgettext localizations
         $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale));

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
     public function getTranslations($locale)
     {
         //Default locale
-        if (null === $locale) $locale = $this->config->get("default_language");
+        if (null === $locale) {
+            $locale = $this->config->get("default_language");
+        }
 
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();

src/base/Logger.php

Doc Comments +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
      * @param string $msg
      * @param array $context
      *
-     * @return bool
+     * @return boolean|null
      */
     public function debugLog($msg = '', $context = [])
     {
@@ -97,7 +97,7 @@ 
 
     /**
      * Método que escribe un log de Error
-     * @param $msg
+     * @param string $msg
      * @param array $context
      *
      * @return bool
@@ -109,7 +109,7 @@ 
 
     /**
      * Método que escribe un log de Warning
-     * @param $msg
+     * @param string $msg
      * @param array $context
      * @return bool
      */

Spacing +4 added lines, -4 removed lines

@@ -14,8 +14,8 @@ 
 
 
 if (!defined("LOG_DIR")) {
-    GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-    define("LOG_DIR", BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+    GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+    define("LOG_DIR", BASE_DIR.DIRECTORY_SEPARATOR.'logs');
 }
 
 /**
@@ -48,7 +48,7 @@ 
         $config = Config::getInstance();
         $args = func_get_args();
         list($logger, $debug, $path) = $this->setup($config, $args);
-        $this->stream = fopen($path . DIRECTORY_SEPARATOR . date("Ymd") . ".log", "a+");
+        $this->stream = fopen($path.DIRECTORY_SEPARATOR.date("Ymd").".log", "a+");
         $this->addPushLogger($logger, $debug, $config);
         $this->log_level = Config::getInstance()->get('log.level') ?: 'info';
     }
@@ -202,7 +202,7 @@ 
     private function createLoggerPath(Config $config)
     {
         $logger = $this->setLoggerName($config);
-        $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m');
+        $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m');
         GeneratorHelper::createDir($path);
 
         return $path;

src/base/Router.php

Braces +3 added lines, -1 removed lines

@@ -393,8 +393,10 @@
             throw new RouterException(_("No existe la ruta especificada"));
         }
         $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
-        if (!empty($params)) foreach ($params as $key => $value) {
+        if (!empty($params)) {
+            foreach ($params as $key => $value) {
             $url = str_replace("{" . $key . "}", $value, $url);
+        }
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
             $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
         }

Spacing +32 added lines, -32 removed lines

@@ -60,12 +60,12 @@ 
      */
     public function init()
     {
-        if (!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json") || Config::getInstance()->getDebugMode()) {
+        if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json") || Config::getInstance()->getDebugMode()) {
             $this->hydrateRouting();
             $this->simpatize();
-        } else {
-            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", Cache::JSON, TRUE);
-            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, TRUE);
+        }else {
+            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", Cache::JSON, TRUE);
+            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, TRUE);
             $this->checkExternalModules(false);
         }
     }
@@ -90,7 +90,7 @@ 
                 "success" => FALSE,
                 "error" => $e->getMessage(),
             )), 'application/json');
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $e,
                 'trace' => $e->getTraceAsString(),
@@ -141,12 +141,12 @@ 
             SecurityHelper::checkRestrictedAccess($route);
             //Search action and execute
             $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
+        }catch (AccessDeniedException $e) {
             Logger::log(_('Solicitamos credenciales de acceso a zona restringida'));
             return Admin::staticAdminLogon($route);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             Logger::log($r->getMessage(), LOG_WARNING);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -163,7 +163,7 @@ 
      */
     protected function searchAction($route)
     {
-        Logger::log('Searching action to execute: ' . $route, LOG_INFO);
+        Logger::log('Searching action to execute: '.$route, LOG_INFO);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = (array_key_exists('path', $parts)) ? $parts['path'] : $route;
@@ -177,7 +177,7 @@ 
                 $class = RouterHelper::getClassToCall($action);
                 try {
                     $this->executeCachedRoute($route, $action, $class, $get);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw new RouterException($e->getMessage(), 404, $e);
                 }
@@ -206,17 +206,17 @@ 
             $externalModules = explode(',', $externalModules);
             foreach ($externalModules as &$module) {
                 $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module);
-                $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src';
+                $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src';
                 if (file_exists($externalModulePath)) {
                     $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0);
                     if (!empty($externalModule)) {
                         foreach ($externalModule as $modulePath) {
                             $extModule = $modulePath->getBasename();
-                            $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php');
+                            $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php');
                             if (file_exists($moduleAutoloader)) {
                                 @include $moduleAutoloader;
-                                if($hydrateRoute) {
-                                    $this->routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $this->routing);
+                                if ($hydrateRoute) {
+                                    $this->routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $this->routing);
                                 }
                             }
                         }
@@ -238,11 +238,11 @@ 
             $modules = $this->finder->directories()->in($modulesPath)->depth(0);
             foreach ($modules as $modulePath) {
                 $module = $modulePath->getBasename();
-                $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing);
+                $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing);
             }
         }
         $this->checkExternalModules();
-        $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->domains, Cache::JSON, TRUE);
+        $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->domains, Cache::JSON, TRUE);
     }
 
     /**
@@ -257,7 +257,7 @@ 
             $home_params = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = RouterHelper::extractHttpRoute($pattern);
-                if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) {
+                if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) {
                     $home_params = $params;
                 }
             }
@@ -282,7 +282,7 @@ 
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->depth(1)->name("*.php");
         foreach ($files as $file) {
             $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname()));
-            $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace);
+            $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace);
         }
         $this->finder = new Finder();
 
@@ -351,7 +351,7 @@ 
             if (!$this->domains) {
                 $this->domains = [];
             }
-            $domain = "@" . $class->getConstant("DOMAIN") . "/";
+            $domain = "@".$class->getConstant("DOMAIN")."/";
             if (!array_key_exists($domain, $this->domains)) {
                 $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
             }
@@ -366,11 +366,11 @@ 
      */
     public function simpatize()
     {
-        $translationFileName = "translations" . DIRECTORY_SEPARATOR . "routes_translations.php";
-        $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName;
+        $translationFileName = "translations".DIRECTORY_SEPARATOR."routes_translations.php";
+        $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName;
         $this->generateSlugs($absoluteTranslationFileName);
         GeneratorHelper::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
 
         return $this;
     }
@@ -388,16 +388,16 @@ 
     public function getRoute($slug = '', $absolute = FALSE, $params = [])
     {
         if (strlen($slug) === 0) {
-            return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/';
+            return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/';
         }
         if (NULL === $slug || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(_("No existe la ruta especificada"));
         }
-        $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
+        $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug];
         if (!empty($params)) foreach ($params as $key => $value) {
-            $url = str_replace("{" . $key . "}", $value, $url);
+            $url = str_replace("{".$key."}", $value, $url);
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
-            $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
+            $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url);
@@ -458,19 +458,19 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route, LOG_INFO);
+        Logger::log('Executing route '.$route, LOG_INFO);
         Security::getInstance()->setSessionKey("__CACHE__", $action);
         $cache = Cache::needCache();
         $execute = TRUE;
         if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) {
             $cacheDataName = $this->cache->getRequestCacheHash();
-            $tmpDir = substr($cacheDataName, 0, 2) . DIRECTORY_SEPARATOR . substr($cacheDataName, 2, 2) . DIRECTORY_SEPARATOR;
-            $cachedData = $this->cache->readFromCache("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheDataName,
-                $cache, function () {
+            $tmpDir = substr($cacheDataName, 0, 2).DIRECTORY_SEPARATOR.substr($cacheDataName, 2, 2).DIRECTORY_SEPARATOR;
+            $cachedData = $this->cache->readFromCache("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheDataName,
+                $cache, function() {
                 });
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheDataName . ".headers",
-                    $cache, function () {
+                $headers = $this->cache->readFromCache("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheDataName.".headers",
+                    $cache, function() {
                     }, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;

src/base/types/helpers/RouterHelper.php

Braces +9 added lines, -3 removed lines

@@ -56,8 +56,10 @@ 
         $_route = explode("/", $url['path']);
         $_pattern = explode("/", $pattern);
         $get = array();
-        if (!empty($_pattern)) foreach ($_pattern as $index => $component) {
+        if (!empty($_pattern)) {
+            foreach ($_pattern as $index => $component) {
             $_get = array();
+        }
             preg_match_all('/^\{(.*)\}$/i', $component, $_get);
             if (!empty($_get[1]) && isset($_route[$index])) {
                 $get[array_pop($_get[1])] = $_route[$index];
@@ -151,12 +153,16 @@ 
         $params = [];
         $parameters = $method->getParameters();
         /** @var \ReflectionParameter $param */
-        if (count($parameters) > 0) foreach ($parameters as $param) {
+        if (count($parameters) > 0) {
+            foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
+        }
                 $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        } else {
+            $default = $regex;
+        }
 
         return array($regex, $default, $params);
     }

Doc Comments +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
     /**
      * Método que extrae los parámetros de una función
      *
-     * @param array $sr
+     * @param string[] $sr
      * @param \ReflectionMethod $method
      *
      * @return array
@@ -207,7 +207,7 @@ 
      *
      * @param string $docComments
      *
-     * @return bool
+     * @return string
      */
     public static function extractReflectionCacheability($docComments)
     {

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
     public static function getClassToCall($action)
     {
         Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action);
-        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\" . $action["class"];
+        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\".$action["class"];
         $class = (method_exists($actionClass, "getInstance")) ? $actionClass::getInstance() : new $actionClass;
         return $class;
     }
@@ -108,7 +108,7 @@ 
         $expr = preg_quote($expr, '/');
         $expr = str_replace('###', '(.*)', $expr);
         $expr2 = preg_replace('/\(\.\*\)$/', '', $expr);
-        $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path);
+        $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path);
         return $matched;
     }
 
@@ -119,8 +119,8 @@ 
      */
     public static function extractDomainInfo(\ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-        $path = realpath($path) . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+        $path = realpath($path).DIRECTORY_SEPARATOR;
         $tpl_path = "templates";
         $public_path = "public";
         $model_path = "models";
@@ -130,13 +130,13 @@ 
             $model_path = ucfirst($model_path);
         }
         if ($class->hasConstant("TPL")) {
-            $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+            $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
         }
         return [
             "base" => $path,
-            "template" => $path . $tpl_path,
-            "model" => $path . $model_path,
-            "public" => $path . $public_path,
+            "template" => $path.$tpl_path,
+            "model" => $path.$model_path,
+            "public" => $path.$public_path,
         ];
     }
 
@@ -158,9 +158,9 @@ 
         if (count($parameters) > 0) foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
-                $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
+                $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        }else $default = $regex;
 
         return array($regex, $default, $params);
     }
@@ -240,7 +240,7 @@ 
             $default = str_replace('{__DOMAIN__}', $module, $default);
             $httpMethod = RouterHelper::extractReflectionHttpMethod($docComments);
             $label = RouterHelper::extractReflectionLabel(str_replace('{__API__}', $api, $docComments));
-            $route = $httpMethod . "#|#" . $regex;
+            $route = $httpMethod."#|#".$regex;
             $info = [
                 "method" => $method->getName(),
                 "params" => $params,

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