psfs / core

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', true);
         $this->cdnPath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl());
@@ -58,7 +58,7 @@ 
             $sourceFile = explode("?", $sourceFile);
             $sourceFile = $sourceFile[0];
         }
-        $orig = realpath(dirname($filenamePath) . DIRECTORY_SEPARATOR . $sourceFile);
+        $orig = realpath(dirname($filenamePath).DIRECTORY_SEPARATOR.$sourceFile);
         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) {
                 $domainFilename = str_replace($domain, $paths["public"], $filename);
-                if (file_exists($domainFilename) && preg_match('/\.' . $this->type . '$/i', $domainFilename)) {
+                if (file_exists($domainFilename) && preg_match('/\.'.$this->type.'$/i', $domainFilename)) {
                     $this->files[] = $domainFilename;
                 }
             }
@@ -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");
                 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($pathParts, $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(t('No se tienen permisos para escribir en ' . $path));
+            throw new ConfigException(t('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)
     {
         $sourceFile = $this->extractSourceFilename($source);
-        $orig = realpath(dirname($file) . DIRECTORY_SEPARATOR . $sourceFile);
+        $orig = realpath(dirname($file).DIRECTORY_SEPARATOR.$sourceFile);
         $origPart = preg_split('/(\/|\\\)public(\/|\\\)/i', $orig);
         try {
             if (count($source) > 1 && array_key_exists(1, $origPart)) {
-                $dest = $this->path . $origPart[1];
+                $dest = $this->path.$origPart[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)) {
             $pathParts = explode("/", $file);
-            $filePath = $this->hash . "_" . $pathParts[count($pathParts) - 1];
-            if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file) || $this->debug) {
+            $filePath = $this->hash."_".$pathParts[count($pathParts) - 1];
+            if (!file_exists($base.$filePath) || filemtime($base.$filePath) < 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 . $filePath, $data);
-            } else {
+                $this->storeContents($base.$filePath, $data);
+            }else {
                 $data .= file_get_contents($file);
             }
-            $this->compiled_files[] = "/css/" . $filePath;
+            $this->compiled_files[] = "/css/".$filePath;
         }
 
         return $data;
@@ -318,12 +318,12 @@ 
      */
     protected function putDebugJs($pathParts, $base, $file)
     {
-        $filePath = $this->hash . "_" . $pathParts[count($pathParts) - 1];
-        $this->compiled_files[] = "/js/" . $filePath;
+        $filePath = $this->hash."_".$pathParts[count($pathParts) - 1];
+        $this->compiled_files[] = "/js/".$filePath;
         $data = "";
-        if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file)) {
+        if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file)) {
             $data = file_get_contents($file);
-            $this->storeContents($base . $filePath, $data);
+            $this->storeContents($base.$filePath, $data);
         }
         return $data;
     }
@@ -365,60 +365,60 @@ 
     {
         $ppath = explode("/", $string);
         $originalFilename = $ppath[count($ppath) - 1];
-        $base = WEB_DIR . DIRECTORY_SEPARATOR;
+        $base = WEB_DIR.DIRECTORY_SEPARATOR;
         $file = "";
         $htmlBase = "";
         $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, $filenamePath);
         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";
             $htmlBase = "css";
             if ($debug) {
-                $file = str_replace(".css", "_" . $originalFilename, $file);
+                $file = str_replace(".css", "_".$originalFilename, $file);
             }
         } elseif (preg_match('/\.js$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.js";
+            $file = "/".substr(md5($string), 0, 8)."$cache.js";
             $htmlBase = "js";
             if ($debug) {
-                $file = str_replace(".js", "_" . $originalFilename, $file);
+                $file = str_replace(".js", "_".$originalFilename, $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];
             $htmlBase = "img";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $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];
             $htmlBase = "docs";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $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];
             $htmlBase = "media";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $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];
             $htmlBase = "templates";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $originalFilename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$originalFilename, $file);
             }
         } elseif (!$return && !is_null($name)) {
             $htmlBase = '';
             $file = $name;
         }
-        $filePath = $htmlBase . $file;
+        $filePath = $htmlBase.$file;
 
         return array($base, $htmlBase, $filePath);
     }
