psfs / core

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

Doc Comments +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 
     /**
      * Method that extract the Api name
-     * @return mixed
+     * @return string
      */
     public function getApi()
     {
@@ -50,7 +50,7 @@ 
 
     /**
      * Method that extract the Domain name
-     * @return mixed
+     * @return string
      */
     public function getDomain()
     {

Spacing +8 added lines, -8 removed lines

@@ -93,7 +93,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function joinTables(ModelCriteria &$query)
+    protected function joinTables(ModelCriteria & $query)
     {
         //TODO for specific implementations
     }
@@ -106,14 +106,14 @@ 
      */
     private function findPk(ModelCriteria $query, $pk) {
         $pks = explode(Api::API_PK_SEPARATOR, urldecode($pk));
-        if(count($pks) == 1) {
+        if (count($pks) == 1) {
             return $query->findPk($pks[0]);
-        } else {
+        }else {
             $i = 0;
-            foreach($this->getPkDbName() as $key => $phpName) {
+            foreach ($this->getPkDbName() as $key => $phpName) {
                 $query->filterBy($phpName, $pks[$i]);
                 $i++;
-                if($i >= count($pks)) break;
+                if ($i >= count($pks)) break;
             }
             return $query->findOne();
         }
@@ -140,8 +140,8 @@ 
         try {
             $query = $this->prepareQuery();
             $this->model = $this->findPk($query, $pk);
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
     }
 
@@ -162,7 +162,7 @@ 
     /**
      * @param ModelCriteria $query
      */
-    private function checkReturnFields(ModelCriteria &$query)
+    private function checkReturnFields(ModelCriteria & $query)
     {
         $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD);
         if (null !== $returnFields) {

Braces +3 added lines, -1 removed lines

@@ -113,7 +113,9 @@
             foreach($this->getPkDbName() as $key => $phpName) {
                 $query->filterBy($phpName, $pks[$i]);
                 $i++;
-                if($i >= count($pks)) break;
+                if($i >= count($pks)) {
+                    break;
+                }
             }
             return $query->findOne();
         }

src/base/dto/Form.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             return ($aOrder < $bOrder) ? -1 : 1;
         });
         $array['actions'] = [];
-        foreach($this->actions as $action) {
+        foreach ($this->actions as $action) {
             $array['actions'][] = $action->__toArray();
         }
         return $array;

src/base/types/helpers/RequestHelper.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                     header("Access-Control-Allow-Credentials: true");
                     header("Access-Control-Allow-Origin: *");
                     header("Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS");
-                    header("Access-Control-Allow-Headers: " . implode(', ', self::getCorsHeaders()));
+                    header("Access-Control-Allow-Headers: ".implode(', ', self::getCorsHeaders()));
                 }
                 if (Request::getInstance()->getMethod() == 'OPTIONS') {
                     Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG);

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

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
             "domain" => $this->getDomain(),
             "listLabel" => Api::API_LIST_NAME_FIELD,
             'modelId' => Api::API_MODEL_KEY_FIELD,
-            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-' . $this->getDomain() . '-' . $this->getApi()), TRUE)),
-            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain() . '-' . 'api-' . $this->getApi() . "-pk"), TRUE)),
+            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-'.$this->getDomain().'-'.$this->getApi()), TRUE)),
+            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain().'-'.'api-'.$this->getApi()."-pk"), TRUE)),
         ), [], '');
     }
 

src/base/types/Api.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Propel\Runtime\Map\TableMap;
-use PSFS\base\config\Config;
 use PSFS\base\dto\JsonResponse;
 use PSFS\base\dto\Order;
 use PSFS\base\Logger;

Spacing +19 added lines, -19 removed lines

@@ -108,7 +108,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addOrders(ModelCriteria &$query)
+    private function addOrders(ModelCriteria & $query)
     {
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
@@ -117,13 +117,13 @@ 
                 $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);
             }
         }
@@ -134,14 +134,14 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addFilters(ModelCriteria &$query)
+    private function addFilters(ModelCriteria & $query)
     {
         if (count($this->query) > 0) {
             $tableMap = $this->getTableMap();
             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);
                 }
             }
@@ -162,10 +162,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);
         }
     }
@@ -184,7 +184,7 @@ 
         $code = 200;
         list($return, $total, $pages) = $this->getList();
         $message = null;
