psfs / core

src/functions.php

Spacing +10 added lines, -10 removed lines

@@ -35,16 +35,16 @@ 
     {
         $html = '<style>*{margin: 0} body{background: rgb(36,36,36); padding: 5px;}</style>';
         $html .= '<pre style="padding: 10px; margin: 5px; display: block; background: rgb(41,41,41); color: white; border-radius: 5px;">';
-        if(is_null($var)) {
-            if($varName) $html .= $varName . ' ==> <b>NULL</b>';
-        } else {
-            $html .= print_r('(' . gettype($var) . ') ', TRUE);
-            if($varName) $html .= $varName . ' ==> ';
-            if("boolean" === gettype($var)) {
+        if (is_null($var)) {
+            if ($varName) $html .= $varName.' ==> <b>NULL</b>';
+        }else {
+            $html .= print_r('('.gettype($var).') ', TRUE);
+            if ($varName) $html .= $varName.' ==> ';
+            if ("boolean" === gettype($var)) {
                 $html .= print_r($var ? "TRUE" : "FALSE", TRUE);
-            } else if((is_array($var) && !empty($var)) || (!is_array($var)) ||  ($var === 0)) {
+            }else if ((is_array($var) && !empty($var)) || (!is_array($var)) || ($var === 0)) {
                 $html .= print_r($var, TRUE);
-            } else {
+            }else {
                 $html .= 'empty';
             }
         }
@@ -79,14 +79,14 @@ 
     /* @var $file SplFileInfo */
     foreach ($finder as $file) {
         $path = $file->getRealPath();
-        if(!in_array($path, $loaded_files)) {
+        if (!in_array($path, $loaded_files)) {
             $loaded_files[] = $path;
             require_once($path);
         }
     }
 }
 
-if(!function_exists('t')) {
+if (!function_exists('t')) {
     function t($message, $key = null, $reload = false) {
         return CustomTranslateExtension::_($message, $key, $reload);
     }

Braces +9 added lines, -4 removed lines

@@ -36,10 +36,14 @@ 
         $html = '<style>*{margin: 0} body{background: rgb(36,36,36); padding: 5px;}</style>';
         $html .= '<pre style="padding: 10px; margin: 5px; display: block; background: rgb(41,41,41); color: white; border-radius: 5px;">';
         if(is_null($var)) {
-            if($varName) $html .= $varName . ' ==> <b>NULL</b>';
+            if($varName) {
+                $html .= $varName . ' ==> <b>NULL</b>';
+            }
         } else {
             $html .= print_r('(' . gettype($var) . ') ', TRUE);
-            if($varName) $html .= $varName . ' ==> ';
+            if($varName) {
+                $html .= $varName . ' ==> ';
+            }
             if("boolean" === gettype($var)) {
                 $html .= print_r($var ? "TRUE" : "FALSE", TRUE);
             } else if((is_array($var) && !empty($var)) || (!is_array($var)) ||  ($var === 0)) {
@@ -63,9 +67,10 @@ 
     function getallheaders()
     {
         $headers = [];
-        foreach ($_SERVER as $h => $v)
-            if (preg_match('/HTTP_(.+)/', $h, $hp)) {
+        foreach ($_SERVER as $h => $v) {
+                    if (preg_match('/HTTP_(.+)/', $h, $hp)) {
                 $headers[$hp[1]] = $v;
+        }
             }
         return $headers;
     }

src/base/types/traits/Helper/ServerTrait.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     public function getServer($key, $default = null)
     {
         $value = null;
-        if(array_key_exists($key, $this->server)) {
+        if (array_key_exists($key, $this->server)) {
             $value = $this->server[$key];
         }
         return $value ?: $default;
@@ -60,7 +60,7 @@ 
      */
     public function getProtocol()
     {
-        if(Config::getParam('force.https', false)) {
+        if (Config::getParam('force.https', false)) {
             return 'https://';
         }
         return ($this->getServer('HTTPS') || $this->getServer('https')) ? 'https://' : 'http://';

src/services/AdminServices.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
     {
         $platform = trim(Config::getInstance()->get('platform.name', 'PSFS'));
         header('HTTP/1.1 401 Unauthorized');
-        header('WWW-Authenticate: Basic Realm="' . $platform . '"');
+        header('WWW-Authenticate: Basic Realm="'.$platform.'"');
         echo t('Zona restringida');
         exit();
     }
@@ -76,7 +76,7 @@ 
                             $admin['class'] = 'primary';
                             break;
                     }
-                } else {
+                }else {
                     $admin['class'] = 'primary';
                 }
             }

src/base/types/CurlService.php

Spacing +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
     {
         $headers = [];
         foreach ($this->getHeaders() as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+            $headers[] = $key.': '.$value;
         }
         $headers[self::PSFS_TRACK_HEADER] = Logger::getUid();
         if (count($headers)) {
@@ -118,7 +118,7 @@ 
             case Request::VERB_GET:
                 if (!empty($this->params)) {
                     $sep = !str_contains($this->getUrl(), '?') ? '?' : '';
-                    $this->setUrl($this->getUrl() . $sep . http_build_query($this->getParams()), false);
+                    $this->setUrl($this->getUrl().$sep.http_build_query($this->getParams()), false);
                 }
                 break;
             case Request::VERB_POST:
@@ -149,7 +149,7 @@ 
         if ($this->isDebug() && is_resource($verbose)) {
             $this->dumpVerboseLogs($verbose);
         }
-        Logger::log($this->getUrl() . ' response: ', LOG_DEBUG, is_array($this->getRawResult()) ? $this->getRawResult() : [$this->getRawResult()]);
+        Logger::log($this->getUrl().' response: ', LOG_DEBUG, is_array($this->getRawResult()) ? $this->getRawResult() : [$this->getRawResult()]);
         $this->info = array_merge($this->info, curl_getinfo($this->con));
     }
 

src/base/types/helpers/SecurityHelper.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false))
         ) {
             if (!self::isTest() &&
-                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) {
+                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) {
                 throw new AdminCredentialsException();
             }
             if (!Security::getInstance()->checkAdmin()) {
@@ -54,8 +54,8 @@ 
         $token = '';
         $length = strlen($timestamp);
         for ($i = 0; $i < $length; $i++) {
-            $token = substr($hash, $i, 1) .
-                substr($timestamp, $i, 1) .
+            $token = substr($hash, $i, 1).
+                substr($timestamp, $i, 1).
                 $token;
         }
         return $token;
@@ -74,16 +74,16 @@ 
         $charsLength = strlen(self::RAND_SEP) - 1;
         $tsLength = strlen($timestamp);
         $i = 0;
-        $partCount = ceil($hashRest / 4);
-        $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+        $partCount = ceil($hashRest/4);
+        $part = substr($hash, $tsLength + $partCount*$i, $partCount);
         while (false !== $part && strlen($part) > 0) {
-            $mixedToken .= $part .
-                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) .
+            $mixedToken .= $part.
+                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1).
                 substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1);
-            $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+            $part = substr($hash, $tsLength + $partCount*$i, $partCount);
             $i++;
         }
-        return $mixedToken . $token;
+        return $mixedToken.$token;
     }
 
     /**
@@ -93,7 +93,7 @@ 
     private static function getTs($isOdd = null)
     {
         $timestamp = time();
-        $tsIsOdd = (bool)((int)substr($timestamp, -1) % 2);
+        $tsIsOdd = (bool)((int)substr($timestamp, -1)%2);
         if (false === $isOdd && !$tsIsOdd) {
             $timestamp--;
         } elseif (true === $isOdd && !$tsIsOdd) {
@@ -129,9 +129,9 @@ 
         $timestamp = '';
         $part = strrev($part);
         for ($i = 0, $ct = strlen($part); $i < $ct; $i++) {
-            if ($i % 2 == 0) {
+            if ($i%2 == 0) {
                 $timestamp .= substr($part, $i, 1);
-            } else {
+            }else {
                 $partToken .= substr($part, $i, 1);
             }
         }
@@ -148,7 +148,7 @@ 
         list($partToken, $timestamp) = self::extractTs(array_pop($parts));
         $token = null;
         if ($timestamp > 0) {
-            $token = $partToken . implode('', $parts);
+            $token = $partToken.implode('', $parts);
         }
         return [$token, $timestamp];
     }

src/base/types/helpers/GeneratorHelper.php

Spacing +39 added lines, -39 removed lines

@@ -23,10 +23,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);
                     }
                 }
             }
@@ -42,10 +42,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());
                 }
             }
@@ -59,15 +59,15 @@ 
      */
     public static function createDir($dir)
     {
-        if(!empty($dir)) {
+        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);
                 }
             }
         }
@@ -79,7 +79,7 @@ 
      */
     public static function getTemplatePath()
     {
-        $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);
     }
 
@@ -98,15 +98,15 @@ 
      * @throws \ReflectionException
      */
     public static function checkCustomNamespaceApi($namespace) {
-        if(!empty($namespace)) {
-            if(class_exists($namespace)) {
+        if (!empty($namespace)) {
+            if (class_exists($namespace)) {
                 $reflector = new \ReflectionClass($namespace);
-                if(!$reflector->isSubclassOf(Api::class)) {
+                if (!$reflector->isSubclassOf(Api::class)) {
                     throw new GeneratorException(t('La clase definida debe extender de PSFS\\\base\\\types\\\Api'), 501);
-                } elseif(!$reflector->isAbstract()) {
+                } 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);
             }
         }
@@ -120,14 +120,14 @@ 
      */
     public static function createRoot($path = WEB_DIR, OutputInterface $output = null, $quiet = false) {
 
-        if(null === $output) {
+        if (null === $output) {
             $output = new ConsoleOutput();
         }
 
         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
@@ -137,26 +137,26 @@ 
             'crossdomain' => 'crossdomain.xml',
             'humans' => 'humans.txt',
             'robots' => 'robots.txt',
-            'docker' => '..' . DIRECTORY_SEPARATOR . 'docker-compose.yml',
+            'docker' => '..'.DIRECTORY_SEPARATOR.'docker-compose.yml',
         ];
         $output->writeln('Start creating html files');
         foreach ($files as $templates => $filename) {
-            $text = Template::getInstance()->dump("generator/html/" . $templates . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
-                if(!$quiet) {
-                    $output->writeln('Can\t create the file ' . $filename);
+            $text = Template::getInstance()->dump("generator/html/".$templates.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
+                if (!$quiet) {
+                    $output->writeln('Can\t create the file '.$filename);
                 }
-            } else {
-                if(!$quiet) {
-                    $output->writeln($filename . ' created successfully');
+            }else {
+                if (!$quiet) {
+                    $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');
         }
     }
 
@@ -172,12 +172,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);
                     }
                 }
             }
@@ -195,10 +195,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/RouterHelper.php

Spacing +14 added lines, -14 removed lines

@@ -24,11 +24,11 @@ 
     {
         Inspector::stats('[RouterHelper] Getting class to call for executing the request action', Inspector::SCOPE_DEBUG);
         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'];
         $reflectionClass = new ReflectionClass($actionClass);
         if ($reflectionClass->hasMethod('getInstance')) {
             $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']);
-        } else {
+        }else {
             $class = new $actionClass;
         }
         return $class;
@@ -62,7 +62,7 @@ 
     public static function extractComponents($route, $pattern)
     {
         Inspector::stats('[RouterHelper] Extracting parts for the request to execute', Inspector::SCOPE_DEBUG);
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $route = preg_replace("/\/\//", '/', $route);
         }
         $url = parse_url($route);
@@ -100,7 +100,7 @@ 
             $cleanPatternSep--;
         }
 
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $path = preg_replace("/\/\//", '/', $path);
         }
         $pathSep = count(explode('/', $path));
@@ -120,14 +120,14 @@ 
      */
     public static function matchRoutePattern($routePattern, $path)
     {
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $path = preg_replace("/\/\//", '/', $path);
         }
         $expr = preg_replace('/\{([^}]+)\}/', '%%%', $routePattern);
         $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;
     }
 
@@ -138,7 +138,7 @@ 
      */
     public static function extractDomainInfo(ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
         $templatesPath = 'templates';
         $publicPath = 'public';
         $modelsPath = 'models';
@@ -148,13 +148,13 @@ 
             $modelsPath = ucfirst($modelsPath);
         }
         if ($class->hasConstant('TPL')) {
-            $templatesPath .= DIRECTORY_SEPARATOR . $class->getConstant('TPL');
+            $templatesPath .= DIRECTORY_SEPARATOR.$class->getConstant('TPL');
         }
         return [
             'base' => $path,
-            'template' => $path . $templatesPath,
-            'model' => $path . $modelsPath,
-            'public' => $path . $publicPath,
+            'template' => $path.$templatesPath,
+            'model' => $path.$modelsPath,
+            'public' => $path.$publicPath,
         ];
     }
 
@@ -175,12 +175,12 @@ 
             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 ?: '');
                 } elseif (!$param->isOptional()) {
                     $requirements[] = $param->getName();
                 }
             }
