psfs / core

src/bootstrap.php

Spacing +14 added lines, -14 removed lines

@@ -6,20 +6,20 @@ 
 
 defined('SOURCE_DIR') or define('SOURCE_DIR', __DIR__);
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-defined('VENDOR_DIR') or define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-defined('LOG_DIR') or define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-defined('CACHE_DIR') or define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-defined('CONFIG_DIR') or define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-defined('WEB_DIR') or define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
-defined('LOCALE_DIR') or define('LOCALE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+defined('VENDOR_DIR') or define('VENDOR_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'vendor');
+defined('LOG_DIR') or define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+defined('CACHE_DIR') or define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+defined('CONFIG_DIR') or define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+defined('WEB_DIR') or define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
+defined('LOCALE_DIR') or define('LOCALE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
 
-if(!class_exists(bootstrap::class)) {
+if (!class_exists(bootstrap::class)) {
     /**
      * Class Bootstrap
      * @package PSFS
@@ -27,9 +27,9 @@ 
     class bootstrap {
         protected static $loaded = false;
         public static function load() {
-            if(!self::$loaded) {
+            if (!self::$loaded) {
                 defined('PSFS_BOOTSTRAP_LOADED') or define('PSFS_BOOTSTRAP_LOADED', true);
-                if(class_exists("\\PSFS\\base\\Logger")) \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
+                if (class_exists("\\PSFS\\base\\Logger")) \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
                 self::$loaded = true;
             }
         }

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
         public static function load() {
             if(!self::$loaded) {
                 defined('PSFS_BOOTSTRAP_LOADED') or define('PSFS_BOOTSTRAP_LOADED', true);
-                if(class_exists("\\PSFS\\base\\Logger")) \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
+                if(class_exists("\\PSFS\\base\\Logger")) {
+                    \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
+                }
                 self::$loaded = true;
             }
         }

src/base/types/traits/Api/MutationTrait.php

Spacing +24 added lines, -24 removed lines

@@ -65,21 +65,21 @@ 
         if (count($pks) == 1) {
             $pks = array_keys($pks);
             return [
-                $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD
+                $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD
             ];
         } elseif (count($pks) > 1) {
             $apiPks = [];
             $principal = '';
             $sep = 'CONCAT(';
             foreach ($pks as $pk) {
-                $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName();
-                $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName();
-                $sep = ', "' . Api::API_PK_SEPARATOR . '", ';
+                $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName();
+                $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName();
+                $sep = ', "'.Api::API_PK_SEPARATOR.'", ';
             }
             $principal .= ')';
             $apiPks[$principal] = Api::API_MODEL_KEY_FIELD;
             return $apiPks;
-        } else {
+        }else {
             throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta'));
         }
     }
@@ -102,10 +102,10 @@ 
         $pks = '';
         $sep = '';
         foreach ($tableMap->getPrimaryKeys() as $pk) {
-            $pks .= $sep . $pk->getFullyQualifiedName();
+            $pks .= $sep.$pk->getFullyQualifiedName();
             $sep = ', "|", ';
         }
-        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD;
+        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD;
     }
 
     /**
@@ -127,7 +127,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -146,15 +146,15 @@ 
             $this->addPkToList();
         }
         if (!empty($this->extraColumns)) {
-            if(Config::getParam('api.extrafields.compat', true)) {
+            if (Config::getParam('api.extrafields.compat', true)) {
                 $fields = array_values($this->extraColumns);
-            } else {
+            }else {
                 $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD);
                 $fields = explode(',', $returnFields ?: '');
                 $fields[] = self::API_MODEL_KEY_FIELD;
             }
             foreach ($this->extraColumns as $expression => $columnName) {
-                if(empty($fields) || in_array($columnName, $fields)) {
+                if (empty($fields) || in_array($columnName, $fields)) {
                     $query->withColumn($expression, $columnName);
                 }
             }
@@ -186,17 +186,17 @@ 
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
-            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap';
+            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $modelI18nTableMapClass::getTableMap();
-            foreach($modelI18nTableMap->getColumns() as $columnMap) {
-                if(!$columnMap->isPrimaryKey()) {
-                    $query->withColumn($modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName(), $columnMap->getPhpName());
-                } elseif(!$columnMap->isForeignKey()) {
-                    $query->withColumn('IFNULL(' . $modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName() . ', "'.$this->lang.'")', $columnMap->getPhpName());
+            foreach ($modelI18nTableMap->getColumns() as $columnMap) {
+                if (!$columnMap->isPrimaryKey()) {
+                    $query->withColumn($modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName(), $columnMap->getPhpName());
+                } elseif (!$columnMap->isForeignKey()) {
+                    $query->withColumn('IFNULL('.$modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName().', "'.$this->lang.'")', $columnMap->getPhpName());
                 }
             }
         }
@@ -210,20 +210,20 @@ 
         $model->fromArray($data);
         $tableMap = $this->getTableMap();
         try {
-            if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n'))
+            if ($tableMap->hasRelation($tableMap->getPhpName().'I18n'))
             {
-                $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
+                $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
                 $i18NTableMap = $relateI18n->getLocalTable();
-                foreach($i18NTableMap->getColumns() as $columnMap) {
-                    $method = 'set' . $columnMap->getPhpName();
-                    if(!($columnMap->isPrimaryKey() && $columnMap->isForeignKey())
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
+                    $method = 'set'.$columnMap->getPhpName();
+                    if (!($columnMap->isPrimaryKey() && $columnMap->isForeignKey())
                         &&array_key_exists($columnMap->getPhpName(), $data)
                         && method_exists($model, $method)) {
                         $model->$method($data[$columnMap->getPhpName()]);
                     }
                 }
             }
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
     }

src/base/extension/CustomTranslateExtension.php

Spacing +15 added lines, -15 removed lines

@@ -27,22 +27,22 @@ 
      * @param bool $use_base
      */
     protected static function checkLoad($custom_key = null, $force_reload = false, $use_base = false) {
-        if($force_reload) self::dropInstance();
+        if ($force_reload) self::dropInstance();
         self::$locale = I18nHelper::extractLocale(Security::getInstance()->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY));
         self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
-        if(!$use_base) {
+        if (!$use_base) {
             $custom_key = $custom_key ?: Security::getInstance()->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
         }
-        if(null !== $custom_key) {
-            Logger::log('[' . self::class . '] Custom key detected: ' . $custom_key, LOG_INFO);
-            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $custom_key, self::$locale . '.json']);
-        } else {
-            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']);
+        if (null !== $custom_key) {
+            Logger::log('['.self::class.'] Custom key detected: '.$custom_key, LOG_INFO);
+            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $custom_key, self::$locale.'.json']);
+        }else {
+            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']);
         }
-        if(file_exists(self::$filename)) {
-            Logger::log('[' . self::class . '] Custom locale detected: ' . $custom_key . ' [' . self::$locale . ']', LOG_INFO);
+        if (file_exists(self::$filename)) {
+            Logger::log('['.self::class.'] Custom locale detected: '.$custom_key.' ['.self::$locale.']', LOG_INFO);
             self::$translations = json_decode(file_get_contents(self::$filename), true);
-        } elseif(null !== $custom_key) {
+        } elseif (null !== $custom_key) {
             self::checkLoad(null, $force_reload, true);
         }
     }
@@ -83,12 +83,12 @@ 
      */
     public static function _($message, $custom_key = null, $force_reload = false) {
         self::checkLoad($custom_key, $force_reload);
-        if(array_key_exists($message, self::$translations)) {
-            $translation =  self::$translations[$message];
-        } else {
+        if (array_key_exists($message, self::$translations)) {
+            $translation = self::$translations[$message];
+        }else {
             $translation = gettext($message);
         }
-        if(self::$generate) {
+        if (self::$generate) {
             self::generate($message, $translation);
         }
         return $translation;
@@ -99,7 +99,7 @@ 
      * @param string $translation
      */
     protected static function generate($message, $translation) {
-        if(!array_key_exists($message, self::$translations)) {
+        if (!array_key_exists($message, self::$translations)) {
             self::$translations[$message] = $translation;
         }
         file_put_contents(self::$filename, json_encode(array_unique(self::$translations), JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));

Braces +3 added lines, -1 removed lines

@@ -27,7 +27,9 @@
      * @param bool $use_base
      */
     protected static function checkLoad($custom_key = null, $force_reload = false, $use_base = false) {
-        if($force_reload) self::dropInstance();
+        if($force_reload) {
+            self::dropInstance();
+        }
         self::$locale = I18nHelper::extractLocale(Security::getInstance()->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY));
         self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
         if(!$use_base) {

src/base/types/traits/SystemTrait.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 
 use PSFS\base\config\Config;
 use PSFS\base\Logger;
-use PSFS\base\Request;
-use PSFS\base\Router;
 use PSFS\base\types\helpers\SlackHelper;
 
 /**

Spacing +10 added lines, -10 removed lines

@@ -38,7 +38,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -62,34 +62,34 @@ 
     protected function bindWarningAsExceptions()
     {
         Logger::log('Added handlers for errors');
-        if(Config::getParam('debug')) {
+        if (Config::getParam('debug')) {
             Logger::log('Setting error_reporting as E_ALL');
             ini_set('error_reporting', E_ALL);
             ini_set('display_errors', 1);
         }
         //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, 'errno' => $errno]);
             return true;
         }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
 
-        register_shutdown_function(function () {
+        register_shutdown_function(function() {
             $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors();
-            if( $error !== NULL) {
+            if ($error !== NULL) {
                 $errno   = $error["type"];
                 $errfile = $error["file"];
                 $errline = $error["line"];
                 $errstr  = $error["message"];
                 Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
-                if(null !== Config::getParam('log.slack.hook')) {
+                if (null !== Config::getParam('log.slack.hook')) {
                     SlackHelper::getInstance()->trace($errstr, $errfile, $errline, $error);
                 }
             }
 
-            if(self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
+            if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
                 SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [
-                    'time' => round(self::getTs(), 3) . ' secs',
-                    'memory' => round(self::getMem('MBytes'), 3) . ' Mb',
+                    'time' => round(self::getTs(), 3).' secs',
+                    'memory' => round(self::getMem('MBytes'), 3).' Mb',
                 ]);
             }
             return false;
@@ -104,7 +104,7 @@ 
         Logger::log('Initializing stats (mem + ts)');
         if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
             $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
-        } else {
+        }else {
             $this->ts = PSFS_START_TS;
         }
         $this->mem = PSFS_START_MEM;

src/base/dto/JsonResponse.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $this->success = $result;
         $this->total = $total ?: (is_array($data) ? count($data) : 0);
         $this->pages = $pages;
-        if(null !== $message) {
+        if (null !== $message) {
             $this->message = $message;
         }
     }

src/base/types/helpers/SlackHelper.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             'text' => 'PSFS Error notifier',
             'attachments' => [
                 [
-                    "text" => $file . (strlen($line) ? ' [' . $line . ']' : ''),
+                    "text" => $file.(strlen($line) ? ' ['.$line.']' : ''),
                     "color" => "danger",
                     "title" => $message,
                     'fallback' => 'PSFS Error notifier',

src/base/extension/AssetsParser.php

Spacing +58 added lines, -58 removed lines

@@ -35,7 +35,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::getParam('debug');
         $this->cdnPath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl());
@@ -58,7 +58,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;
     }
 
@@ -71,12 +71,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;
                 }
             }
@@ -93,7 +93,7 @@ 
     public function setHash($hash)
     {
         $cache = Config::getParam('cache.var', '');
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -127,8 +127,8 @@ 
      */
     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)) {
                 $minifier = new CSS();
@@ -136,15 +136,15 @@ 
                     $data = $this->processCssLine($file, $base, $data);
                 }
             }
-            if($this->debug) {
-                $this->storeContents($base . $this->hash . ".css", $data);
-            } else {
+            if ($this->debug) {
+                $this->storeContents($base.$this->hash.".css", $data);
+            }else {
                 $minifier = new CSS();
                 $minifier->add($data);
                 ini_set('max_execution_time', -1);
                 ini_set('memory_limit', -1);
                 GeneratorHelper::createDir($base);
-                $minifier->minify($base . $this->hash . ".css");
+                $minifier->minify($base.$this->hash.".css");
                 unset($cssMinifier);
                 ini_restore('memory_limit');
                 ini_restore('max_execution_time');
@@ -160,8 +160,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)) {
                 $minifier = new JS();
@@ -170,19 +170,19 @@ 
                     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")) {
                             $minifier->add($file);
                             //$data = $this->putProductionJs($base, $file, $data);
                         }
                     }
                 }
-                if($this->debug) {
-                    $this->storeContents($base . $this->hash . ".js", $data);
-                } else {
+                if ($this->debug) {
+                    $this->storeContents($base.$this->hash.".js", $data);
+                }else {
                     ini_set('max_execution_time', -1);
                     ini_set('memory_limit', -1);
                     GeneratorHelper::createDir($base);
-                    $minifier->minify($base . $this->hash . ".js");
+                    $minifier->minify($base.$this->hash.".js");
                     ini_restore('memory_limit');
                     ini_restore('max_execution_time');
                 }
@@ -202,7 +202,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));
         }
     }
 
