psfs / core

src/base/types/helpers/ApiHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
     }
 
     /**
-     * @param $field
+     * @param string $field
      * @param bool $required
      * @return Field
      */

Spacing +22 added lines, -22 removed lines

@@ -31,19 +31,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);
                         }
@@ -72,7 +72,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;
     }
 
@@ -180,7 +180,7 @@ 
         $column = null;
         try {
             $column = $tableMap->getColumnByPhpName($field);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
             //foreach($tableMap->getRelations() as $relation) {
             //    $column = self::checkFieldExists($relation->getLocalTable(), $field);
@@ -194,7 +194,7 @@ 
      * @param ModelCriteria $query
      * @param mixed $value
      */
-    private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null)
+    private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null)
     {
         $tableField = $column->getFullyQualifiedName();
         if (preg_match('/^<=/', $value)) {
@@ -210,8 +210,8 @@ 
         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
             $text = preg_replace('/(\'|\")/', '', $value);
             $text = preg_replace('/\ /', '%', $text);
-            $query->add($tableField, '%' . $text . '%', Criteria::LIKE);
-        } else {
+            $query->add($tableField, '%'.$text.'%', Criteria::LIKE);
+        }else {
             $query->add($tableField, $value, Criteria::EQUAL);
         }
     }
@@ -222,35 +222,35 @@ 
      * @param array $extraColumns
      * @param mixed $value
      */
-    public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null)
+    public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null)
     {
         $exp = 'CONCAT(';
         $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) {
-            $exp .= $sep . $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.'%"');
     }
 
     /**
@@ -260,7 +260,7 @@ 
      * @param string $field
      * @param mixed $value
      */
-    public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null)
+    public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null)
     {
         if ($column = self::checkFieldExists($tableMap, $field)) {
             self::addQueryFilter($column, $query, $value);
@@ -275,7 +275,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);
 
@@ -304,7 +304,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) {

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 +9 added lines, -9 removed lines

@@ -93,7 +93,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function joinTables(ModelCriteria &$query)
+    protected function joinTables(ModelCriteria & $query)
     {
         //TODO for specific implementations
     }
@@ -106,16 +106,16 @@ 
      */
     protected function findPk(ModelCriteria $query, $pk) {
         $pks = explode(Api::API_PK_SEPARATOR, urldecode($pk));
-        if(count($pks) == 1 && !empty($pks[0])) {
+        if (count($pks) == 1 && !empty($pks[0])) {
             $model = $query->findPk($pks[0], $this->con);
-        } else {
+        }else {
             $i = 0;
-            foreach($this->getPkDbName() as $key => $phpName) {
+            foreach ($this->getPkDbName() as $key => $phpName) {
                 try {
                     $query->filterBy($phpName, $pks[$i]);
                     $i++;
-                    if($i >= count($pks)) break;
-                } catch(\Exception $e) {
+                    if ($i >= count($pks)) break;
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_DEBUG);
                 }
             }
@@ -145,8 +145,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);
         }
     }
 
@@ -167,7 +167,7 @@ 
     /**
      * @param ModelCriteria $query
      */
-    protected function checkReturnFields(ModelCriteria &$query)
+    protected function checkReturnFields(ModelCriteria & $query)
     {
         $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD);
         if (null !== $returnFields) {

Braces +3 added lines, -1 removed lines

@@ -114,7 +114,9 @@
                 try {
                     $query->filterBy($phpName, $pks[$i]);
                     $i++;
-                    if($i >= count($pks)) break;
+                    if($i >= count($pks)) {
+                        break;
+                    }
                 } catch(\Exception $e) {
                     Logger::log($e->getMessage(), LOG_DEBUG);
                 }

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

src/base/types/Api.php

Unused Use Statements -3 removed lines

@@ -3,15 +3,12 @@
 
 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;
 use PSFS\base\Request;
-use PSFS\base\Security;
 use PSFS\base\Singleton;
 use PSFS\base\types\helpers\ApiHelper;
-use PSFS\base\types\helpers\Inspector;
 use PSFS\base\types\traits\Api\ManagerTrait;
 
 /**

Spacing +26 added lines, -26 removed lines

@@ -72,13 +72,13 @@ 
     public function init()
     {
         parent::init();
-        Logger::log(get_called_class() . ' init', LOG_DEBUG);
+        Logger::log(get_called_class().' init', LOG_DEBUG);
         $this->domain = $this->getDomain();
         $this->hydrateRequestData();
         $this->hydrateOrders();
         $this->createConnection($this->getTableMap());
         $this->setLoaded(true);
-        Logger::log(get_called_class() . ' loaded', LOG_DEBUG);
+        Logger::log(get_called_class().' loaded', LOG_DEBUG);
     }
 
     /**
@@ -87,7 +87,7 @@ 
     private function hydrateOrders()
     {
         if (count($this->query)) {
-            Logger::log(get_called_class() . ' gathering query string', LOG_DEBUG);
+            Logger::log(get_called_class().' gathering query string', LOG_DEBUG);
             foreach ($this->query as $key => $value) {
                 if ($key === self::API_ORDER_FIELD) {
                     foreach ($value as $field => $direction) {
@@ -104,10 +104,10 @@ 
      */
     protected function extractPagination()
     {
-        Logger::log(get_called_class() . ' extract pagination start', LOG_DEBUG);
+        Logger::log(get_called_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(get_called_class() . ' extract pagination end', LOG_DEBUG);
+        Logger::log(get_called_class().' extract pagination end', LOG_DEBUG);
         return array($page, $limit);
     }
 
@@ -116,9 +116,9 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addOrders(ModelCriteria &$query)
+    private function addOrders(ModelCriteria & $query)
     {
-        Logger::log(get_called_class() . ' extract orders start ', LOG_DEBUG);
+        Logger::log(get_called_class().' extract orders start ', LOG_DEBUG);
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
         foreach ($this->order->getOrders() as $field => $direction) {
@@ -126,17 +126,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(get_called_class() . ' extract orders end', LOG_DEBUG);
+        Logger::log(get_called_class().' extract orders end', LOG_DEBUG);
     }
 
     /**
@@ -144,14 +144,14 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function addFilters(ModelCriteria &$query)
+    protected 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);
                 }
             }
@@ -172,10 +172,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);
         }
     }
@@ -194,7 +194,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');
         }
 
@@ -220,7 +220,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');
         }
 
@@ -249,11 +249,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);
         }
 
@@ -287,14 +287,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');
         }
 
@@ -324,7 +324,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());
             }
@@ -358,8 +358,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);
@@ -377,7 +377,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray();
         }
 

src/base/types/Controller.php

Unused Use Statements -4 removed lines

@@ -2,15 +2,11 @@
 namespace PSFS\base\types;
 
 use PSFS\base\config\Config;
-use PSFS\base\exception\RouterException;
-use PSFS\base\Request;
-use PSFS\base\Router;
 use PSFS\base\Singleton;
 use PSFS\base\types\helpers\GeneratorHelper;
 use PSFS\base\types\helpers\Inspector;
 use PSFS\base\types\interfaces\ControllerInterface;
 use PSFS\base\types\traits\JsonTrait;
-use PSFS\base\types\traits\OutputTrait;
 use PSFS\base\types\traits\RouteTrait;
 
 /**

Spacing +3 added lines, -3 removed lines

@@ -41,11 +41,11 @@ 
     public function render($template, array $vars = array(), $cookies = array(), $domain = null)
     {
         $vars['__menu__'] = $this->getMenu();
-        if(Config::getParam('profiling.enable')) {
+        if (Config::getParam('profiling.enable')) {
             $vars['__profiling__'] = Inspector::getStats();
         }
         $domain = (null === $domain) ? $this->getDomain() : $domain;
-        return $this->tpl->render($domain . $template, $vars, $cookies);
+        return $this->tpl->render($domain.$template, $vars, $cookies);
     }
 
     /**
@@ -76,7 +76,7 @@ 
     {
         $vars['__menu__'] = $this->getMenu();
         $domain = $domain ?: $this->getDomain();
-        return $this->tpl->dump($domain . $template, $vars);
+        return $this->tpl->dump($domain.$template, $vars);
     }
 
     /**