psfs / core

src/controller/ConfigController.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
         foreach ($domains as $domain => $routes) {
             $pDomain = str_replace('@', '', $domain);
             $pDomain = str_replace('/', '', $pDomain);
-            $response[] = strtolower($pDomain) . '.api.secret';
+            $response[] = strtolower($pDomain).'.api.secret';
         }
         return $this->json($response);
     }
@@ -45,7 +45,7 @@ 
      */
     public function config()
     {
-        Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri());
+        Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri());
         /* @var $form \PSFS\base\config\ConfigForm */
         $form = new ConfigForm(Router::getInstance()->getRoute('admin-config'), Config::$required, Config::$optional, Config::getInstance()->dumpConfig());
         $form->build();
@@ -82,7 +82,7 @@ 
                 }
                 Security::getInstance()->setFlash("callback_message", t("Configuración actualizada correctamente"));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true));
-            } else {
+            }else {
                 throw new \HttpException(t('Error al guardar la configuración, prueba a cambiar los permisos'), 403);
             }
         }

src/base/types/CustomAuthApi.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public function init()
     {
-        if(!Security::getInstance()->isLogged()) {
+        if (!Security::getInstance()->isLogged()) {
             throw new ApiException(t('Resource not authorized'), 401);
         }
         parent::init();

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

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
     {
         $this->con = Propel::getConnection($tableMap::DATABASE_NAME);
         $this->con->beginTransaction();
-        if(method_exists($this->con, 'useDebug')) {
+        if (method_exists($this->con, 'useDebug')) {
             Logger::log('Enabling debug queries mode', LOG_INFO);
             $this->con->useDebug(Config::getParam('debug'));
         }
@@ -45,12 +45,12 @@ 
      */
     protected function closeTransaction($status)
     {
-        if(null !== $this->con) {
+        if (null !== $this->con) {
             $this->traceDebugQuery();
             if (null !== $this->con && $this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -64,7 +64,7 @@ 
     protected function traceDebugQuery()
     {
         if (Config::getParam('debug')) {
-            Logger::log($this->con->getLastExecutedQuery()?: 'Empty Query', LOG_DEBUG);
+            Logger::log($this->con->getLastExecutedQuery() ?: 'Empty Query', LOG_DEBUG);
         }
     }
 
@@ -72,13 +72,13 @@ 
      * Checks if the connection has a transaction initialized
      */
     protected function checkTransaction() {
-        if(null !== $this->con && !$this->con->inTransaction()) {
+        if (null !== $this->con && !$this->con->inTransaction()) {
             $this->con->beginTransaction();
         }
-        if(null !== $this->con && $this->con->inTransaction()) {
+        if (null !== $this->con && $this->con->inTransaction()) {
             $this->items++;
         }
-        if($this->items >= Config::getParam('api.block.limit', 1000)) {
+        if ($this->items >= Config::getParam('api.block.limit', 1000)) {
             $this->con->commit();
             $this->items = 0;
         }

src/base/types/Api.php

Spacing +36 added lines, -36 removed lines

@@ -83,20 +83,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;
@@ -113,7 +113,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) {
@@ -130,10 +130,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);
     }
 
@@ -144,7 +144,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) {
@@ -152,17 +152,17 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
         }
         if (!$orderAdded) {
-            foreach($this->getPkDbName() as $pk => $phpName) {
+            foreach ($this->getPkDbName() as $pk => $phpName) {
                 $query->addAscendingOrderByColumn($pk);
             }
         }
-        Logger::log(static::class . ' extract orders end', LOG_DEBUG);
+        Logger::log(static::class.' extract orders end', LOG_DEBUG);
     }
 
     /**
@@ -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);
@@ -394,7 +394,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');
         }
@@ -416,7 +416,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;
@@ -433,23 +433,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);
@@ -467,7 +467,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
         }
 

src/base/types/helpers/ServiceHelper.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     }
 
     public static function parseRawData($type, array $params = []) {
-        switch($type) {
+        switch ($type) {
             default:
             case self::TYPE_HTTP:
                 $parsedParams = http_build_query($params);

src/base/types/helpers/ApiHelper.php

Spacing +34 added lines, -34 removed lines

@@ -37,19 +37,19 @@ 
         $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) {
-                    if(!$form->fieldExists($columnMap->getPhpName())) {
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
+                    if (!$form->fieldExists($columnMap->getPhpName())) {
                         $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors());
-                        if(null !== $fDto) {
+                        if (null !== $fDto) {
                             $fDto->pk = false;
                             $form->addField($fDto);
                         }
@@ -78,7 +78,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;
     }
 
@@ -185,14 +185,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;
@@ -206,18 +206,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);
                 }
             }
@@ -237,31 +237,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.'%"');
     }
 
     /**
@@ -286,7 +286,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);
 
@@ -315,7 +315,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) {
@@ -343,7 +343,7 @@ 
                 $fDto->pk = true;
             }
         }
-        switch(Config::getParam('api.field.type', TableMap::TYPE_PHPNAME)) {
+        switch (Config::getParam('api.field.type', TableMap::TYPE_PHPNAME)) {
             default:
             case TableMap::TYPE_PHPNAME:
                 $fDto->name = $mappedColumn->getPhpName();
@@ -367,7 +367,7 @@ 
      */
     public static function extractPrimaryKeyColumnName(TableMap $tableMap) {
         $modelPk = null;
-        foreach($tableMap->getPrimaryKeys() as $pk) {
+        foreach ($tableMap->getPrimaryKeys() as $pk) {
             $modelPk = $pk;
             break;
         }
@@ -376,15 +376,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;
             }
         }
@@ -401,14 +401,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;

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

Spacing +25 added lines, -25 removed lines

@@ -75,21 +75,21 @@ 
         if (count($pks) == 1) {
             $pks = array_keys($pks);
             return [
-                $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD
+                $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD
             ];
         } elseif (count($pks) > 1) {
             $apiPks = [];
             $principal = '';
             $sep = 'CONCAT(';
             foreach ($pks as $pk) {
-                $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName();
-                $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName();
-                $sep = ', "' . Api::API_PK_SEPARATOR . '", ';
+                $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName();
+                $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName();
+                $sep = ', "'.Api::API_PK_SEPARATOR.'", ';
             }
             $principal .= ')';
             $apiPks[$principal] = Api::API_MODEL_KEY_FIELD;
             return $apiPks;
-        } else {
+        }else {
             throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta'));
         }
     }
@@ -112,10 +112,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;
     }
 
     /**
@@ -137,7 +137,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -156,15 +156,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);
                 }
             }
@@ -196,17 +196,17 @@ 
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
-            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap';
+            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $modelI18nTableMapClass::getTableMap();
-            foreach($modelI18nTableMap->getColumns() as $columnMap) {
-                if(!$columnMap->isPrimaryKey()) {
-                    $query->withColumn($modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName(), $columnMap->getPhpName());
-                } elseif(!$columnMap->isForeignKey()) {
-                    $query->withColumn('IFNULL(' . $modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName() . ', "'.$this->lang.'")', $columnMap->getPhpName());
+            foreach ($modelI18nTableMap->getColumns() as $columnMap) {
+                if (!$columnMap->isPrimaryKey()) {
+                    $query->withColumn($modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName(), $columnMap->getPhpName());
+                } elseif (!$columnMap->isForeignKey()) {
+                    $query->withColumn('IFNULL('.$modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName().', "'.$this->lang.'")', $columnMap->getPhpName());
                 }
             }
         }
@@ -220,20 +220,20 @@ 
         $model->fromArray($data);
         $tableMap = $this->getTableMap();
         try {
-            if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n'))
+            if ($tableMap->hasRelation($tableMap->getPhpName().'I18n'))
             {
-                $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
+                $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
                 $i18NTableMap = $relateI18n->getLocalTable();
-                foreach($i18NTableMap->getColumns() as $columnMap) {
-                    $method = 'set' . $columnMap->getPhpName();
-                    if(!($columnMap->isPrimaryKey() && $columnMap->isForeignKey())
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
+                    $method = 'set'.$columnMap->getPhpName();
+                    if (!($columnMap->isPrimaryKey() && $columnMap->isForeignKey())
                         &&array_key_exists($columnMap->getPhpName(), $data)
                         && method_exists($model, $method)) {
                         $model->$method($data[$columnMap->getPhpName()]);
                     }
                 }
             }
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
     }
@@ -243,7 +243,7 @@ 
      */
     protected function checkFieldType() {
         $configType = Config::getParam('api.field.type');
-        switch($configType) {
+        switch ($configType) {
             case 'UpperCamelCase':
             case TableMap::TYPE_PHPNAME:
                 $this->fieldType = TableMap::TYPE_PHPNAME;

src/base/Service.php

Spacing +15 added lines, -15 removed lines

@@ -70,7 +70,7 @@ 
     protected $isMultipart = false;
 
     private function closeConnection() {
-        if(null !== $this->con) {
+        if (null !== $this->con) {
             curl_close($this->con);
         }
     }
@@ -233,7 +233,7 @@ 
      */
     public function setIsJson($isJson = true) {
         $this->isJson = $isJson;
-        if($isJson) {
+        if ($isJson) {
             $this->setIsMultipart(false);
         }
     }
@@ -251,7 +251,7 @@ 
      */
     public function setIsMultipart($isMultipart = true) {
         $this->isMultipart = $isMultipart;
-        if($isMultipart) {
+        if ($isMultipart) {
             $this->setIsJson(false);
         }
     }
@@ -271,7 +271,7 @@ 
         $this->url = NULL;
         $this->params = array();
         $this->headers = array();
-        Logger::log('Context service for ' . static::class . ' cleared!');
+        Logger::log('Context service for '.static::class.' cleared!');
         $this->closeConnection();
     }
 
@@ -314,18 +314,18 @@ 
     }
 
     protected function applyOptions() {
-        if(count($this->options)) {
+        if (count($this->options)) {
             curl_setopt_array($this->con, $this->options);
         }
     }
 
     protected function applyHeaders() {
         $headers = [];
-        foreach($this->headers as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+        foreach ($this->headers as $key => $value) {
+            $headers[] = $key.': '.$value;
         }
         $headers[self::PSFS_TRACK_HEADER] = Logger::getUid();
-        if(count($headers)) {
+        if (count($headers)) {
             curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers);
         }
     }
@@ -334,10 +334,10 @@ 
      * @return int
      */
     private function parseServiceType() {
-        if($this->getIsJson()) {
+        if ($this->getIsJson()) {
             return ServiceHelper::TYPE_JSON;
         }
-        if($this->getIsMultipart()) {
+        if ($this->getIsMultipart()) {
             return ServiceHelper::TYPE_MULTIPART;
         }
         return ServiceHelper::TYPE_HTTP;
@@ -350,9 +350,9 @@ 
             case Request::VERB_GET:
             default:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_GET);
-                if(!empty($this->params)) {
+                if (!empty($this->params)) {
                     $sep = false !== strpos($this->getUrl(), '?') ? '?' : '';
-                    $this->url = $this->url . $sep . http_build_query($this->params);
+                    $this->url = $this->url.$sep.http_build_query($this->params);
                 }
                 break;
             case Request::VERB_POST:
@@ -384,14 +384,14 @@ 
         $this->applyOptions();
         $this->applyHeaders();
         $verbose = null;
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             curl_setopt($this->con, CURLOPT_VERBOSE, true);
             $verbose = fopen('php://temp', 'wb+');
             curl_setopt($this->con, CURLOPT_STDERR, $verbose);
         }
         $result = curl_exec($this->con);
         $this->result = $this->isJson ? json_decode($result, true) : $result;
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             rewind($verbose);
             $verboseLog = stream_get_contents($verbose);
             Logger::log($verboseLog, LOG_DEBUG, [
@@ -401,7 +401,7 @@ 
             ]);
             $this->info['verbose'] = $verboseLog;
         }
-        Logger::log($this->url . ' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]);
+        Logger::log($this->url.' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]);
         $this->info = array_merge($this->info, curl_getinfo($this->con));
     }
 

src/base/Request.php

Spacing +8 added lines, -8 removed lines

@@ -145,7 +145,7 @@ 
      */
     public static function header($name, $default = null)
     {
-        return self::getInstance()->getHeader($name,  $default);
+        return self::getInstance()->getHeader($name, $default);
     }
 
     /**
@@ -158,10 +158,10 @@ 
         $header = null;
         if ($this->hasHeader($name)) {
             $header = $this->header[$name];
-        } else if(array_key_exists('h_' . strtolower($name), $this->query)) {
-            $header = $this->query['h_' . strtolower($name)];
-        } else if(array_key_exists('HTTP_' . strtoupper(str_replace('-', '_', $name)), $this->server)) {
-            $header = $this->server['HTTP_' . strtoupper(str_replace('-', '_', $name))];
+        }else if (array_key_exists('h_'.strtolower($name), $this->query)) {
+            $header = $this->query['h_'.strtolower($name)];
+        }else if (array_key_exists('HTTP_'.strtoupper(str_replace('-', '_', $name)), $this->server)) {
+            $header = $this->server['HTTP_'.strtoupper(str_replace('-', '_', $name))];
         }
         return $header ?: $default;
     }
@@ -260,7 +260,7 @@ 
             $url = $this->getServer('HTTP_ORIGIN');
         }
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(t('Redireccionando...'));
@@ -305,10 +305,10 @@ 
         $url = $this->getServerName();
         $protocol = $hasProtocol ? $this->getProtocol() : '';
         if (!empty($protocol)) {
-            $url = $protocol . $url;
+            $url = $protocol.$url;
         }
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443], true)) {
-            $url .= ':' . $this->getServer('SERVER_PORT');
+            $url .= ':'.$this->getServer('SERVER_PORT');
         }
         return $url;
     }