psfs / core

src/base/Request.php

Spacing +7 added lines, -7 removed lines

@@ -137,10 +137,10 @@ 
         $header = null;
         if ($this->hasHeader($name)) {
             $header = $this->header[$name];
-        } else if (array_key_exists('h_' . strtolower($name), $this->query)) {
-            $header = $this->query['h_' . strtolower($name)];
-        } else if (array_key_exists('HTTP_' . strtoupper(str_replace('-', '_', $name)), $this->server)) {
-            $header = $this->getServer('HTTP_' . strtoupper(str_replace('-', '_', $name)));
+        }else if (array_key_exists('h_'.strtolower($name), $this->query)) {
+            $header = $this->query['h_'.strtolower($name)];
+        }else if (array_key_exists('HTTP_'.strtoupper(str_replace('-', '_', $name)), $this->server)) {
+            $header = $this->getServer('HTTP_'.strtoupper(str_replace('-', '_', $name)));
         }
         return $header ?: $default;
     }
@@ -254,7 +254,7 @@ 
             $url = $this->getServer('HTTP_ORIGIN');
         }
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(t('Redirect...'));
@@ -270,7 +270,7 @@ 
         $url = $this->getServerName();
         $protocol = $hasProtocol ? $this->getProtocol() : '//';
         if (!empty($protocol)) {
-            $url = $protocol . $url;
+            $url = $protocol.$url;
         }
         return $this->checkServerPort($url);
     }
@@ -291,7 +291,7 @@ 
             }
         }
         if (!in_array($port, [80, 443], true)) {
-            $url .= ':' . $port;
+            $url .= ':'.$port;
         }
         return $url;
     }

src/base/extension/TemplateFunctions.php

Spacing +13 added lines, -13 removed lines

@@ -46,13 +46,13 @@ 
 
         $filePath = $returnPath = '';
         if (!file_exists($filePath)) {
-            $filePath = BASE_DIR . $string;
+            $filePath = BASE_DIR.$string;
         }
         $filenamePath = AssetsHelper::findDomainPath($string, $filePath);
-        if(!empty($filenamePath)){
+        if (!empty($filenamePath)) {
             $filePath = self::processAsset($string, $name, $return, $filenamePath);
             $basePath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl(false));
-            $returnPath = empty($name) ? $basePath . '/' . $filePath : $name;
+            $returnPath = empty($name) ? $basePath.'/'.$filePath : $name;
         }
         return $return ? $returnPath : '';
     }
@@ -70,7 +70,7 @@ 
         $router = Router::getInstance();
         try {
             return $router->getRoute($path, $absolute, $params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage());
             return $router->getRoute('', $absolute, $params);
         }
