psfs / core

src/Dispatcher.php

Spacing +5 added lines, -5 removed lines

@@ -69,16 +69,16 @@
                 if (!Request::getInstance()->isFile()) {
                     return $this->router->execute($this->actualUri);
                 }
-            } else {
+            }else {
                 return ConfigController::getInstance()->config();
             }
-        } catch (AdminCredentialsException $a) {
+        }catch (AdminCredentialsException $a) {
             return UserController::showAdminManager();
-        } catch (SecurityException $s) {
+        }catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             return $this->router->httpNotFound($r);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $this->dumpException($e);
         }
     }

src/base/types/traits/OutputTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
 
     /**
      * Método que fuerza la descarga de un fichero
-     * @param $data
+     * @param string $data
      * @param string $content
      * @param string $filename
      * @return mixed

Spacing +13 added lines, -13 removed lines

@@ -120,7 +120,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;
@@ -138,7 +138,7 @@ 
         ResponseHelper::setStatusHeader($this->getStatusCode());
         ResponseHelper::setAuthHeaders($this->isPublicZone());
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -154,16 +154,16 @@ 
         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 (false !== $needCache && $this->getStatusCode() === Template::STATUS_OK && null !== $cacheDataName) {
             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();
         }
@@ -183,11 +183,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;
     }
 
@@ -225,17 +225,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/controller/DocumentorController.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
         $download = $this->getRequest()->get('download') ?: false;
 
         $module = $this->srv->getModules($domain);
-        if(empty($module)) {
+        if (empty($module)) {
             return Router::getInstance()->httpNotFound(null, true);
         }
         switch (strtolower($type)) {
@@ -53,11 +53,11 @@ 
         ini_restore('max_execution_time');
         ini_restore('memory_limit');
 
-        if($download && $type === ApiController::SWAGGER_DOC) {
+        if ($download && $type === ApiController::SWAGGER_DOC) {
             return $this->download(\GuzzleHttp\json_encode($doc), 'application/json', 'swagger.json');
-        } elseif($type === ApiController::HTML_DOC) {
+        } elseif ($type === ApiController::HTML_DOC) {
             return $this->render('documentation.html.twig', ["data" => json_encode($doc)]);
-        } else {
+        }else {
             return $this->json($doc, 200);
         }
     }

src/base/Request.php

Doc Comments +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 
     /**
      * Método que verifica si existe una cabecera concreta
-     * @param $header
+     * @param string $header
      *
      * @return boolean
      */
@@ -175,7 +175,7 @@ 
      *
      * @param string $queryParams
      *
-     * @return mixed
+     * @return string
      */
     public function getQuery($queryParams)
     {

Spacing +6 added lines, -6 removed lines

@@ -112,7 +112,7 @@ 
      */
     public static function header($name, $default = null)
     {
-        return self::getInstance()->getHeader($name,  $default);
+        return self::getInstance()->getHeader($name, $default);
     }
 
     /**
@@ -125,8 +125,8 @@ 
         $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('h_'.strtolower($name), $this->query)) {
+            $header = $this->query['h_'.strtolower($name)];
         }
         return $header ?: $default;
     }
@@ -224,7 +224,7 @@ 
     {
         if (null === $url) $url = $this->getServer('HTTP_ORIGIN');
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(_("Redireccionando..."));
@@ -268,9 +268,9 @@ 
     {
         $url = $this->getServerName();
         $protocol = $protocol ? $this->getProtocol() : '';
-        if (!empty($protocol)) $url = $protocol . $url;
+        if (!empty($protocol)) $url = $protocol.$url;
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443])) {
-            $url .= ':' . $this->getServer('SERVER_PORT');
+            $url .= ':'.$this->getServer('SERVER_PORT');
         }
         return $url;
     }

Braces +6 added lines, -2 removed lines

@@ -222,7 +222,9 @@ 
      */
     public function redirect($url = null)
     {
-        if (null === $url) $url = $this->getServer('HTTP_ORIGIN');
+        if (null === $url) {
+            $url = $this->getServer('HTTP_ORIGIN');
+        }
         ob_start();
         header('Location: ' . $url);
         ob_end_clean();
@@ -268,7 +270,9 @@ 
     {
         $url = $this->getServerName();
         $protocol = $protocol ? $this->getProtocol() : '';
-        if (!empty($protocol)) $url = $protocol . $url;
+        if (!empty($protocol)) {
+            $url = $protocol . $url;
+        }
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443])) {
             $url .= ':' . $this->getServer('SERVER_PORT');
         }

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()
     {

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

Spacing +16 added lines, -16 removed lines

@@ -95,14 +95,14 @@ 
      */
     protected function hydrateBulkRequest() {
         $class = new \ReflectionClass($this->getModelNamespace());
-        foreach($this->data as $item) {
-            if(count($this->list) < Config::getParam('api.block.limit', 1000)) {
+        foreach ($this->data as $item) {
+            if (count($this->list) < Config::getParam('api.block.limit', 1000)) {
                 /** @var ActiveRecordInterface $model */
                 $model = $class->newInstance();
                 $this->hydrateModelFromRequest($model, $item);
                 $this->list[] = $model;
-            } else {
-                Logger::log(_('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . _('items'));
+            }else {
+                Logger::log(_('Max items per bulk insert raised'), LOG_WARNING, count($this->data)._('items'));
             }
         }
     }
@@ -112,12 +112,12 @@ 
      */
     protected function saveBulk() {
         $tablemap = $this->getTableMap();
-        foreach($this->list as &$model) {
+        foreach ($this->list as &$model) {
             $con = Propel::getWriteConnection($tablemap::DATABASE_NAME);
             try {
                 $model->save($con);
                 $con->commit();
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, $model->toArray());
                 $con->rollBack();
             }
@@ -130,7 +130,7 @@ 
     protected function exportList() {
         $list = [];
         /** @var ActiveRecordInterface $item */
-        foreach($this->list as $item) {
+        foreach ($this->list as $item) {
             $list[] = $item->toArray();
         }
         return $list;
@@ -141,7 +141,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function joinTables(ModelCriteria &$query)
+    protected function joinTables(ModelCriteria & $query)
     {
         //TODO for specific implementations
     }
@@ -154,16 +154,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);
                 }
             }
@@ -193,8 +193,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);
         }
     }
 
@@ -215,7 +215,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) {

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/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 +6 added lines, -6 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();
                 }
             }
@@ -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;
         }