psfs / core

src/base/types/Api.php

Spacing +26 added lines, -26 removed lines

@@ -186,7 +186,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addOrders(ModelCriteria &$query)
+    private function addOrders(ModelCriteria & $query)
     {
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
@@ -195,7 +195,7 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
@@ -215,7 +215,7 @@ 
         if (count($pks) == 1) {
             $pks = array_keys($pks);
             $this->extraColumns[$pks[0]] = self::API_MODEL_KEY_FIELD;
-        } else {
+        }else {
             throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta'));
         }
     }
@@ -237,7 +237,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = self::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -249,7 +249,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addExtraColumns(ModelCriteria &$query)
+    private function addExtraColumns(ModelCriteria & $query)
     {
         if (self::API_ACTION_LIST === $this->action) {
             $this->addDefaultListField();
@@ -267,7 +267,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function joinTables(ModelCriteria &$query)
+    protected function joinTables(ModelCriteria & $query)
     {
         //TODO for specific implementations
     }
@@ -289,14 +289,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);
-                } else {
+                }else {
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
                 }
             }
@@ -306,7 +306,7 @@ 
     /**
      * @param ModelCriteria $query
      */
-    private function checkReturnFields(ModelCriteria &$query)
+    private function checkReturnFields(ModelCriteria & $query)
     {
         $returnFields = $this->getRequest()->getQuery('__fields');
         if (null !== $returnFields) {
@@ -342,10 +342,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);
         }
     }
@@ -362,7 +362,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());
         }
     }
@@ -453,8 +453,8 @@ 
                 $saved = TRUE;
                 $model = $this->model->toArray();
             }
-        } catch (\Exception $e) {
-            $model = _('Ha ocurrido un error intentando guardar el elemento: ') . $e->getMessage();
+        }catch (\Exception $e) {
+            $model = _('Ha ocurrido un error intentando guardar el elemento: ').$e->getMessage();
             Logger::log($e->getMessage(), LOG_ERR);
         }
 
@@ -484,7 +484,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());
             }
@@ -519,14 +519,14 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray();
-                } else {
+                }else {
                     $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $model = $e->getMessage();
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
-        } else {
+        }else {
             $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
         }
 
@@ -538,7 +538,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);
 
@@ -582,7 +582,7 @@ 
         if (null !== $this->con && $this->con->inTransaction()) {
             if ($status === 200) {
                 $this->con->commit();
-            } else {
+            }else {
                 $this->con->rollBack();
             }
         }
@@ -634,8 +634,8 @@ 
             "domain" => $this->getDomain(),
             "listLabel" => self::API_LIST_NAME_FIELD,
             'modelId' => self::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)),
         ), [], '');
     }
 
@@ -675,7 +675,7 @@ 
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::getInstance(get_class($this))->errorLog($e->getMessage());
         }
 
@@ -694,7 +694,7 @@ 
         $return = array();
         if (NULL === $model && method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray();
         }
 
@@ -709,9 +709,9 @@ 
         $pks = '';
         $sep = '';
         foreach ($tableMap->getPrimaryKeys() as $pk) {
-            $pks .= $sep . $pk->getFullyQualifiedName();
+            $pks .= $sep.$pk->getFullyQualifiedName();
             $sep = ', "|", ';
         }
-        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = self::API_LIST_NAME_FIELD;
+        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = self::API_LIST_NAME_FIELD;
     }
 }

src/base/Router.php

Spacing +29 added lines, -29 removed lines

@@ -62,8 +62,8 @@ 
      */
     public function init()
     {
-        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", $this->cacheType, TRUE);
-        $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->cacheType, TRUE);
+        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", $this->cacheType, TRUE);
+        $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->cacheType, TRUE);
         if (empty($this->routing) || Config::getInstance()->getDebugMode()) {
             $this->debugLoad();
         }
@@ -101,7 +101,7 @@ 
                 "success" => FALSE,
                 "error" => $e->getMessage(),
             )), 'application/json');
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $e,
                 'trace' => $e->getTraceAsString(),
@@ -159,12 +159,12 @@ 
             SecurityHelper::checkRestrictedAccess($route);
             //Search action and execute
             $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
