psfs / core

src/controller/GeneratorController.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function generateModule()
     {
-        Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri());
+        Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri());
         /* @var $form ConfigForm */
         $form = new ModuleForm();
         $form->build();
@@ -65,8 +65,8 @@ 
                 $this->gen->createStructureModule($module, false, $type, $apiClass);
                 Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente")));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch (Exception $e) {
-                Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (Exception $e) {
+                Logger::log($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage()));
             }
         }

src/controller/I18nController.php

Spacing +3 added lines, -3 removed lines

@@ -44,8 +44,8 @@ 
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();
 
-        $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-        $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+        $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+        $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
         //xgettext localizations
         $translations = array_merge($translations, I18nHelper::findTranslations(SOURCE_DIR, $locale));
@@ -53,7 +53,7 @@ 
         $translations = array_merge($translations, I18nHelper::findTranslations(CACHE_DIR, $locale));
 
         $translations[] = "msgfmt {$localePath}translations.po -o {$localePath}translations.mo";
-        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt ' . $localePath . 'translations.po -o ' . $localePath . 'translations.mo');
+        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo');
         return $this->render('translations.html.twig', array(
             'translations' => $translations,
         ));

src/services/MigrationService.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function getConnectionManager(string $module, string $path): array
     {
-        $modulePath = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $path . $module);
+        $modulePath = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $path.$module);
         $generatorConfig = $this->getConfigGenerator($modulePath);
 
         $manager = new MigrationManager();
@@ -115,7 +115,7 @@ 
         $migrationFileName = $manager->getMigrationFileName($timestamp);
         $migrationClassBody = $manager->getMigrationClassBody($migrationsUp, $migrationsDown, $timestamp);
 
-        $file = $generatorConfig->getSection('paths')['migrationDir'] . DIRECTORY_SEPARATOR . $migrationFileName;
+        $file = $generatorConfig->getSection('paths')['migrationDir'].DIRECTORY_SEPARATOR.$migrationFileName;
         file_put_contents($file, $migrationClassBody);
 
         Logger::log(sprintf('"%s" file successfully created.', $file));

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/Api.php

Spacing +14 added lines, -14 removed lines

@@ -54,7 +54,7 @@ 
     public function init()
     {
         parent::init();
-        Logger::log(static::class . ' init', LOG_DEBUG);
+        Logger::log(static::class.' init', LOG_DEBUG);
         $this->domain = $this->getDomain();
         $this->hydrateRequestData();
         $this->hydrateOrders();
@@ -63,7 +63,7 @@ 
         }
         $this->checkFieldType();
         $this->setLoaded(true);
-        Logger::log(static::class . ' loaded', LOG_DEBUG);
+        Logger::log(static::class.' loaded', LOG_DEBUG);
     }
 
     private function checkActions($method)
@@ -159,11 +159,11 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-            } else {
+            }else {
                 $message = t('No se ha podido guardar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            $message = t('Ha ocurrido un error intentando guardar el elemento: ') . '<br>' . $e->getMessage();
+        }catch (\Exception $e) {
+            $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
             $context = [];
             if (null !== $e->getPrevious()) {
                 $context[] = $e->getPrevious()->getMessage();
@@ -201,10 +201,10 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-                } else {
+                }else {
                     $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 $context = [];
                 if (null !== $e->getPrevious()) {
@@ -212,7 +212,7 @@ 
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
             }
-        } else {
+        }else {
             $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -246,7 +246,7 @@ 
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $context = [];
                 if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
@@ -278,7 +278,7 @@ 
             $this->saveBulk();
             $saved = true;
             $status = 200;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData());
             $message = t('Bulk insert rolled back');
         }
@@ -310,7 +310,7 @@ 
             if (null !== $this->list) {
                 if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
                     $return = $this->extractDataWithFormat();
-                } else {
+                }else {
                     $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false);
                 }
                 $total = 0;
@@ -323,8 +323,8 @@ 
                     $pages = 1;
                 }
             }
-        } 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);
@@ -342,7 +342,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
         }
 

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/OutputTrait.php

Spacing +15 added lines, -15 removed lines

@@ -125,7 +125,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;
@@ -139,11 +139,11 @@ 
     private function setReponseHeaders($contentType = 'text/html', array $cookies = array())
     {
         $powered = Config::getParam('poweredBy', 'PSFS');
-        header('X-Powered-By: ' . $powered);
+        header('X-Powered-By: '.$powered);
         ResponseHelper::setStatusHeader($this->getStatusCode());
         ResponseHelper::setAuthHeaders($this->isPublicZone());
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -161,16 +161,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 (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) {
                 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();
             }
@@ -180,7 +180,7 @@ 
             ob_end_clean();
             Logger::log('End output response');
             $this->closeRender();
-        } else {
+        }else {
             return $output;
         }
     }
@@ -193,11 +193,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;
     }
 
@@ -236,17 +236,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/base/types/traits/JsonTrait.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         }
 
         if (Config::getParam('angular.protection', false)) {
-            $data = ")]}',\n" . $data;
+            $data = ")]}',\n".$data;
         }
         $this->setStatus($statusCode);
         ResponseHelper::setDebugHeaders([]);