-        } else {
+        }else {
             $default = $regex;
         }
 
@@ -210,7 +210,7 @@ 
             $httpMethod = AnnotationHelper::extractReflectionHttpMethod($docComments);
             $icon = AnnotationHelper::extractDocIcon($docComments);
             $label = AnnotationHelper::extractReflectionLabel(str_replace('{__API__}', $api, $docComments));
-            $route = $httpMethod . "#|#" . $regex;
+            $route = $httpMethod."#|#".$regex;
             $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route);
             $info = [
                 'method' => $method->getName(),

src/base/types/traits/Generator/PropelHelperTrait.php

Spacing +7 added lines, -7 removed lines

@@ -22,12 +22,12 @@ 
      */
     private function getPropelPaths($modulePath)
     {
-        $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $modulePath;
+        $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$modulePath;
         GeneratorHelper::createDir($moduleDir);
         $moduleDir = realpath($moduleDir);
-        $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config';
-        $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql';
-        $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations';
+        $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config';
+        $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql';
+        $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations';
         $paths = [
             'projectDir' => $moduleDir,
             'outputDir' => $moduleDir,
@@ -90,12 +90,12 @@ 
      * @param AbstractManager $manager
      * @param string $workingDir
      */
-    private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR)
+    private function setupManager(GeneratorConfig $configGenerator, AbstractManager & $manager, $workingDir = CORE_DIR)
     {
         $manager->setGeneratorConfig($configGenerator);
-        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml');
+        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml');
         $manager->setSchemas([$schemaFile]);
-        $manager->setLoggerClosure(function ($message) {
+        $manager->setLoggerClosure(function($message) {
             Logger::log($message, LOG_INFO);
         });
         $manager->setWorkingDirectory($workingDir);

src/base/types/traits/Helper/FieldModelHelperTrait.php

Spacing +18 added lines, -18 removed lines

@@ -31,7 +31,7 @@ 
         $fDto->entity = $relatedModel;
         $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName());
         $fDto->relatedField = $relatedField->getPhpName();
-        $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel);
+        $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel);
         return $fDto;
     }
 
@@ -40,21 +40,21 @@ 
      * @param ModelCriteria $query
      * @param mixed $value
      */
-    private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null)
+    private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null)
     {
         $tableField = $column->getFullyQualifiedName();
-        if(is_array($value)) {
+        if (is_array($value)) {
             $query->add($tableField, $value, Criteria::IN);
         } elseif (preg_match('/^\[/', $value) && preg_match('/\]$/', $value)) {
             $query->add($tableField, explode(',', preg_replace('/(\[|\])/', '', $value)), Criteria::IN);
         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
             $text = preg_replace('/(\'|\")/', '', $value);
             $text = preg_replace('/\ /', '%', $text);
-            $query->add($tableField, '%' . $text . '%', Criteria::LIKE);
-        } else {
-            if(null !== $column->getValueSet()) {
+            $query->add($tableField, '%'.$text.'%', Criteria::LIKE);
+        }else {
+            if (null !== $column->getValueSet()) {
                 $valueSet = $column->getValueSet();
-                if(in_array($value, $valueSet)) {
+                if (in_array($value, $valueSet)) {
                     $value = array_search($value, $valueSet);
                 }
             }
@@ -69,7 +69,7 @@ 
      * @param string $field
      * @param mixed $value
      */
-    public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null)
+    public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null)
     {
         if ($column = self::checkFieldExists($tableMap, $field)) {
             self::addQueryFilter($column, $query, $value);
@@ -84,7 +84,7 @@ 
      */
     public static function extractQuery($modelNameNamespace, ConnectionInterface $con = null)
     {
-        $queryReflector = new \ReflectionClass($modelNameNamespace . "Query");
+        $queryReflector = new \ReflectionClass($modelNameNamespace."Query");
         /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
         $query = $queryReflector->getMethod('create')->invoke($con);
 
@@ -97,37 +97,37 @@ 
      * @param array $extraColumns
      * @param mixed $value
      */
-    public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null)
+    public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null)
     {
         $exp = 'CONCAT(';
         $sep = '';
         foreach ($tableMap->getColumns() as $column) {
             if ($column->isText()) {
-                $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                 $sep = ', " ", ';
             }
         }
-        foreach($tableMap->getRelations() as $relation) {
-            if(preg_match('/I18n$/i', $relation->getName())) {
+        foreach ($tableMap->getRelations() as $relation) {
+            if (preg_match('/I18n$/i', $relation->getName())) {
                 $localeTableMap = $relation->getLocalTable();
                 foreach ($localeTableMap->getColumns() as $column) {
                     if ($column->isText()) {
-                        $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                        $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                         $sep = ', " ", ';
                     }
                 }
             }
         }
         foreach (array_keys($extraColumns) as $extra) {
-            if(!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
-                $exp .= $sep . $extra;
+            if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
+                $exp .= $sep.$extra;
                 $sep = ', " ", ';
             }
         }
         $exp .= ")";
         $text = preg_replace('/(\'|\")/', '', $value);
         $text = preg_replace('/\ /', '%', $text);
-        $query->where($exp . Criteria::LIKE . '"%' . $text . '%"');
+        $query->where($exp.Criteria::LIKE.'"%'.$text.'%"');
     }
 
     /**
@@ -136,7 +136,7 @@ 
      */
     public static function extractPrimaryKeyColumnName(TableMap $tableMap) {
         $modelPk = null;
-        foreach($tableMap->getPrimaryKeys() as $pk) {
+        foreach ($tableMap->getPrimaryKeys() as $pk) {
             $modelPk = $pk;
             break;
         }