@@ -231,9 +231,9 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
+        }else {
             $basePath = $this->cdnPath ?: '';
-            echo "\t\t<script type='text/javascript' src='" . $basePath . "/js/" . $this->hash . ".js'></script>\n";
+            echo "\t\t<script type='text/javascript' src='".$basePath."/js/".$this->hash.".js'></script>\n";
         }
     }
 
@@ -246,9 +246,9 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
+        }else {
             $basePath = $this->cdnPath ?: '';
-            echo "\t\t<link href='" . $basePath . "/css/" . $this->hash . ".css' rel='stylesheet'>";
+            echo "\t\t<link href='".$basePath."/css/".$this->hash.".css' rel='stylesheet'>";
         }
     }
 
@@ -259,20 +259,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);
         }
     }
@@ -289,21 +289,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;
@@ -318,12 +318,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;
     }
@@ -365,60 +365,60 @@ 
     {
         $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 (preg_match("/(text|html)/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 = "templates";
             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);
     }
@@ -436,15 +436,15 @@ 
         if (preg_match_all('#url\((.*?)\)#', $line, $urls, PREG_SET_ORDER)) {
             foreach ($urls as $source) {
                 $orig = self::calculateResourcePathname($filename_path, $source);
-                if(!empty($orig)) {
+                if (!empty($orig)) {
                     $orig_part = preg_split("/Public/i", $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);
                     }
-                } else {
-                    Logger::log($filename_path . ' has an empty origin with the url ' . $source, LOG_WARNING);
+                }else {
+                    Logger::log($filename_path.' has an empty origin with the url '.$source, LOG_WARNING);
                 }
             }
         }

src/base/types/Api.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use PSFS\base\Request;
 use PSFS\base\Singleton;
 use PSFS\base\types\helpers\ApiHelper;
-use PSFS\base\types\helpers\Inspector;
 use PSFS\base\types\traits\Api\ManagerTrait;
 
 /**

Spacing +36 added lines, -36 removed lines

@@ -82,19 +82,19 @@ 
     public function init()
     {
         parent::init();
-        Logger::log(static::class . ' init', LOG_DEBUG);
+        Logger::log(static::class.' init', LOG_DEBUG);
         $this->domain = $this->getDomain();
         $this->hydrateRequestData();
         $this->hydrateOrders();
-        if($this instanceof CustomApi === false) {
+        if ($this instanceof CustomApi === false) {
             $this->createConnection($this->getTableMap());
         }
         $this->setLoaded(true);
-        Logger::log(static::class . ' loaded', LOG_DEBUG);
+        Logger::log(static::class.' loaded', LOG_DEBUG);
     }
 
     private function checkActions($method) {
-        switch($method) {
+        switch ($method) {
             default:
             case 'modelList': $this->action = self::API_ACTION_LIST; break;
             case 'get': $this->action = self::API_ACTION_GET; break;
@@ -111,7 +111,7 @@ 
     protected function hydrateOrders()
     {
         if (count($this->query)) {
-            Logger::log(static::class . ' gathering query string', LOG_DEBUG);
+            Logger::log(static::class.' gathering query string', LOG_DEBUG);
             foreach ($this->query as $key => $value) {
                 if ($key === self::API_ORDER_FIELD && is_array($value)) {
                     foreach ($value as $field => $direction) {
@@ -128,10 +128,10 @@ 
      */
     protected function extractPagination()
     {
-        Logger::log(static::class . ' extract pagination start', LOG_DEBUG);
+        Logger::log(static::class.' extract pagination start', LOG_DEBUG);
         $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1;
         $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100;
-        Logger::log(static::class . ' extract pagination end', LOG_DEBUG);
+        Logger::log(static::class.' extract pagination end', LOG_DEBUG);
         return array($page, $limit);
     }
 
@@ -142,7 +142,7 @@ 
      */
     private function addOrders(ModelCriteria &$query)
     {
-        Logger::log(static::class . ' extract orders start ', LOG_DEBUG);
+        Logger::log(static::class.' extract orders start ', LOG_DEBUG);
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
         foreach ($this->order->getOrders() as $field => $direction) {
@@ -150,17 +150,17 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
         }
         if (!$orderAdded) {
-            foreach($this->getPkDbName() as $pk => $phpName) {
+            foreach ($this->getPkDbName() as $pk => $phpName) {
                 $query->addAscendingOrderByColumn($pk);
             }
         }
-        Logger::log(static::class . ' extract orders end', LOG_DEBUG);
+        Logger::log(static::class.' extract orders end', LOG_DEBUG);
     }
 
     /**
@@ -175,7 +175,7 @@ 
             foreach ($this->query as $field => $value) {
                 if (self::API_COMBO_FIELD === $field) {
                     ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
-                } elseif(!preg_match('/^__/', $field)) {
+                } elseif (!preg_match('/^__/', $field)) {
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
                 }
             }
@@ -196,10 +196,10 @@ 
             list($page, $limit) = $this->extractPagination();
             if ($limit == -1) {
                 $this->list = $query->find($this->con);
-            } else {
+            }else {
                 $this->list = $query->paginate($page, $limit, $this->con);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -218,7 +218,7 @@ 
         $code = 200;
         list($return, $total, $pages) = $this->getList();
         $message = null;
-        if(!$total) {
+        if (!$total) {
             $message = i18n::_('No se han encontrado elementos para la búsqueda');
         }
 
@@ -244,7 +244,7 @@ 
         $pages = 1;
         $message = null;
         list($code, $return) = $this->getSingleResult($pk);
-        if($code !== 200) {
+        if ($code !== 200) {
             $message = i18n::_('No se ha encontrado el elemento solicitado');
         }
 
@@ -273,13 +273,13 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray();
-            } else {
+            }else {
                 $message = i18n::_('No se ha podido guardar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            $message = i18n::_('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage();
+        }catch (\Exception $e) {
+            $message = i18n::_('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
             $context = [];
-            if(null !== $e->getPrevious()) {
+            if (null !== $e->getPrevious()) {
                 $context[] = $e->getPrevious()->getMessage();
             }
             Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -315,18 +315,18 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray();
-                } else {
+                }else {
                     $message = i18n::_('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = i18n::_('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 $context = [];
-                if(null !== $e->getPrevious()) {
+                if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
             }
-        } else {
+        }else {
             $message = i18n::_('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -354,15 +354,15 @@ 
                 $this->con->beginTransaction();
                 $this->hydrateModel($pk);
                 if (NULL !== $this->model) {
-                    if(method_exists('clearAllReferences', $this->model)) {
+                    if (method_exists('clearAllReferences', $this->model)) {
                         $this->model->clearAllReferences(true);
                     }
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $context = [];
-                if(null !== $e->getPrevious()) {
+                if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -392,7 +392,7 @@ 
             $this->saveBulk();
             $saved = true;
             $status = 200;
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData());
             $message = i18n::_('Bulk insert rolled back');
         }
@@ -414,7 +414,7 @@ 
 
         /** @var CustomerTableMap $tableMap */
         $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap());
-        foreach($this->list->getData() as $data) {
+        foreach ($this->list->getData() as $data) {
             $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data);
         }
         return $return;
@@ -431,23 +431,23 @@ 
         try {
             $this->paginate();
             if (null !== $this->list) {
-                if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
+                if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
                     $return = $this->extractDataWithFormat();
-                } else {
+                }else {
                     $return = $this->list->toArray(null, false, TableMap::TYPE_PHPNAME, false);
                 }
                 $total = 0;
                 $pages = 0;
-                if($this->list instanceof PropelModelPager) {
+                if ($this->list instanceof PropelModelPager) {
                     $total = $this->list->getNbResults();
                     $pages = $this->list->getLastPage();
-                } elseif($this->list instanceof ArrayCollection) {
+                } elseif ($this->list instanceof ArrayCollection) {
                     $total = count($return);
                     $pages = 1;
                 }
             }
-        } 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 array($return, $total, $pages);
@@ -465,7 +465,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray(TableMap::TYPE_PHPNAME, true, [], true);
         }
 

src/base/Singleton.php

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        Logger::log(static::class . ' constructor invoked');
+        Logger::log(static::class.' constructor invoked');
         $this->init();
     }
 
@@ -81,14 +81,14 @@ 
         $calledClass = static::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);
             throw $e;
         }
         return $this;
@@ -103,7 +103,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 */
@@ -121,8 +121,8 @@ 
                 }
             }
             $this->setLoaded();
-        } else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+        }else {
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 }