+        }catch (AccessDeniedException $e) {
             Logger::log(_('Solicitamos credenciales de acceso a zona restringida'));
             return Admin::staticAdminLogon($route);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             Logger::log($r->getMessage(), LOG_WARNING);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -181,7 +181,7 @@ 
      */
     protected function searchAction($route)
     {
-        Logger::log('Searching action to execute: ' . $route, LOG_INFO);
+        Logger::log('Searching action to execute: '.$route, LOG_INFO);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = (array_key_exists('path', $parts)) ? $parts['path'] : $route;
@@ -195,7 +195,7 @@ 
                 $class = RouterHelper::getClassToCall($action);
                 try {
                     $this->executeCachedRoute($route, $action, $class, $get);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw new \RuntimeException($e->getMessage(), 404, $e);
                 }
@@ -218,7 +218,7 @@ 
      */
     private function getExternalModules() {
         $externalModules = Config::getParam('modules.extend', '');
-        if(Config::getParam('psfs.auth', false)) {
+        if (Config::getParam('psfs.auth', false)) {
             $externalModules .= ',psfs/auth';
         }
         return $externalModules;
@@ -235,17 +235,17 @@ 
             $externalModules = explode(',', $externalModules);
             foreach ($externalModules as &$module) {
                 $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module);
-                $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src';
+                $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src';
                 if (file_exists($externalModulePath)) {
                     $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0);
                     if (!empty($externalModule)) {
                         foreach ($externalModule as $modulePath) {
                             $extModule = $modulePath->getBasename();
-                            $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php');
+                            $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php');
                             if (file_exists($moduleAutoloader)) {
                                 @include $moduleAutoloader;
                                 if ($hydrateRoute) {
-                                    $this->routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $this->routing);
+                                    $this->routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $this->routing);
                                 }
                             }
                         }
@@ -268,10 +268,10 @@ 
             $modules = $this->finder->directories()->in($modulesPath)->depth(0);
             foreach ($modules as $modulePath) {
                 $module = $modulePath->getBasename();
-                $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing);
+                $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing);
             }
         }
-        $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->domains, Cache::JSON, TRUE);
+        $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->domains, Cache::JSON, TRUE);
     }
 
     /**
@@ -286,7 +286,7 @@ 
             $home_params = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = RouterHelper::extractHttpRoute($pattern);
-                if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) {
+                if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) {
                     $home_params = $params;
                 }
             }
@@ -311,7 +311,7 @@ 
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->depth(1)->name("*.php");
         foreach ($files as $file) {
             $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname()));
-            $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace);
+            $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace);
         }
         $this->finder = new Finder();
 
@@ -381,7 +381,7 @@ 
             if (!$this->domains) {
                 $this->domains = [];
             }
-            $domain = "@" . $class->getConstant("DOMAIN") . "/";
+            $domain = "@".$class->getConstant("DOMAIN")."/";
             if (!array_key_exists($domain, $this->domains)) {
                 $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
             }
@@ -396,11 +396,11 @@ 
      */
     public function simpatize()
     {
-        $translationFileName = "translations" . DIRECTORY_SEPARATOR . "routes_translations.php";
-        $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName;
+        $translationFileName = "translations".DIRECTORY_SEPARATOR."routes_translations.php";
+        $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName;
         $this->generateSlugs($absoluteTranslationFileName);
         GeneratorHelper::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
 
         return $this;
     }
@@ -418,16 +418,16 @@ 
     public function getRoute($slug = '', $absolute = FALSE, $params = [])
     {
         if (strlen($slug) === 0) {
-            return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/';
+            return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/';
         }
         if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(_("No existe la ruta especificada"));
         }
-        $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
+        $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug];
         if (!empty($params)) foreach ($params as $key => $value) {
-            $url = str_replace("{" . $key . "}", $value, $url);
+            $url = str_replace("{".$key."}", $value, $url);
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
-            $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
+            $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url);
@@ -472,18 +472,18 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route, LOG_INFO);
+        Logger::log('Executing route '.$route, LOG_INFO);
         Security::getInstance()->setSessionKey("__CACHE__", $action);
         $cache = Cache::needCache();
         $execute = TRUE;
         if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) {
             list($path, $cacheDataName) = $this->cache->getRequestCacheHash();
-            $cachedData = $this->cache->readFromCache("json" . DIRECTORY_SEPARATOR . $path . $cacheDataName,
-                $cache, function () {
+            $cachedData = $this->cache->readFromCache("json".DIRECTORY_SEPARATOR.$path.$cacheDataName,
+                $cache, function() {
                 });
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache("json" . DIRECTORY_SEPARATOR . $path . $cacheDataName . ".headers",
-                    $cache, function () {
+                $headers = $this->cache->readFromCache("json".DIRECTORY_SEPARATOR.$path.$cacheDataName.".headers",
+                    $cache, function() {
                     }, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;