psfs / core

src/services/GeneratorService.php

Spacing +26 added lines, -26 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function createStructureModule(string $module, bool $force = false, string $type = "", string $apiClass = "", bool $skipMigration = false): void
     {
-        $modPath = CORE_DIR . DIRECTORY_SEPARATOR;
+        $modPath = CORE_DIR.DIRECTORY_SEPARATOR;
         $module = ucfirst($module);
         $this->createModulePath($module, $modPath);
         $this->createModulePathTree($module, $modPath);
@@ -73,7 +73,7 @@ 
      */
     private function createModuleBaseFiles($module, $modPath, $force = false, $controllerType = '')
     {
-        $modulePath = $modPath . $module;
+        $modulePath = $modPath.$module;
         $this->generateControllerTemplate($module, $modulePath, $force, $controllerType);
         $this->generateServiceTemplate($module, $modulePath, $force);
         $this->generateSchemaTemplate($module, $modulePath, $force);
@@ -94,7 +94,7 @@ 
         $this->genereateAutoloaderTemplate($module, $modulePath, $force);
         $this->generatePropertiesTemplate($module, $modulePath, $force);
         $this->generateConfigTemplate($modulePath, $force);
-        $this->createModuleModels($module, CORE_DIR . DIRECTORY_SEPARATOR);
+        $this->createModuleModels($module, CORE_DIR.DIRECTORY_SEPARATOR);
     }
 
     /**
@@ -114,26 +114,26 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
             "class" => $class,
-            "controllerType" => $class . "Base",
+            "controllerType" => $class."Base",
             "is_base" => false
         ));
-        $controller = $this->writeTemplateToFile($controllerBody, $modPath . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
+        $controller = $this->writeTemplateToFile($controllerBody, $modPath.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."{$class}Controller.php", $force);
 
         $controllerBody = $this->tpl->dump("generator/controller.template.twig", array(
             "module" => $module,
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
-            "class" => $class . "Base",
+            "class" => $class."Base",
             "service" => $class,
             "controllerType" => $controllerType,
             "is_base" => true,
             "domain" => $class,
         ));
-        $controllerBase = $this->writeTemplateToFile($controllerBody, $modPath . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $modPath.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
 
-        $filename = $modPath . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php";
+        $filename = $modPath.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php";
         $test = true;
         if (!file_exists($filename)) {
             $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
@@ -154,7 +154,7 @@ 
      */
     private function createModuleModels($module, $path)
     {
-        $modulePath = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $path . $module);
+        $modulePath = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $path.$module);
         $configGenerator = $this->getConfigGenerator($modulePath);
 
         $this->buildModels($configGenerator);
@@ -163,8 +163,8 @@ 
         $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array(
             "module" => $module,
         ));
-        $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $modulePath . DIRECTORY_SEPARATOR . "Config" .
-            DIRECTORY_SEPARATOR . "config.php", true);
+        $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$modulePath.DIRECTORY_SEPARATOR."Config".
+            DIRECTORY_SEPARATOR."config.php", true);
         Logger::log("Generado config genérico para propel");
     }
 
@@ -199,7 +199,7 @@ 
 
         if ($totalNbTables) {
             Logger::log(sprintf('%d tables found in all databases.', $totalNbTables));
-        } else {
+        }else {
             Logger::log('No table found in all databases');
         }
 
@@ -256,8 +256,8 @@ 
     private function generateBaseApiTemplate($module, $modPath, $force = false, $apiClass = "")
     {
         $created = true;
-        $modelPath = $modPath . $module . DIRECTORY_SEPARATOR . 'Models';
-        $apiPath = $modPath . $module . DIRECTORY_SEPARATOR . 'Api';
+        $modelPath = $modPath.$module.DIRECTORY_SEPARATOR.'Models';
+        $apiPath = $modPath.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             $this->generateApiFiles($module, $force, $apiClass, $dir, $apiPath);
@@ -275,7 +275,7 @@ 
         //Generamos el fichero de configuración
         Logger::log("Generamos fichero vacío de configuración");
         return $this->writeTemplateToFile("<?php\n\t",
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
             $force);
     }
 
@@ -296,7 +296,7 @@ 
             "db" => $this->config->get("db_name"),
         ));
         return $this->writeTemplateToFile($schema,
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
             $force);
     }
 