@@ -166,7 +166,7 @@ 
         $filenamePath = self::extractPathname($path, $domains);
         // Check if resources has been copied to public folders
         if (!$debug) {
-            $cacheFilename = Config::getParam('cache.var', '__initial__') . '.file.cache';
+            $cacheFilename = Config::getParam('cache.var', '__initial__').'.file.cache';
             $cachedFiles = Cache::getInstance()->readFromCache($cacheFilename,
                 1, fn() => [], Cache::JSON, true) ?: [];
             // Force the resource copy
@@ -187,7 +187,7 @@ 
      *
      * @return string|array
      */
-    private static function extractPathname(string $path, $domains): string|array
+    private static function extractPathname(string $path, $domains): string | array
     {
         $filenamePath = $path;
         if (!empty($domains) && !file_exists($path)) {
@@ -226,13 +226,13 @@ 
      * @param string $base
      * @param string $filePath
      */
-    private static function putResourceContent(string|null $name, string $filenamePath, string $base, string $filePath): void
+    private static function putResourceContent(string | null $name, string $filenamePath, string $base, string $filePath): void
     {
         $data = file_get_contents($filenamePath);
         if (!empty($name)) {
-            file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
-        } else {
-            file_put_contents($base . $filePath, $data);
+            file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data);
+        }else {
+            file_put_contents($base.$filePath, $data);
         }
     }
 
@@ -245,15 +245,15 @@ 
      * @return string
      * @throws GeneratorException
      */
-    private static function processAsset(string $string, string|null $name = null, bool $return = true, string $filenamePath = ''): string
+    private static function processAsset(string $string, string | null $name = null, bool $return = true, string $filenamePath = ''): string
     {
         $filePath = $filenamePath;
         if (file_exists($filenamePath)) {
             list($base, $htmlBase, $filePath) = AssetsHelper::calculateAssetPath($string, $name, $return, $filenamePath);
             //Creamos el directorio si no existe
-            GeneratorHelper::createDir($base . $htmlBase);
+            GeneratorHelper::createDir($base.$htmlBase);
             //Si se ha modificado
-            if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($filenamePath)) {
+            if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($filenamePath)) {
                 if ($htmlBase === 'css') {
                     self::processCssLines($filenamePath);
                 }

src/base/types/Api.php

Spacing +21 added lines, -21 removed lines

@@ -54,7 +54,7 @@ 
     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();
@@ -63,7 +63,7 @@ 
         }
         $this->checkFieldType();
         $this->setLoaded(true);
-        Logger::log(static::class . ' loaded', LOG_DEBUG);
+        Logger::log(static::class.' loaded', LOG_DEBUG);
     }
 
     private function checkActions($method)
@@ -159,14 +159,14 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-            } else {
+            }else {
                 $message = t('No se ha podido guardar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            if(Config::getParam('debug')) {
-                $message = t('Ha ocurrido un error intentando guardar el elemento: ') . '<br>' . $e->getMessage();
-            } else {
-                $message = t('Ha ocurrido un error intentando guardar el elemento: ') . '<br>' . $e->getCode();
+        }catch (\Exception $e) {
+            if (Config::getParam('debug')) {
+                $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
+            }else {
+                $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getCode();
             }
             $context = [];
             if (null !== $e->getPrevious()) {
@@ -205,14 +205,14 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-                } else {
+                }else {
                     $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
-                if(Config::getParam('debug')) {
-                    $message = t('Ha ocurrido un error intentando actualizar el elemento: ') . '<br>' . $e->getMessage();
-                } else {
-                    $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs: ') . '<br>' . $e->getCode();
+            }catch (\Exception $e) {
+                if (Config::getParam('debug')) {
+                    $message = t('Ha ocurrido un error intentando actualizar el elemento: ').'<br>'.$e->getMessage();
+                }else {
+                    $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs: ').'<br>'.$e->getCode();
                 }
                 $context = [];
                 if (null !== $e->getPrevious()) {
@@ -220,7 +220,7 @@ 
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
             }
-        } else {
+        }else {
             $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -254,7 +254,7 @@ 
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $context = [];
                 if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
@@ -286,7 +286,7 @@ 
             $this->saveBulk();
             $saved = true;
             $status = 200;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData());
             $message = t('Bulk insert rolled back');
         }
@@ -318,7 +318,7 @@ 
             if (null !== $this->list) {
                 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, $this->fieldType ?: TableMap::TYPE_PHPNAME, false);
                 }
                 $total = 0;
@@ -331,8 +331,8 @@ 
                     $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);
@@ -350,7 +350,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
         }
 

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

Spacing +20 added lines, -20 removed lines

@@ -100,7 +100,7 @@ 
         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
             ];
         }
         if (count($pks) > 1) {
@@ -108,9 +108,9 @@ 
             $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;
@@ -137,10 +137,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;
     }
 
     /**
@@ -162,7 +162,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -173,7 +173,7 @@ 
      * @param $action
      * @throws ApiException
      */