@@ -436,15 +436,15 @@ 
         if (preg_match_all('#url\((.*?)\)#', $line, $urls, PREG_SET_ORDER)) {
             foreach ($urls as $source) {
                 $orig = self::calculateResourcePathname($filenamePath, $source);
-                if(!empty($orig)) {
+                if (!empty($orig)) {
                     $origPart = preg_split("/Public/i", $orig);
-                    $dest = WEB_DIR . $origPart[1];
+                    $dest = WEB_DIR.$origPart[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($filenamePath . ' has an empty origin with the url ' . $source, LOG_WARNING);
+                }else {
+                    Logger::log($filenamePath.' has an empty origin with the url '.$source, LOG_WARNING);
                 }
             }
         }

src/base/types/Form.php

Spacing +2 added lines, -2 removed lines

@@ -65,8 +65,8 @@
             $model = $this->getHydratedModel();
             $model->save();
             $save = true;
-            Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO);
-        } catch (\Exception $e) {
+            Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO);
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw new FormException($e->getMessage(), $e->getCode(), $e);
         }

src/base/types/traits/Form/FormDataTrait.php

Spacing +5 added lines, -5 removed lines

@@ -27,8 +27,8 @@ 
     public function add($name, array $value = [])
     {
         $this->fields[$name] = $value;
-        $this->fields[$name]['name'] = $this->getName() . '['.$name.']';
-        $this->fields[$name]['id'] = $this->getName() . '_' . $name;
+        $this->fields[$name]['name'] = $this->getName().'['.$name.']';
+        $this->fields[$name]['id'] = $this->getName().'_'.$name;
         $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name;
         $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true;
         return $this;
@@ -67,7 +67,7 @@ 
         $data = array();
         if (count($this->fields) > 0) {
             foreach ($this->fields as $key => $field) {
-                if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) {
+                if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) {
                     $data[$key] = array_key_exists('value', $field) ? $field['value'] : null;
                 }
             }
@@ -115,10 +115,10 @@ 
         if (array_key_exists($key, $data[$formName])) {
             if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) {
                 $field['value'] = null;
-            } else {
+            }else {
                 $field['value'] = $data[$formName][$key];
             }
-        } else {
+        }else {
             unset($field['value']);
         }
         return array($data, $field);

src/base/types/traits/Form/FormValidatorTrait.php

Spacing +3 added lines, -3 removed lines

@@ -47,10 +47,10 @@ 
         if (null === $value) {
             $isEmpty = true;
             // Empty Array check
-        } else if (is_array($value) && 0 === count($value)) {
+        }else if (is_array($value) && 0 === count($value)) {
             $isEmpty = true;
             // Empty string check
-        } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) {
+        }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) {
             $isEmpty = true;
         }
 
@@ -76,7 +76,7 @@ 
             && array_key_exists($key, $field)
             && !array_key_exists('error', $field[$key])
             && !empty($field['value'])