-        if(!$total) {
+        if (!$total) {
             $message = _('No se han encontrado elementos para la búsqueda');
         }
 
@@ -210,7 +210,7 @@ 
         $pages = 1;
         $message = null;
         list($code, $return) = $this->getSingleResult($pk);
-        if($code !== 200) {
+        if ($code !== 200) {
             $message = _('No se ha encontrado el elemento solicitado');
         }
 
@@ -239,11 +239,11 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray();
-            } else {
+            }else {
                 $message = _('No se ha podido modificar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            $message = _('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage();
+        }catch (\Exception $e) {
+            $message = _('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
             Logger::log($e->getMessage(), LOG_ERR);
         }
 
@@ -277,14 +277,14 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray();
-                } else {
+                }else {
                     $message = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = $e->getMessage();
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
-        } else {
+        }else {
             $message = _('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -314,7 +314,7 @@ 
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = _('Ha ocurrido un error intentando eliminar el elemento, por favor verifica que no tenga otros elementos relacionados');
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
@@ -348,8 +348,8 @@ 
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
             }
-        } 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);
@@ -367,7 +367,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray();
         }
 

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

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Propel\Runtime\Propel;
 use PSFS\base\config\Config;
 use PSFS\base\Logger;
-use PSFS\base\types\traits\DebugTrait;
 
 /**
  * Trait ConnectionTrait

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
     protected function createConnection(TableMap $tableMap)
     {
         $this->con = Propel::getConnection($tableMap::DATABASE_NAME);
-        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'));
         }
@@ -43,7 +43,7 @@ 
         if (null !== $this->con && $this->con->inTransaction()) {
             if ($status === 200) {
                 $this->con->commit();
-            } else {
+            }else {
                 $this->con->rollBack();
             }
         }

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

Spacing +24 added lines, -24 removed lines

@@ -58,21 +58,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'));
         }
     }
@@ -95,10 +95,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;
     }
 
     /**
@@ -120,7 +120,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -132,7 +132,7 @@ 
      * @param ModelCriteria $query
      * @param string $action
      */
-    private function addExtraColumns(ModelCriteria &$query, $action)
+    private function addExtraColumns(ModelCriteria & $query, $action)
     {
         if (Api::API_ACTION_LIST === $action) {
             $this->addDefaultListField();
@@ -160,21 +160,21 @@ 
     /**
      * @param ModelCriteria $query
      */
-    protected function checkI18n(ModelCriteria &$query)
+    protected function checkI18n(ModelCriteria & $query)
     {
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $default_language = explode('_', Config::getParam('default.language', 'es_ES'));
             $query->useI18nQuery(Request::header('X-API-LANG', $default_language[0]));
-            $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() . ', "'.Request::header('X-API-LANG', 'es').'")', $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().', "'.Request::header('X-API-LANG', 'es').'")', $columnMap->getPhpName());
                 }
             }
         }
@@ -184,23 +184,23 @@ 
      * @param ActiveRecordInterface $model
      * @param array $data
      */
-    protected function hydrateModelFromRequest(ActiveRecordInterface &$model, array $data = []) {
+    protected function hydrateModelFromRequest(ActiveRecordInterface & $model, array $data = []) {
         $model->fromArray($data);
         $tableMap = $this->getTableMap();
         try {
-            $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
-            if(null !== $relateI18n) {
+            $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
+            if (null !== $relateI18n) {
                 $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_WARNING);
         }
     }

src/base/Security.php

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
             session_start();
         }
         // Fix for phpunits
-        if(!isset($_SESSION)) {
+        if (!isset($_SESSION)) {
             $_SESSION = [];
         }
     }
@@ -132,12 +132,12 @@ 
     {
         $saved = true;
         try {
-            $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: [];
-            $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+            $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: [];
+            $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
             $admins[$user['username']]['profile'] = $user['profile'];
 
-            Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true);
-        } catch(\Exception $e) {
+            Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             $saved = false;
         }
@@ -174,7 +174,7 @@ 
      */
     public function getAdmins()
     {
-        return Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true);
+        return Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true);
     }
 
     /**
@@ -202,7 +202,7 @@ 
                 }
                 if (!empty($user) && !empty($admins[$user])) {
                     $auth = $admins[$user]['hash'];
-                    $this->authorized = ($auth == sha1($user . $pass));
+                    $this->authorized = ($auth == sha1($user.$pass));
                     if ($this->authorized) {
                         $this->admin = array(
                             'alias' => $user,

src/base/dto/JsonResponse.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $this->success = $result;
         $this->total = $total ?: count($data);
         $this->pages = $pages;
-        if(null !== $message) {
+        if (null !== $message) {
             $this->message = $message;
         }
     }