@@ -314,7 +314,7 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
         ));
         return $this->writeTemplateToFile($buildProperties,
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.php",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.php",
             $force);
     }
 
@@ -332,7 +332,7 @@ 
             "module" => $module,
         ));
         return $this->writeTemplateToFile($index,
-            $modPath . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
+            $modPath.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
             $force);
     }
 
@@ -362,7 +362,7 @@ 
         ));
 
         return $this->writeTemplateToFile($controller,
-            $modPath . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            $modPath.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
     }
 
     /**
@@ -387,7 +387,7 @@ 
             "package" => $package,
         ));
 
-        return $this->writeTemplateToFile($controller, $modPath . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+        return $this->writeTemplateToFile($controller, $modPath.DIRECTORY_SEPARATOR."{$api}.php", $force);
     }
 
     /**
@@ -404,9 +404,9 @@ 
         $base = $dir->path;
         while ($file = $dir->read()) {
             if (!in_array(strtolower($file), ['.', '..', 'base', 'map'])) {
-                if (is_dir($base . DIRECTORY_SEPARATOR . $file)) {
-                    $this->generateApiFiles($module, $force, $apiClass, dir($base . DIRECTORY_SEPARATOR . $file), $apiPath . DIRECTORY_SEPARATOR . $file, $file);
-                } else if (!preg_match('/Query\.php$/i', $file)
+                if (is_dir($base.DIRECTORY_SEPARATOR.$file)) {
+                    $this->generateApiFiles($module, $force, $apiClass, dir($base.DIRECTORY_SEPARATOR.$file), $apiPath.DIRECTORY_SEPARATOR.$file, $file);
+                }else if (!preg_match('/Query\.php$/i', $file)
                     && !preg_match('/I18n\.php$/i', $file)
                     && preg_match('/\.php$/i', $file)
                 ) {
@@ -435,7 +435,7 @@ 
             $parts[] = $package;
         }
         $parts[] = $filename;
-        $namespace = '\\' . implode('\\', $parts);
+        $namespace = '\\'.implode('\\', $parts);
         $reflectorClass = new \ReflectionClass($namespace);
         $isModel = $reflectorClass->isInstantiable();
         return $isModel;

src/base/types/Controller.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
             $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);
     }
 
     /**
@@ -73,7 +73,7 @@ 
     {
         $vars['__menu__'] = $this->getMenu();
         $domain = $domain ?: $this->getDomain();
-        return $this->tpl->dump($domain . $template, $vars);
+        return $this->tpl->dump($domain.$template, $vars);
     }
 
     /**

src/base/types/traits/CurlTrait.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
     {
         $this->params = [];
         $this->headers = [];
-        Logger::log('Context service for ' . static::class . ' cleared!');
+        Logger::log('Context service for '.static::class.' cleared!');
         $this->closeConnection();
     }
 

src/base/types/traits/Router/ModulesTrait.php

Spacing +8 added lines, -8 removed lines

@@ -58,11 +58,11 @@ 
         if ($files->hasResults()) {
             foreach ($files->getIterator() as $file) {
                 if ($namespace !== Router::PSFS_BASE_NAMESPACE && method_exists($file, 'getRelativePathname')) {
-                    $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
-                } else {
+                    $filename = '\\'.str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
+                }else {
                     $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->initializeFinder();
@@ -115,7 +115,7 @@ 
             if (!is_array($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);
             }
@@ -142,11 +142,11 @@ 
     private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath, &$routing = [])
     {
         $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_once $moduleAutoloader;
             if ($hydrateRoute) {
-                $routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $routing);
+                $routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $routing);
             }
         }
     }
@@ -162,7 +162,7 @@ 
         $modulesToIgnore = explode(',', Config::getParam('hide.modules', ''));
         try {
             $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 ($externalModule->hasResults()) {
@@ -173,7 +173,7 @@ 
                     }
                 }
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
         }
     }

src/base/types/traits/Form/FormDataTrait.php

Spacing +5 added lines, -5 removed lines

@@ -30,8 +30,8 @@ 
     public function add($name, array $value = [])
     {
         $this->fields[$name] = $value;
-        $this->fields[$name]['name'] = $this->getName() . '[' . $name . ']';
-        $this->fields[$name]['id'] = $this->getName() . '_' . $name;
+        $this->fields[$name]['name'] = $this->getName().'['.$name.']';
+        $this->fields[$name]['id'] = $this->getName().'_'.$name;
         $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name;
         $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true;
         return $this;
@@ -70,7 +70,7 @@ 
         $data = array();
         if (count($this->fields) > 0) {
             foreach ($this->fields as $key => $field) {
-                if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) {
+                if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) {
                     $data[$key] = array_key_exists('value', $field) ? $field['value'] : null;
                 }
             }
@@ -117,10 +117,10 @@ 
         if (array_key_exists($key, $data[$formName])) {
             if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) {
                 $field['value'] = null;
-            } else {
+            }else {
                 $field['value'] = $data[$formName][$key];
             }
-        } else {
+        }else {
             unset($field['value']);
         }
         return array($data, $field);

src/base/types/traits/Helper/FieldHelperTrait.php

Spacing +3 added lines, -3 removed lines

@@ -130,7 +130,7 @@ 
         }
 
         if (array_key_exists('i18n', $behaviors)) {
-            $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
+            $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
             if (null !== $relateI18n) {
                 $i18NTableMap = $relateI18n->getLocalTable();
                 foreach ($i18NTableMap->getColumns() as $columnMap) {
@@ -173,12 +173,12 @@ 
         try {
             foreach ($tableMap->getColumns() as $tableMapColumn) {
                 $columnName = $tableMapColumn->getPhpName();
-                if (preg_match('/^' . $field . '$/i', $columnName)) {
+                if (preg_match('/^'.$field.'$/i', $columnName)) {
                     $column = $tableMapColumn;
                     break;
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
         return $column;

src/base/types/traits/Helper/FieldModelHelperTrait.php

Spacing +11 added lines, -11 removed lines

@@ -33,7 +33,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;
     }
 
@@ -42,7 +42,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 (is_array($value)) {
@@ -52,8 +52,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 {
             if (null !== $column->getValueSet()) {
                 $valueSet = $column->getValueSet();
                 if (in_array($value, $valueSet)) {
@@ -71,7 +71,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);
@@ -86,7 +86,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);
 
@@ -99,13 +99,13 @@ 
      * @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 = ', " ", ';
             }
         }
@@ -114,7 +114,7 @@ 
                 $localeTableMap = $relation->getLocalTable();
                 foreach ($localeTableMap->getColumns() as $column) {
                     if ($column->isText()) {
-                        $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                        $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                         $sep = ', " ", ';
                     }
                 }
@@ -122,14 +122,14 @@ 
         }
         foreach (array_keys($extraColumns) as $extra) {
             if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
-                $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.'%"');
     }
 
     /**

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

Spacing +9 added lines, -9 removed lines

@@ -103,8 +103,8 @@ 
                     $model = $class->newInstance();
                     $this->hydrateModelFromRequest($model, $item);
                     $this->list[] = $model;
-                } else {
-                    Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . t('items'));
+                }else {
+                    Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data).t('items'));
                 }
             }
         }
@@ -121,7 +121,7 @@ 
             try {
                 $model->save($con);
                 $con->commit();
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, $model->toArray());
                 $con->rollBack();
             }
@@ -146,7 +146,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function joinTables(ModelCriteria &$query)
+    protected function joinTables(ModelCriteria & $query)
     {
         //TODO for specific implementations
     }
@@ -162,7 +162,7 @@ 
         $pks = explode(Api::API_PK_SEPARATOR, urldecode($primaryKey));
         if (count($pks) === 1 && !empty($pks[0])) {
             $query->filterByPrimaryKey($pks[0]);
-        } else {
+        }else {
             $item = 0;
             foreach ($this->getPkDbName() as $phpName) {
                 try {
@@ -171,7 +171,7 @@ 
                     if ($item >= count($pks)) {
                         break;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_DEBUG);
                 }
             }
@@ -202,8 +202,8 @@ 
         try {
             $query = $this->prepareQuery();
             $this->model = $this->findPk($query, $primaryKey);
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
     }
 
@@ -224,7 +224,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/types/traits/Api/ConnectionTrait.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
             if (null !== $this->con && $this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }