psfs / core

src/services/DocumentorService.php

Spacing +24 added lines, -24 removed lines

@@ -56,10 +56,10 @@ 
                     if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) {
                         $modules = [
                             'name' => $module,
-                            'path' => dirname($info['base'] . DIRECTORY_SEPARATOR . '..'),
+                            'path' => dirname($info['base'].DIRECTORY_SEPARATOR.'..'),
                         ];
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -77,7 +77,7 @@ 
      */
     public function extractApiEndpoints(array $module)
     {
-        $modulePath = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
+        $modulePath = $module['path'].DIRECTORY_SEPARATOR.'Api';
         $moduleName = $module['name'];
         $endpoints = [];
         if (file_exists($modulePath)) {
@@ -86,7 +86,7 @@ 
             if (count($finder)) {
                 /** @var \SplFileInfo $file */
                 foreach ($finder as $file) {
-                    $namespace = "\\{$moduleName}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                    $namespace = "\\{$moduleName}\\Api\\".str_replace('.php', '', $file->getFilename());
                     $info = $this->extractApiInfo($namespace, $moduleName);
                     if (!empty($info)) {
                         $endpoints[$namespace] = $info;
@@ -109,14 +109,14 @@ 
         if (Router::exists($namespace) && !I18nHelper::checkI18Class($namespace)) {
             $reflection = new \ReflectionClass($namespace);
             $visible = InjectorHelper::checkIsVisible($reflection->getDocComment());
-            if($visible) {
+            if ($visible) {
                 foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                     try {
                         $mInfo = $this->extractMethodInfo($namespace, $method, $reflection, $module);
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::log($e->getMessage(), LOG_ERR);
                     }
                 }
@@ -249,7 +249,7 @@ 
             $payload = $this->extractModelFields($namespace);
             $reflector = new \ReflectionClass($namespace);
             $shortName = $reflector->getShortName();
-        } else {
+        }else {
             $namespace = $model;
             $shortName = $model;
         }
@@ -338,10 +338,10 @@ 
                         "required" => $field->isNotNull(),
                         'format' => $format,
                     ];
-                    if(count($field->getValueSet())) {
+                    if (count($field->getValueSet())) {
                         $info['enum'] = array_values($field->getValueSet());
                     }
-                    if(null !== $field->getDefaultValue()) {
+                    if (null !== $field->getDefaultValue()) {
                         $info['default'] = $field->getDefaultValue();
                     }
                     $payload[ApiHelper::getColumnMapName($field)] = $info;
@@ -349,7 +349,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
 
@@ -380,7 +380,7 @@ 
                     $return = $this->extractReturn($modelNamespace, $docComments);
                     $url = array_pop($route);
                     $methodInfo = [
-                        'url' => str_replace('/' . $module . '/api', '', $url),
+                        'url' => str_replace('/'.$module.'/api', '', $url),
                         'method' => $info['http'],
                         'description' => $info['label'],
                         'return' => $return,
@@ -391,7 +391,7 @@ 
                     $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments);
                     $this->setQueryParams($method, $methodInfo);
                     $this->setRequestHeaders($reflection, $methodInfo);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                 }
             }
@@ -460,10 +460,10 @@ 
         $formatted = [
             "swagger" => "2.0",
             "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)),
-            "basePath" => '/' . $module['name'] . '/api',
+            "basePath" => '/'.$module['name'].'/api',
             "schemes" => [Request::getInstance()->getServer('HTTPS') === 'on' ? 'https' : 'http'],
             "info" => [
-                "title" => t('Documentación API módulo ') . $module['name'],
+                "title" => t('Documentación API módulo ').$module['name'],
                 "version" => Config::getParam('api.version', '1.0.0'),
                 "contact" => [
                     "name" => Config::getParam("author", "Fran López"),
@@ -476,7 +476,7 @@ 
         foreach ($endpoints as $model) {
             foreach ($model as $endpoint) {
                 if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) {
-                    $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']);
+                    $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']);
                     $description = $endpoint['description'];
                     $method = strtolower($endpoint['method']);
                     $paths[$url][$method] = [
@@ -537,7 +537,7 @@ 
     protected function extractDtoName($dto, $isArray = false)
     {
         $dto = explode('\\', $dto);
-        $modelDto = array_pop($dto) . "Dto";
+        $modelDto = array_pop($dto)."Dto";
         if ($isArray) {
             $modelDto .= "List";
         }
@@ -587,10 +587,10 @@ 
     {
 
         $methodInfo['headers'] = [];
-        foreach($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property) {
             $doc = $property->getDocComment();
             preg_match('/@header\ (.*)\n/i', $doc, $headers);
-            if(count($headers)) {
+            if (count($headers)) {
                 $header = [
                     "name" => $headers[1],
                     "in" => "header",
@@ -635,7 +635,7 @@ 
             foreach ($method->getParameters() as $parameter) {
                 $parameterName = $parameter->getName();
                 $types = [];
-                preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types);
+                preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types);
                 if (count($types) > 1 && count($types[1]) > 0) {
                     $methodInfo['parameters'][$parameterName] = $types[1][0];
                 }
@@ -657,21 +657,21 @@ 
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'array',
                         'items' => [
-                            '$ref' => '#/definitions/' . $info['type'],
+                            '$ref' => '#/definitions/'.$info['type'],
                         ]
                     ];
-                } else {
+                }else {
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'object',
-                        '$ref' => '#/definitions/' . $info['type'],
+                        '$ref' => '#/definitions/'.$info['type'],
                     ];
                 }
                 $modelDto['objects'][$info['class']] = $info['properties'];
                 $paramDto = $this->checkDtoAttributes($info['properties'], $info['properties'], $info['class']);
-                if(array_key_exists('objects', $paramDto)) {
+                if (array_key_exists('objects', $paramDto)) {
                     $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']);
                 }
-            } else {
+            }else {
                 $modelDto['objects'][$dtoName][$param] = $info;
             }
         }

src/base/Singleton.php

Spacing +8 added lines, -8 removed lines

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

src/base/types/helpers/ApiHelper.php

Spacing +37 added lines, -37 removed lines

@@ -37,20 +37,20 @@ 
         $behaviors = $tableMap->getBehaviors();
         foreach ($map::getFieldNames() as $field) {
             $fDto = self::parseFormField($domain, $tableMap, $field, $behaviors);
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $form->addField($fDto);
             }
         }
 
-        if(array_key_exists('i18n', $behaviors)) {
-            $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
-            if(null !== $relateI18n) {
+        if (array_key_exists('i18n', $behaviors)) {
+            $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
+            if (null !== $relateI18n) {
                 $i18NTableMap = $relateI18n->getLocalTable();
-                foreach($i18NTableMap->getColumns() as $columnMap) {
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
                     $columnName = self::getColumnMapName($columnMap);
-                    if(!$form->fieldExists($columnName)) {
+                    if (!$form->fieldExists($columnName)) {
                         $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors());
-                        if(null !== $fDto) {
+                        if (null !== $fDto) {
                             $fDto->pk = false;
                             $form->addField($fDto);
                         }
@@ -79,7 +79,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;
     }
 
@@ -186,14 +186,14 @@ 
     {
         $column = null;
         try {
-            foreach($tableMap->getColumns() as $tableMapColumn) {
+            foreach ($tableMap->getColumns() as $tableMapColumn) {
                 $columnName = $tableMapColumn->getPhpName();
-                if(preg_match('/^'.$field.'$/i', $columnName)) {
+                if (preg_match('/^'.$field.'$/i', $columnName)) {
                     $column = $tableMapColumn;
                     break;
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
         return $column;
@@ -207,18 +207,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);
                 }
             }
@@ -238,31 +238,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 ($extraColumns as $extra => $name) {
-            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.'%"');
     }
 
     /**
@@ -287,7 +287,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);
 
@@ -316,7 +316,7 @@ 
         } elseif ($mappedColumn->isText()) {
             if ($mappedColumn->getSize() > 100) {
                 $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required);
-            } else {
+            }else {
                 $fDto = self::generateStringField($field, $required);
             }
         } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) {
@@ -344,7 +344,7 @@ 
                 $fDto->pk = true;
             }
         }
-        switch(Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) {
+        switch (Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) {
             default:
             case TableMap::TYPE_PHPNAME:
                 $fDto->name = $mappedColumn->getPhpName();
@@ -368,7 +368,7 @@ 
      */
     public static function extractPrimaryKeyColumnName(TableMap $tableMap) {
         $modelPk = null;
-        foreach($tableMap->getPrimaryKeys() as $pk) {
+        foreach ($tableMap->getPrimaryKeys() as $pk) {
             $modelPk = $pk;
             break;
         }
@@ -377,15 +377,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;
             }
         }
@@ -402,14 +402,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;
@@ -420,7 +420,7 @@ 
      */
     public static function getFieldTypes() {
         $configType = Config::getParam('api.field.case');
-        switch($configType) {
+        switch ($configType) {
             case 'UpperCamelCase':
             case TableMap::TYPE_PHPNAME:
                 $fieldType = TableMap::TYPE_PHPNAME;
@@ -445,11 +445,11 @@ 
     }
 
     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/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);
             }
         }
@@ -161,15 +161,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);
                 }
             }
@@ -201,17 +201,17 @@ 
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
-            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap';
+            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $modelI18nTableMapClass::getTableMap();
-            foreach($modelI18nTableMap->getColumns() as $columnMap) {
-                if(!$columnMap->isPrimaryKey()) {
+            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));
                 }
             }
         }
@@ -225,21 +225,21 @@ 
         $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();
-                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/OutputTrait.php

Spacing +16 added lines, -16 removed lines

@@ -121,7 +121,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;
@@ -135,11 +135,11 @@ 
     private function setReponseHeaders($contentType = 'text/html', array $cookies = array())
     {
         $powered = Config::getParam('poweredBy', 'PSFS');
-        header('X-Powered-By: ' . $powered);
+        header('X-Powered-By: '.$powered);
         ResponseHelper::setStatusHeader($this->getStatusCode());
         ResponseHelper::setAuthHeaders($this->isPublicZone());
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -152,20 +152,20 @@ 
      */
     public function output($output = '', $contentType = 'text/html', array $cookies = array())
     {
-        if(!self::isTest()) {
+        if (!self::isTest()) {
             Logger::log('Start output response');
             ob_start();
             $this->setReponseHeaders($contentType, $cookies);
-            header('Content-length: ' . strlen($output));
-            header('CRC: ' . crc32($output));
+            header('Content-length: '.strlen($output));
+            header('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();
             }
@@ -175,7 +175,7 @@ 
             ob_end_clean();
             Logger::log('End output response');
             $this->closeRender();
-        } else {
+        }else {
             return $output;
         }
     }
@@ -188,11 +188,11 @@ 
         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();
-        Logger::log('End request: ' . $uri, LOG_INFO);
+        Logger::log('End request: '.$uri, LOG_INFO);
         exit;
     }
 
@@ -230,17 +230,17 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         header('Pragma: no-cache');
         header('Expires: 0');
         header('Content-Transfer-Encoding: binary');
-        header('Content-type: ' . $content);
-        header('Content-length: ' . strlen($data));
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header('Content-type: '.$content);
+        header('Content-length: '.strlen($data));
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
         header('Access-Control-Expose-Headers: Filename');
-        header('Filename: ' . $filename);
+        header('Filename: '.$filename);
         echo $data;
         ob_flush();
         ob_end_clean();

src/base/types/Api.php

Spacing +36 added lines, -36 removed lines

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