psfs / core

src/base/types/helpers/RouterHelper.php

Doc Comments +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
     /**
      * Método que extrae los parámetros de una función
      *
-     * @param array $sr
+     * @param string[] $sr
      * @param \ReflectionMethod $method
      *
      * @return array
@@ -207,7 +207,7 @@ 
      *
      * @param string $docComments
      *
-     * @return bool
+     * @return string
      */
     public static function extractReflectionCacheability($docComments)
     {

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
     public static function getClassToCall($action)
     {
         Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action);
-        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\" . $action["class"];
+        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\".$action["class"];
         $class = (method_exists($actionClass, "getInstance")) ? $actionClass::getInstance() : new $actionClass;
         return $class;
     }
@@ -106,7 +106,7 @@ 
         $expr = preg_quote($expr, '/');
         $expr = str_replace('###', '(.*)', $expr);
         $expr2 = preg_replace('/\(\.\*\)$/', '', $expr);
-        $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path);
+        $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path);
         return $matched;
     }
 
@@ -117,8 +117,8 @@ 
      */
     public static function extractDomainInfo(\ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-        $path = realpath($path) . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+        $path = realpath($path).DIRECTORY_SEPARATOR;
         $tpl_path = "templates";
         $public_path = "public";
         $model_path = "models";
@@ -128,12 +128,12 @@ 
             $model_path = ucfirst($model_path);
         }
         if ($class->hasConstant("TPL")) {
-            $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+            $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
         }
         return [
-            "template" => $path . $tpl_path,
-            "model" => $path . $model_path,
-            "public" => $path . $public_path,
+            "template" => $path.$tpl_path,
+            "model" => $path.$model_path,
+            "public" => $path.$public_path,
         ];
     }
 
@@ -155,9 +155,9 @@ 
         if (count($parameters) > 0) foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
-                $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
+                $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        }else $default = $regex;
 
         return array($regex, $default, $params);
     }
@@ -225,10 +225,10 @@ 
     {
         $is_enabled = true;
         // For non api routes
-        if(strlen($api) > 0 && preg_match('/admin/i', $route)) {
+        if (strlen($api) > 0 && preg_match('/admin/i', $route)) {
             // If route is for api, check if admin is enabled in config
             $admin_enabled = Config::getInstance()->get('api.admin');
-            if(empty($admin_enabled)) {
+            if (empty($admin_enabled)) {
                 $is_enabled = false;
             }
         }
@@ -253,8 +253,8 @@ 
             }
             $httpMethod = RouterHelper::extractReflectionHttpMethod($docComments);
             $label = RouterHelper::extractReflectionLabel($docComments);
-            if(self::checkCanAddRoute($regex, $api)) {
-                $route = $httpMethod . "#|#" . $regex;
+            if (self::checkCanAddRoute($regex, $api)) {
+                $route = $httpMethod."#|#".$regex;
                 $info = [
                     "method" => $method->getName(),
                     "params" => $params,
@@ -282,7 +282,7 @@ 
             $default = Config::getInstance()->get('admin_action') ?: 'admin-login';
 
         }
-        if(null !== $default) {
+        if (null !== $default) {
             return Router::getInstance()->execute(Router::getInstance()->getRoute($default));
         }
         return null;

src/base/types/Api.php

Spacing +23 added lines, -23 removed lines

@@ -164,7 +164,7 @@ 
             $tableMap = $tableMapClass::getTableMap();
             try {
                 $column = $tableMap->getColumnByPhpName($field);
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
                 $column = null;
             }
@@ -176,7 +176,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -184,7 +184,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($column->getPhpName());
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($column->getPhpName());
                     }
                 }
@@ -199,7 +199,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
             if (!empty($this->extraColumns)) {
                 foreach ($this->extraColumns as $expression => $columnName) {
@@ -213,7 +213,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -223,7 +223,7 @@ 
          */
         protected function parseExtraColumns() {
             $columns = [];
-            foreach($this->extraColumns as $key => $columnName) {
+            foreach ($this->extraColumns as $key => $columnName) {
                 $columns[$columnName] = strtolower($columnName);
             }
             return $columns;
@@ -234,7 +234,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addFilters(ModelCriteria &$query)
+        private function addFilters(ModelCriteria & $query)
         {
             if (count($this->query) > 0) {
                 $extraColumns = $this->parseExtraColumns();
@@ -253,16 +253,16 @@ 
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $text = preg_replace('/\ /', '%', $text);
                             $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
-                    } elseif(false !== ($index = array_search(strtolower($field), $extraColumns))) {
+                    } elseif (false !== ($index = array_search(strtolower($field), $extraColumns))) {
                         $exp = array_search($index, $this->extraColumns);
-                        $query->where($exp . Criteria::LIKE . '"'.$value.'"');
-                    } else {
+                        $query->where($exp.Criteria::LIKE.'"'.$value.'"');
+                    }else {
                         $tableField = null;
                     }
-                    if(null !== $tableField) {
+                    if (null !== $tableField) {
 
                     }
                 }
@@ -284,10 +284,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);
             }
         }
@@ -304,7 +304,7 @@ 
                 $this->joinTables($query);
                 $this->addExtraColumns($query);
                 $this->model = $query->findPk($pk);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -392,7 +392,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
             }
 
@@ -420,7 +420,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -464,7 +464,7 @@ 
          */
         private function extractQuery()
         {
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
             $query = $queryReflector->getMethod('create')->invoke($this->con);
 
@@ -508,7 +508,7 @@ 
             if (null !== $this->con && $this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -552,7 +552,7 @@ 
             return $this->render('api.admin.html.twig', array(
                 "api"    => $this->getApi(),
                 "domain" => $this->domain,
-                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
+                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
             ), [], '');
         }
 
@@ -586,12 +586,12 @@ 
             $pages = 0;
             try {
                 $this->paginate();
-                if(null !== $this->list) {
+                if (null !== $this->list) {
                     $return = $this->list->toArray();
                     $total = $this->list->getNbResults();
                     $pages = $this->list->getLastPage();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
 
@@ -610,7 +610,7 @@ 
             $return = array();
             if (NULL === $model && method_exists($model, 'toArray')) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 

src/base/types/helpers/ApiHelper.php

Spacing +4 added lines, -4 removed lines

@@ -43,9 +43,9 @@ 
             } elseif (in_array($mappedColumn->getType(), [PropelTypes::TIMESTAMP])) {
                 $fDto = self::createField($field, Field::TEXT_TYPE, $required);
                 $fDto->readonly = true;
-            } elseif(in_array($mappedColumn->getType(), [PropelTypes::ENUM, PropelTypes::SET])) {
+            } elseif (in_array($mappedColumn->getType(), [PropelTypes::ENUM, PropelTypes::SET])) {
                 $fDto = self::generateEnumField($field, $required);
-                foreach($mappedColumn->getValueSet() as $value) {
+                foreach ($mappedColumn->getValueSet() as $value) {
                     $fDto->data[] = [
                         $field => $value,
                         "Label" => _($value),
@@ -53,7 +53,7 @@ 
                 }
             }
 
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $form->addField($fDto);
             }
         }
@@ -76,7 +76,7 @@ 
         $fDto->entity = $relatedModel;
         $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName());
         $fDto->relatedField = $relatedField->getPhpName();
-        $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel);
+        $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel);
         return $fDto;
     }