-    private function addExtraColumns(ModelCriteria &$query, $action)
+    private function addExtraColumns(ModelCriteria & $query, $action)
     {
         if (Api::API_ACTION_LIST === $action) {
             $this->addDefaultListField();
@@ -182,7 +182,7 @@ 
         if (!empty($this->extraColumns)) {
             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;
@@ -216,32 +216,32 @@ 
     /**
      * @param ModelCriteria $query
      */
-    protected function checkI18n(ModelCriteria &$query)
+    protected function checkI18n(ModelCriteria & $query)
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
             $modelParts = explode('\\', $modelI18n);
-            $i18nMapClass = str_replace(end($modelParts), 'Map\\' . end($modelParts), $modelI18n) . 'TableMap';
+            $i18nMapClass = str_replace(end($modelParts), 'Map\\'.end($modelParts), $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $i18nMapClass::getTableMap();
             foreach ($modelI18nTableMap->getColumns() as $columnMap) {
                 if (!$columnMap->isPrimaryKey()) {
                     $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap));
                 } elseif (!$columnMap->isForeignKey()) {
-                    $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "' . $this->lang . '")', ApiHelper::getColumnMapName($columnMap));
+                    $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap));
                 }
             }
         }
     }
 
     protected function cleanData(array &$data) {
-        foreach($data as $key => &$value) {
-            if(is_array($value)) {
+        foreach ($data as $key => &$value) {
+            if (is_array($value)) {
                 $this->cleanData($value);
-            } else if(is_string($value)) {
+            }else if (is_string($value)) {
                 $value = I18nHelper::cleanHtmlAttacks($value);
             }
         }
@@ -257,12 +257,12 @@ 
         $model->fromArray($data, ApiHelper::getFieldTypes());
         $tableMap = $this->getTableMap();
         try {
-            if ($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) {
-                $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
+            if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) {
+                $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
                 $i18NTableMap = $relateI18n->getLocalTable();
                 $model->setLocale(array_key_exists('Locale', $data) ? $data['Locale'] : (array_key_exists('locale', $data) ? $data['locale'] : Request::header(Api::HEADER_API_LANG, 'es_ES')));
                 foreach ($i18NTableMap->getColumns() as $columnMap) {
-                    $method = 'set' . $columnMap->getPhpName();
+                    $method = 'set'.$columnMap->getPhpName();
                     $dtoColumnName = ApiHelper::getColumnMapName($columnMap);
                     if (array_key_exists($dtoColumnName, $data)
                         && method_exists($model, $method)
@@ -271,7 +271,7 @@ 
                     }
                 }
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
     }

src/base/dto/Dto.php

Spacing +11 added lines, -11 removed lines

@@ -58,14 +58,14 @@ 
                             }
                         }
                         $dto[$property->getName()] = $value;
-                    } else {
+                    }else {
                         $type = InjectorHelper::extractVarType($property->getDocComment());
                         $dto[$property->getName()] = $this->checkCastedValue($property->getValue($this), $type ?: 'string');
                     }
                 }
             }
-        } 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;
     }
@@ -102,12 +102,12 @@ 
                             $this->$key[] = $dto;
                         }
                     }
-                } else {
+                }else {
                     $this->$key = clone $this->__cache[$type];
                     $this->$key->fromArray($value);
                 }
             }
-        } else {
+        }else {
             $this->castValue($key, $value, $type);
         }
     }
@@ -134,7 +134,7 @@ 
     /**
      * @return mixed
      */
-    public function jsonSerialize(): array|string|null
+    public function jsonSerialize(): array | string | null
     {
         return $this->toArray();
     }
@@ -180,14 +180,14 @@ 
                 default:
                 case 'string':
                     // Cleaning HTML dangerous tags
-                    if(is_array($rawValue)) {
-                        foreach($rawValue as &$item) {
+                    if (is_array($rawValue)) {
+                        foreach ($rawValue as &$item) {
                             $item = $this->checkCastedValue($item, $type);
                         }
                         $value = $rawValue;
-                    } elseif(is_string($rawValue)) {
+                    } elseif (is_string($rawValue)) {
                         $value = I18nHelper::cleanHtmlAttacks($rawValue);
-                    } else {
+                    }else {
                         $value = $rawValue;
                     }
                     break;
@@ -204,7 +204,7 @@ 
                     $value = (bool)$rawValue;
                     break;
             }
-        } else {
+        }else {
             $value = $rawValue;
         }
         return $value;

src/base/types/helpers/GeneratorHelper.php

Spacing +33 added lines, -33 removed lines