-            && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0
+            && preg_match('/'.$field['pattern'].'/', $field['value']) === 0
         ) {
             $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", t('El campo %s no tiene un formato válido')));
             $field['error'] = $this->getError($key);

src/base/types/traits/Form/FormModelTrait.php

Spacing +12 added lines, -12 removed lines

@@ -47,8 +47,8 @@ 
      */
     private function hydrateModelField($key, $value)
     {
-        $setter = 'set' . ucfirst($key);
-        $getter = 'get' . ucfirst($key);
+        $setter = 'set'.ucfirst($key);
+        $getter = 'get'.ucfirst($key);
         if (method_exists($this->model, $setter)) {
             if (method_exists($this->model, $getter)) {
                 $tmp = $this->model->$getter();
@@ -72,16 +72,16 @@ 
     {
         //Extraemos el dato del modelo relacionado si existe el getter
         $method = null;
-        if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) {
-            $classMethod = 'get' . $field['class_data'];
+        if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) {
+            $classMethod = 'get'.$field['class_data'];
             $class = $val->$classMethod();
-            if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) {
-                $method = 'get' . $field['class_id'];
+            if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) {
+                $method = 'get'.$field['class_id'];
                 $data[] = $class->$method();
-            } else {
+            }else {
                 $data[] = $class->getPrimaryKey();
             }
-        } else {
+        }else {
             $data[] = $val;
         }
 
@@ -133,7 +133,7 @@ 
     private function extractModelFieldValue($key, $field)
     {
         //Extraemos el valor del campo del modelo
-        $method = 'get' . ucfirst($key);
+        $method = 'get'.ucfirst($key);
         $type = (array_key_exists('type', $field)) ? $field['type'] : 'text';
         //Extraemos los campos del modelo
         if (method_exists($this->model, $method)) {
@@ -143,16 +143,16 @@ 
                 //Si es una relación múltiple
                 if ($value instanceof ObjectCollection) {
                     $field = $this->computeModelFieldValue($field, $value, $type);
-                } else { //O una relación unitaria
+                }else { //O una relación unitaria
                     if (method_exists($value, '__toString')) {
                         $field['value'] = $value;
                     } elseif ($value instanceof \DateTime) {
                         $field['value'] = $value->format('Y-m-d H:i:s');
-                    } else {
+                    }else {
                         $field['value'] = $value->getPrimaryKey();
                     }
                 }
-            } else {
+            }else {
                 $field['value'] = $value;
             }
         }

src/base/types/traits/Form/FormSecurityTrait.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         }
         if ('' !== $hashOrig) {
             $this->crfs = sha1($hashOrig);
-            $this->add($this->getName() . '_token', array(
+            $this->add($this->getName().'_token', array(
                 'type' => 'hidden',
                 'value' => $this->crfs,
             ));
@@ -43,7 +43,7 @@ 
     public function isValid()
     {
         $valid = true;
-        $tokenField = $this->getName() . '_token';
+        $tokenField = $this->getName().'_token';
         // Check crfs token
         if (!$this->existsFormToken($tokenField)) {
             $this->errors[$tokenField] = t('Formulario no válido');

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

Spacing +22 added lines, -22 removed lines

@@ -80,7 +80,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) {
@@ -88,9 +88,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;
@@ -117,10 +117,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;
     }
 
     /**
@@ -142,7 +142,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -160,15 +160,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);
                 }
             }
@@ -199,17 +199,17 @@ 
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
-            $i18nMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap';
+            $i18nMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $i18nMapClass::getTableMap();
-            foreach($modelI18nTableMap->getColumns() as $columnMap) {
-                if(!$columnMap->isPrimaryKey()) {
+            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));
+                } elseif (!$columnMap->isForeignKey()) {
+                    $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap));
                 }
             }
         }
@@ -223,22 +223,22 @@ 
         $model->fromArray($data, ApiHelper::getFieldTypes());
         $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();
                 $model->setLocale($this->lang);
-                foreach($i18NTableMap->getColumns() as $columnMap) {
-                    $method = 'set' . $columnMap->getPhpName();
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
+                    $method = 'set'.$columnMap->getPhpName();
                     $dtoColumnName = ApiHelper::getColumnMapName($columnMap);
-                    if(array_key_exists($dtoColumnName, $data)
+                    if (array_key_exists($dtoColumnName, $data)
                         && method_exists($model, $method)
                         && !($columnMap->isPrimaryKey() && $columnMap->isForeignKey())) {
                         $model->$method($data[$dtoColumnName]);
                     }
                 }
             }
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
     }

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

Spacing +9 added lines, -9 removed lines

@@ -22,15 +22,15 @@ 
      */
     private static function mapResult(ActiveRecordInterface $model, array $data = []) {
         $result = [];
-        foreach($data as $key => $value) {
+        foreach ($data as $key => $value) {
             try {
                 $realValue = $model->getByName($key);
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 $realValue = $value;
             }
-            if(Api::API_MODEL_KEY_FIELD === $key) {
+            if (Api::API_MODEL_KEY_FIELD === $key) {
                 $result[$key] = (integer)$realValue;
-            } else {
+            }else {
                 $result[$key] = $realValue;
             }
         }
@@ -55,14 +55,14 @@ 
         $objTableMap = get_class($formatter->getTableMap());
         /** @var TableMapTrait $objTableMap */
         $objData = $data;
-        foreach($objTableMap::getFieldNames() as $field) {
-            if(!array_key_exists($field, $objData)) {
+        foreach ($objTableMap::getFieldNames() as $field) {
+            if (!array_key_exists($field, $objData)) {
                 $objData[$field] = null;
             }
         }
         $obj = @$formatter->getAllObjectsFromRow($objData);
         $result = self::mapResult($obj, $data);
-        if(!preg_match('/' . $modelPk->getPhpName() . '/i', $query[Api::API_FIELDS_RESULT_FIELD])) {
+        if (!preg_match('/'.$modelPk->getPhpName().'/i', $query[Api::API_FIELDS_RESULT_FIELD])) {
             unset($result[$modelPk->getPhpName()]);
         }
         return $result;
@@ -73,11 +73,11 @@ 
      * @return string
      */
     public static function getColumnMapName(ColumnMap $field) {
-        switch(self::getFieldTypes()) {
+        switch (self::getFieldTypes()) {
             default:
             case 'UpperCamelCase':
             case TableMap::TYPE_PHPNAME:
-                $columnName =$field->getPhpName();
+                $columnName = $field->getPhpName();
                 break;
             case 'camelCase':
             case 'lowerCamelCase':

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

Spacing +15 added lines, -15 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;
     }
 
@@ -43,18 +43,18 @@ 
     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);
                 }
             }
@@ -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);
 
@@ -103,31 +103,31 @@ 
         $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;
         }