psfs / core

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);
         }