@@ -26,10 +26,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::deleteDir($dir . "/" . $object);
-                    } else {
-                        unlink($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::deleteDir($dir."/".$object);
+                    }else {
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -44,10 +44,10 @@ 
     {
         $rootDirs = array("css", "js", "media", "font");
         foreach ($rootDirs as $dir) {
-            if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) {
+            if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
-                    self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (\Exception $e) {
+                    self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (\Exception $e) {
                     syslog(LOG_INFO, $e->getMessage());
                 }
             }
@@ -64,12 +64,12 @@ 
         if (!empty($dir)) {
             try {
                 if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                    throw new Exception(t('Can\'t create directory ') . $dir);
+                    throw new Exception(t('Can\'t create directory ').$dir);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 syslog(LOG_WARNING, $e->getMessage());
                 if (!file_exists(dirname($dir))) {
-                    throw new GeneratorException($e->getMessage() . $dir);
+                    throw new GeneratorException($e->getMessage().$dir);
                 }
             }
         }
@@ -81,7 +81,7 @@ 
      */
     public static function getTemplatePath(): string
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -109,7 +109,7 @@ 
                 } elseif (!$reflector->isAbstract()) {
                     throw new GeneratorException(t('La clase definida debe ser abstracta'), 501);
                 }
-            } else {
+            }else {
                 throw new GeneratorException(t('La clase definida para extender la API no existe'), 501);
             }
         }
@@ -131,7 +131,7 @@ 
         GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {
-            GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath);
+            GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
         }
 
         // Generates the root needed files
@@ -141,35 +141,35 @@ 
             'crossdomain' => 'crossdomain.xml',
             'humans' => 'humans.txt',
             'robots' => 'robots.txt',
-            'docker' => '..' . DIRECTORY_SEPARATOR . 'docker-compose.yml',
+            'docker' => '..'.DIRECTORY_SEPARATOR.'docker-compose.yml',
         ];
         $verificable = ['humans', 'robots', 'docker'];
         if (!$quiet) {
             $output->writeln('Start creating html files');
         }
         foreach ($files as $template => $filename) {
-            if (in_array($template, $verificable) && file_exists($path . DIRECTORY_SEPARATOR . $filename)) {
+            if (in_array($template, $verificable) && file_exists($path.DIRECTORY_SEPARATOR.$filename)) {
                 if (!$quiet) {
-                    $output->writeln($filename . ' already exists');
+                    $output->writeln($filename.' already exists');
                 }
                 continue;
             }
-            $text = Template::getInstance()->dump("generator/html/" . $template . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
+            $text = Template::getInstance()->dump("generator/html/".$template.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
                 if (!$quiet) {
-                    $output->writeln('Can\t create the file ' . $filename);
+                    $output->writeln('Can\t create the file '.$filename);
                 }
-            } else {
+            }else {
                 if (!$quiet) {
-                    $output->writeln($filename . ' created successfully');
+                    $output->writeln($filename.' created successfully');
                 }
             }
         }
 
         //Export base locale translations
-        if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) {
-            GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            self::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+        if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            self::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
     }
 
@@ -185,12 +185,12 @@ 
     {
         if (file_exists($filenamePath)) {
             $destfolder = basename($filenamePath);
-            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($filenamePath)) {
-                    self::copyr($filenamePath, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
-                } else {
-                    if (@copy($filenamePath, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
-                        throw new ConfigException("Can't copy " . $filenamePath . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
+                    self::copyr($filenamePath, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
+                }else {
+                    if (@copy($filenamePath, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
+                        throw new ConfigException("Can't copy ".$filenamePath." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
                     }
                 }
             }
@@ -209,10 +209,10 @@ 
         self::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/types/helpers/I18nHelper.php

Spacing +19 added lines, -19 removed lines

@@ -46,8 +46,8 @@ 
         // TODO check more en locales
         if (strtolower($locale) === 'en') {
             $locale = 'en_GB';
-        } else {
-            $locale = $locale . '_' . strtoupper($locale);
+        }else {
+            $locale = $locale.'_'.strtoupper($locale);
         }
         $defaultLocales = explode(',', Config::getParam('i18n.locales', ''));
         if (!in_array($locale, array_merge($defaultLocales, self::$langs))) {
@@ -66,7 +66,7 @@ 
         $translations = array();
         if (file_exists($absoluteFileName)) {
             @include($absoluteFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 
@@ -83,13 +83,13 @@ 
     public static function setLocale(string $default = null, string $customKey = null, bool $force = false): void
     {
         $locale = $force ? $default : self::extractLocale($default);
-        Inspector::stats('[i18NHelper] Set locale to project [' . $locale . ']', Inspector::SCOPE_DEBUG);
+        Inspector::stats('[i18NHelper] Set locale to project ['.$locale.']', Inspector::SCOPE_DEBUG);
         // Load translations
-        putenv("LC_ALL=" . $locale);
+        putenv("LC_ALL=".$locale);
         setlocale(LC_ALL, $locale);
         // Load the locale path
-        $localePath = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
-        Logger::log('Set locale dir ' . $localePath);
+        $localePath = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$localePath);
         GeneratorHelper::createDir($localePath);
         bindtextdomain('translations', $localePath);
         textdomain('translations');
@@ -112,7 +112,7 @@ 
             }
         } elseif (is_object($data)) {
             $properties = get_class_vars($data);
-            if(is_array($properties)) {
+            if (is_array($properties)) {
                 foreach (array_keys($properties) as $property) {
                     $data->$property = self::utf8Encode($data->$property);
                 }
@@ -159,7 +159,7 @@ 
             ['i', 'i', 'i', 'i', 'I', 'I', 'I', 'I'],
             ['o', 'o', 'o', 'o', 'O', 'O', 'O', 'O'],
             ['u', 'u', 'u', 'u', 'U', 'U', 'U', 'U'],
-            ['n', 'N', 'c', 'C',],
+            ['n', 'N', 'c', 'C', ],
         ];
 
         $text = htmlspecialchars($string);
@@ -179,24 +179,24 @@ 
      */
     public static function findTranslations(string $path, string $locale): array
     {
-        $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-        $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+        $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+        $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
         $translations = array();
         if (file_exists($path)) {
             $directory = dir($path);
             while (false !== ($fileName = $directory->read())) {
                 GeneratorHelper::createDir($localePath);
-                if (!file_exists($localePath . 'translations.po')) {
-                    file_put_contents($localePath . 'translations.po', '');
+                if (!file_exists($localePath.'translations.po')) {
+                    file_put_contents($localePath.'translations.po', '');
                 }
-                $inspectPath = realpath($path . DIRECTORY_SEPARATOR . $fileName);
-                $cmdPhp = "export PATH=\$PATH:/opt/local/bin; xgettext " .
-                    $inspectPath . DIRECTORY_SEPARATOR .
+                $inspectPath = realpath($path.DIRECTORY_SEPARATOR.$fileName);
+                $cmdPhp = "export PATH=\$PATH:/opt/local/bin; xgettext ".
+                    $inspectPath.DIRECTORY_SEPARATOR.
                     "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$localePath}translations.po";
-                if (is_dir($path . DIRECTORY_SEPARATOR . $fileName) && preg_match('/^\./', $fileName) == 0) {
-                    $res = t('Revisando directorio: ') . $inspectPath;
-                    $res .= t('Comando ejecutado: ') . $cmdPhp;
+                if (is_dir($path.DIRECTORY_SEPARATOR.$fileName) && preg_match('/^\./', $fileName) == 0) {
+                    $res = t('Revisando directorio: ').$inspectPath;
+                    $res .= t('Comando ejecutado: ').$cmdPhp;
                     $res .= shell_exec($cmdPhp);
                     usleep(10);
                     $translations[] = $res;

src/base/types/traits/OutputTrait.php

Spacing +15 added lines, -15 removed lines

@@ -127,7 +127,7 @@ 
                 $this->setStatusCode(Template::STATUS_OK);
                 break;
             default:
-                $this->setStatusCode('HTTP/1.0 ' . ($status ?: 200));
+                $this->setStatusCode('HTTP/1.0 '.($status ?: 200));
                 break;
         }
         return $this;
@@ -140,11 +140,11 @@ 
      */
     private function setResponseHeaders($contentType = 'text/html', array $cookies = array()): void
     {
-        ResponseHelper::setHeader('X-Powered-By: ' . Config::getParam('poweredBy', 'PSFS'));
+        ResponseHelper::setHeader('X-Powered-By: '.Config::getParam('poweredBy', 'PSFS'));
         ResponseHelper::setStatusHeader($this->getStatusCode());
         ResponseHelper::setAuthHeaders($this->isPublicZone());
         ResponseHelper::setCookieHeaders($cookies);
-        ResponseHelper::setHeader('Content-type: ' . $contentType);
+        ResponseHelper::setHeader('Content-type: '.$contentType);
 
     }
 
@@ -162,16 +162,16 @@ 
             Logger::log('Start output response');
             ob_start();
             $this->setResponseHeaders($contentType, $cookies);
-            ResponseHelper::setHeader('Content-length: ' . strlen($output));
-            ResponseHelper::setHeader('CRC: ' . crc32($output));
+            ResponseHelper::setHeader('Content-length: '.strlen($output));
+            ResponseHelper::setHeader('CRC: '.crc32($output));
 
             $needCache = Cache::needCache();
             $cache = Cache::getInstance();
             list($path, $cacheDataName) = $cache->getRequestCacheHash();
             if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) {
                 Logger::log('Saving output response into cache');
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output);
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON);
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output);
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON);
             } elseif (Request::getInstance()->getMethod() !== 'GET') {
                 $cache->flushCache();
             }
@@ -181,7 +181,7 @@ 
             ob_end_clean();
             Logger::log('End output response');
             $this->closeRender();
-        } else {
+        }else {
             return $output;
         }
     }
@@ -194,12 +194,12 @@ 
         Logger::log('Close template render');
         $uri = Request::requestUri();
         Security::getInstance()->setSessionKey('lastRequest', array(
-            'url' => Request::getInstance()->getRootUrl() . $uri,
+            'url' => Request::getInstance()->getRootUrl().$uri,
             'ts' => microtime(true),
         ));
         Security::getInstance()->updateSession();
         EventHelper::handleEvents(EventHelper::EVENT_END_REQUEST);
-        Logger::log('End request: ' . Request::requestUri(), LOG_INFO);
+        Logger::log('End request: '.Request::requestUri(), LOG_INFO);
         exit;
     }
 
@@ -237,17 +237,17 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         ResponseHelper::setHeader('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
-        ResponseHelper::setHeader('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        ResponseHelper::setHeader('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         ResponseHelper::setHeader('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         ResponseHelper::setHeader('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         ResponseHelper::setHeader('Pragma: no-cache');
         ResponseHelper::setHeader('Expires: 0');
         ResponseHelper::setHeader('Content-Transfer-Encoding: binary');
-        ResponseHelper::setHeader('Content-type: ' . $content);
-        ResponseHelper::setHeader('Content-length: ' . strlen($data));
-        ResponseHelper::setHeader('Content-Disposition: attachment; filename="' . $filename . '"');
+        ResponseHelper::setHeader('Content-type: '.$content);
+        ResponseHelper::setHeader('Content-length: '.strlen($data));
+        ResponseHelper::setHeader('Content-Disposition: attachment; filename="'.$filename.'"');
         ResponseHelper::setHeader('Access-Control-Expose-Headers: Filename');
-        ResponseHelper::setHeader('Filename: ' . $filename);
+        ResponseHelper::setHeader('Filename: '.$filename);
         echo $data;
         ob_flush();
         ob_end_clean();

src/base/types/traits/Security/ProfileTrait.php

Spacing +5 added lines, -5 removed lines

@@ -89,11 +89,11 @@ 
     public static function save($user)
     {
         $saved = true;
-        $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);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
         return $saved;
     }
 
@@ -113,9 +113,9 @@ 
 
     public function deleteUser($user)
     {
-        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: [];
+        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: [];
         unset($admins[$user]);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
     }
 
     /**