psfs / core

src/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
             $path = str_replace("\\", DIRECTORY_SEPARATOR, $class);
 
             // filepath
-            $abs_path = SOURCE_DIR . DIRECTORY_SEPARATOR . $path . ".php";
+            $abs_path = SOURCE_DIR.DIRECTORY_SEPARATOR.$path.".php";
 
             // require the file
             if (file_exists($abs_path)) {

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

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     public function getServer($key, $default = null)
     {
         $value = null;
-        if(array_key_exists($key, $this->server)) {
+        if (array_key_exists($key, $this->server)) {
             $value = $this->server[$key];
         }
         return $value ?: $default;
@@ -60,7 +60,7 @@ 
      */
     public function getProtocol()
     {
-        if(Config::getParam('force.https', false)) {
+        if (Config::getParam('force.https', false)) {
             return 'https://';
         }
         return ($this->getServer('HTTPS') || $this->getServer('https')) ? 'https://' : 'http://';

src/services/AdminServices.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
     {
         $platform = trim(Config::getInstance()->get('platform.name', 'PSFS'));
         header('HTTP/1.1 401 Unauthorized');
-        header('WWW-Authenticate: Basic Realm="' . $platform . '"');
+        header('WWW-Authenticate: Basic Realm="'.$platform.'"');
         echo t('Zona restringida');
         exit();
     }
@@ -76,7 +76,7 @@ 
                             $admin['class'] = 'primary';
                             break;
                     }
-                } else {
+                }else {
                     $admin['class'] = 'primary';
                 }
             }

src/services/GeneratorService.php

Spacing +27 added lines, -27 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function createStructureModule($module, $force = false, $type = "", $apiClass = "")
     {
-        $modPath = CORE_DIR . DIRECTORY_SEPARATOR;
+        $modPath = CORE_DIR.DIRECTORY_SEPARATOR;
         $module = ucfirst($module);
         $this->createModulePath($module, $modPath);
         $this->createModulePathTree($module, $modPath);
@@ -59,7 +59,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->genereateAutoloaderTemplate($module, $modulePath, $force);
@@ -87,28 +87,28 @@ 
             "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)) {
+        if (!file_exists($filename)) {
             $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
                 "module" => $module,
                 "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
@@ -127,8 +127,8 @@ 
      */
     private function createModuleModels($module, $path)
     {
-        $modulePath = $path . $module;
-        $modulePath = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $modulePath);
+        $modulePath = $path.$module;
+        $modulePath = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $modulePath);
 
         $configGenerator = $this->getConfigGenerator($modulePath);
 
@@ -138,8 +138,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");
     }
 
@@ -154,8 +154,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);
@@ -173,7 +173,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);
     }
 
@@ -194,7 +194,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);
     }
 
@@ -212,7 +212,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);
     }
 
@@ -230,7 +230,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);
     }
 
@@ -260,7 +260,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);
     }
 
     /**
@@ -285,7 +285,7 @@ 
             "package" => $package,
         ));
 
-        return $this->writeTemplateToFile($controller, $modPath . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+        return $this->writeTemplateToFile($controller, $modPath.DIRECTORY_SEPARATOR."{$api}.php", $force);
     }
 
     /**
@@ -302,15 +302,15 @@ 
         $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)
                 ) {
                     $filename = str_replace(".php", "", $file);
                     $this->log->addLog("Generamos Api BASES para {$filename}");
-                    if($this->checkIfIsModel($module, $filename, $package)) {
+                    if ($this->checkIfIsModel($module, $filename, $package)) {
                         $this->createApiBaseFile($module, $apiPath, $filename, $apiClass, $package);
                         $this->createApi($module, $apiPath, $force, $filename, $package);
                     }
@@ -333,7 +333,7 @@ 
             $parts[] = $package;
         }
         $parts[] = $filename;
-        $namespace = '\\' . implode('\\', $parts);
+        $namespace = '\\'.implode('\\', $parts);
         $reflectorClass = new \ReflectionClass($namespace);
         $isModel = $reflectorClass->isInstantiable();
         return $isModel;

src/tests/services/GeneratorServiceTest.php

Spacing +48 added lines, -48 removed lines

@@ -18,53 +18,53 @@ 
     const MODULE_NAME = 'CLIENT';
 
     public static $filesToCheckWithoutSchema = [
-        DIRECTORY_SEPARATOR . 'phpunit.xml.dist',
-        DIRECTORY_SEPARATOR . 'autoload.php',
-        DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . self::MODULE_NAME . 'Test.php',
-        DIRECTORY_SEPARATOR . 'Templates' . DIRECTORY_SEPARATOR . 'index.html.twig',
-        DIRECTORY_SEPARATOR . 'Services' . DIRECTORY_SEPARATOR . self::MODULE_NAME . 'Service.php',
-        DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . self::MODULE_NAME . 'Controller.php',
-        DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . self::MODULE_NAME . 'BaseController.php',
-        DIRECTORY_SEPARATOR . 'Public' . DIRECTORY_SEPARATOR . 'js' . DIRECTORY_SEPARATOR . 'app.js',
-        DIRECTORY_SEPARATOR . 'Public' . DIRECTORY_SEPARATOR . 'css' . DIRECTORY_SEPARATOR . 'styles.css',
-        DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'schema.xml',
-        DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'propel.php',
-        DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'loadDatabase.php',
-        DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'config.php',
-        DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql' . DIRECTORY_SEPARATOR . 'CLIENT.sql',
-        DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql' . DIRECTORY_SEPARATOR . 'sqldb.map',
+        DIRECTORY_SEPARATOR.'phpunit.xml.dist',
+        DIRECTORY_SEPARATOR.'autoload.php',
+        DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.self::MODULE_NAME.'Test.php',
+        DIRECTORY_SEPARATOR.'Templates'.DIRECTORY_SEPARATOR.'index.html.twig',
+        DIRECTORY_SEPARATOR.'Services'.DIRECTORY_SEPARATOR.self::MODULE_NAME.'Service.php',
+        DIRECTORY_SEPARATOR.'Controller'.DIRECTORY_SEPARATOR.self::MODULE_NAME.'Controller.php',
+        DIRECTORY_SEPARATOR.'Controller'.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR.self::MODULE_NAME.'BaseController.php',
+        DIRECTORY_SEPARATOR.'Public'.DIRECTORY_SEPARATOR.'js'.DIRECTORY_SEPARATOR.'app.js',
+        DIRECTORY_SEPARATOR.'Public'.DIRECTORY_SEPARATOR.'css'.DIRECTORY_SEPARATOR.'styles.css',
+        DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'schema.xml',
+        DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'propel.php',
+        DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'loadDatabase.php',
+        DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'config.php',
+        DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql'.DIRECTORY_SEPARATOR.'CLIENT.sql',
+        DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql'.DIRECTORY_SEPARATOR.'sqldb.map',
     ];
 
     public static $filesToCheckWithSchema = [
         // Simple model creation
-        DIRECTORY_SEPARATOR . 'Api' . DIRECTORY_SEPARATOR . 'Solo.php',
-        DIRECTORY_SEPARATOR . 'Api' . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . 'SoloBaseApi.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Solo.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'SoloQuery.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'Solo.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'SoloQuery.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Map' . DIRECTORY_SEPARATOR . 'SoloTableMap.php',
+        DIRECTORY_SEPARATOR.'Api'.DIRECTORY_SEPARATOR.'Solo.php',
+        DIRECTORY_SEPARATOR.'Api'.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR.'SoloBaseApi.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Solo.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'SoloQuery.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Base'.DIRECTORY_SEPARATOR.'Solo.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Base'.DIRECTORY_SEPARATOR.'SoloQuery.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Map'.DIRECTORY_SEPARATOR.'SoloTableMap.php',
         // Package model creation and I18n
-        DIRECTORY_SEPARATOR . 'Api' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Test.php',
-        DIRECTORY_SEPARATOR . 'Api' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . 'TestBaseApi.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Test.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'TestQuery.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'TestI18n.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'TestI18nQuery.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'Test.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'TestQuery.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'TestI18n.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'TestI18nQuery.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Map' . DIRECTORY_SEPARATOR . 'TestTableMap.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Map' . DIRECTORY_SEPARATOR . 'TestI18nTableMap.php',
+        DIRECTORY_SEPARATOR.'Api'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'Test.php',
+        DIRECTORY_SEPARATOR.'Api'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR.'TestBaseApi.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'Test.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'TestQuery.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'TestI18n.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'TestI18nQuery.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'Base'.DIRECTORY_SEPARATOR.'Test.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'Base'.DIRECTORY_SEPARATOR.'TestQuery.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'Base'.DIRECTORY_SEPARATOR.'TestI18n.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'Base'.DIRECTORY_SEPARATOR.'TestI18nQuery.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'Map'.DIRECTORY_SEPARATOR.'TestTableMap.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Test'.DIRECTORY_SEPARATOR.'Map'.DIRECTORY_SEPARATOR.'TestI18nTableMap.php',
         // Package related model
-        DIRECTORY_SEPARATOR . 'Api' . DIRECTORY_SEPARATOR . 'Related' . DIRECTORY_SEPARATOR . 'Related.php',
-        DIRECTORY_SEPARATOR . 'Api' . DIRECTORY_SEPARATOR . 'Related' . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . 'RelatedBaseApi.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Related' . DIRECTORY_SEPARATOR . 'Related.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Related' . DIRECTORY_SEPARATOR . 'RelatedQuery.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Related' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'Related.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Related' . DIRECTORY_SEPARATOR . 'Base' . DIRECTORY_SEPARATOR . 'RelatedQuery.php',
-        DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR . 'Related' . DIRECTORY_SEPARATOR . 'Map' . DIRECTORY_SEPARATOR . 'RelatedTableMap.php',
+        DIRECTORY_SEPARATOR.'Api'.DIRECTORY_SEPARATOR.'Related'.DIRECTORY_SEPARATOR.'Related.php',
+        DIRECTORY_SEPARATOR.'Api'.DIRECTORY_SEPARATOR.'Related'.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR.'RelatedBaseApi.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Related'.DIRECTORY_SEPARATOR.'Related.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Related'.DIRECTORY_SEPARATOR.'RelatedQuery.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Related'.DIRECTORY_SEPARATOR.'Base'.DIRECTORY_SEPARATOR.'Related.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Related'.DIRECTORY_SEPARATOR.'Base'.DIRECTORY_SEPARATOR.'RelatedQuery.php',
+        DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR.'Related'.DIRECTORY_SEPARATOR.'Map'.DIRECTORY_SEPARATOR.'RelatedTableMap.php',
     ];
 
     /**
@@ -87,30 +87,30 @@ 
     {
         $generatorService = Service::getInstance();
         $this->assertInstanceOf(Service::class, $generatorService, 'Error getting GeneratorService instance');
-        $modulePath = CORE_DIR . DIRECTORY_SEPARATOR . self::MODULE_NAME;
+        $modulePath = CORE_DIR.DIRECTORY_SEPARATOR.self::MODULE_NAME;
 
         $this->createNewModule($generatorService);
 
         GeneratorHelper::copyr(
-            dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'examples' . DIRECTORY_SEPARATOR . 'generator' . DIRECTORY_SEPARATOR . 'Config',
-            $modulePath . DIRECTORY_SEPARATOR . 'Config'
+            dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'examples'.DIRECTORY_SEPARATOR.'generator'.DIRECTORY_SEPARATOR.'Config',
+            $modulePath.DIRECTORY_SEPARATOR.'Config'
         );
-        require_once $modulePath . DIRECTORY_SEPARATOR . 'autoload.php';
+        require_once $modulePath.DIRECTORY_SEPARATOR.'autoload.php';
         $generatorService->createStructureModule(self::MODULE_NAME, false);
         $this->checkBasicStructure();
 
         foreach (self::$filesToCheckWithSchema as $fileName) {
-            $this->assertFileExists($modulePath . $fileName, $fileName . ' do not exists after generate module with schema');
+            $this->assertFileExists($modulePath.$fileName, $fileName.' do not exists after generate module with schema');
         }
         return $modulePath;
     }
 
     private function checkBasicStructure()
     {
-        $modulePath = CORE_DIR . DIRECTORY_SEPARATOR . self::MODULE_NAME;
+        $modulePath = CORE_DIR.DIRECTORY_SEPARATOR.self::MODULE_NAME;
         $this->assertDirectoryExists($modulePath, 'Directory not created');
         foreach (self::$filesToCheckWithoutSchema as $fileName) {
-            $this->assertFileExists($modulePath . $fileName, $fileName . ' do not exists after generate module from scratch');
+            $this->assertFileExists($modulePath.$fileName, $fileName.' do not exists after generate module from scratch');
         }
     }
 }

src/tests/services/DocumentorServiceTest.php

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
  * Class DocumentorServiceTest
  * @package PSFS\tests\services
  */
-class DocumentorServiceTest extends GeneratorServiceTest{
+class DocumentorServiceTest extends GeneratorServiceTest {
 
     public static $namespaces = [
         '\CLIENT\Api\Test\Test',
@@ -23,10 +23,10 @@ 
      */
     public function prepareDocumentRoot()
     {
-        if(file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json')) {
-            unlink(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json');
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json')) {
+            unlink(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json');
         }
-        $this->assertFileDoesNotExist(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', 'Previous generated domains json, please delete it before testing');
+        $this->assertFileDoesNotExist(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', 'Previous generated domains json, please delete it before testing');
         GeneratorHelper::deleteDir(CACHE_DIR);
         $this->assertDirectoryDoesNotExist(CACHE_DIR, 'Cache folder already exists with data');
         GeneratorHelper::createRoot(WEB_DIR, null, true);
@@ -52,7 +52,7 @@ 
         $documentorService = Service::getInstance();
         $module = $documentorService->getModules(self::MODULE_NAME);
         $doc = $documentorService->extractApiEndpoints($module);
-        foreach($doc as $namespace => $endpoints) {
+        foreach ($doc as $namespace => $endpoints) {
             $this->assertContains($namespace, self::$namespaces, 'Namespace not included in the test');
             $this->assertCount(7, $endpoints, 'Different number of endpoints');
         }

src/tests/PSFSTest.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $this->assertTrue($router instanceof Router);
 
         // Check if route file exists
-        $this->assertFileExists(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json");
+        $this->assertFileExists(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json");
 
         // CHecks if we have admin routes as minimal routes
         $adminRoutes = AdminHelper::getAdminRoutes($router->getRoutes());

src/tests/base/LoggerTest.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             Logger::log('Test debug logs', LOG_DEBUG, [], true);
             // Other logs
             Logger::log('Test other logs', LOG_CRON, [], true);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->assertFalse(true, $e->getMessage());
         } finally {
             $this->assertTrue(true, 'Finished Logger test function');

src/tests/base/CacheTest.php

Spacing +20 added lines, -20 removed lines

@@ -46,28 +46,28 @@ 
         $hash = sha1(microtime());
 
         // TXT cache test
-        $cache->storeData('tests' . DIRECTORY_SEPARATOR . $hash, json_encode($data));
-        $this->assertFileExists(CACHE_DIR . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . $hash, 'Cache not stored!!');
+        $cache->storeData('tests'.DIRECTORY_SEPARATOR.$hash, json_encode($data));
+        $this->assertFileExists(CACHE_DIR.DIRECTORY_SEPARATOR.'tests'.DIRECTORY_SEPARATOR.$hash, 'Cache not stored!!');
 
         // Gather cache data from file without transformation
-        $cachedData = $cache->readFromCache('tests' . DIRECTORY_SEPARATOR . $hash, 300, function () {
+        $cachedData = $cache->readFromCache('tests'.DIRECTORY_SEPARATOR.$hash, 300, function() {
         });
         $this->assertEquals($cachedData, json_encode($data), 'Different data cached!');
 
         // Gather cache data from file with JSON transformation
-        $cache->storeData('tests' . DIRECTORY_SEPARATOR . $hash, $data, Cache::JSONGZ);
-        $cachedData = $cache->readFromCache('tests' . DIRECTORY_SEPARATOR . $hash, 300, function () {
+        $cache->storeData('tests'.DIRECTORY_SEPARATOR.$hash, $data, Cache::JSONGZ);
+        $cachedData = $cache->readFromCache('tests'.DIRECTORY_SEPARATOR.$hash, 300, function() {
         }, Cache::JSONGZ);
         $this->assertEquals($cachedData, $data, 'Error when try to gather cache with JSON transform');
 
         // Gather cache data from expired file
         sleep(2);
-        $cachedData = $cache->readFromCache('tests' . DIRECTORY_SEPARATOR . $hash, 1, function () use ($data) {
+        $cachedData = $cache->readFromCache('tests'.DIRECTORY_SEPARATOR.$hash, 1, function() use ($data) {
             return $data;
         }, Cache::JSONGZ);
         $this->assertEquals($cachedData, $data, 'Error when try to gather cache with JSON transform');
 
-        FileHelper::deleteDir(CACHE_DIR . DIRECTORY_SEPARATOR . 'test');
+        FileHelper::deleteDir(CACHE_DIR.DIRECTORY_SEPARATOR.'test');
     }
 
     private function prepareTestVariables(): array
@@ -78,9 +78,9 @@ 
             'cache' => 600,
             'params' => [],
             'http' => 'GET',
-            'slug' => 'test-' . $hash,
+            'slug' => 'test-'.$hash,
             'class' => 'Test',
-            'method' => 'test' . ucfirst($hash),
+            'method' => 'test'.ucfirst($hash),
             'module' => 'TEST',
         ]);
 
@@ -108,14 +108,14 @@ 
 
         // Flushing cache
         Cache::getInstance()->flushCache();
-        $this->assertDirectoryDoesNotExist(CACHE_DIR . DIRECTORY_SEPARATOR . $path, 'Cache directory not deleted properly');
+        $this->assertDirectoryDoesNotExist(CACHE_DIR.DIRECTORY_SEPARATOR.$path, 'Cache directory not deleted properly');
 
         $config['cache.data.enable'] = $cache_data_config;
         Config::save($config, []);
 
         // Cleaning test data
-        FileHelper::deleteDir(CACHE_DIR . DIRECTORY_SEPARATOR . 'tests');
-        $this->assertDirectoryDoesNotExist(CACHE_DIR . DIRECTORY_SEPARATOR . 'tests', 'Test data directory not cleaned properly');
+        FileHelper::deleteDir(CACHE_DIR.DIRECTORY_SEPARATOR.'tests');
+        $this->assertDirectoryDoesNotExist(CACHE_DIR.DIRECTORY_SEPARATOR.'tests', 'Test data directory not cleaned properly');
 
     }
 
@@ -127,14 +127,14 @@ 
     public function testPrivileges()
     {
         list($path, $hash) = $this->prepareTestVariables();
-        GeneratorHelper::createDir(dirname(CACHE_DIR . DIRECTORY_SEPARATOR . $path));
-        GeneratorHelper::createDir(CACHE_DIR . DIRECTORY_SEPARATOR . $path);
+        GeneratorHelper::createDir(dirname(CACHE_DIR.DIRECTORY_SEPARATOR.$path));
+        GeneratorHelper::createDir(CACHE_DIR.DIRECTORY_SEPARATOR.$path);
         $cache = $this->getInstance();
-        chmod(realpath(CACHE_DIR . DIRECTORY_SEPARATOR . $path), 0600);
-        $cache->storeData($path . $hash, json_encode(''));
-        chmod(realpath(CACHE_DIR . DIRECTORY_SEPARATOR . $path), 0777);
-        FileHelper::deleteDir(CACHE_DIR . DIRECTORY_SEPARATOR . $path);
-        chmod(realpath(CACHE_DIR . DIRECTORY_SEPARATOR . 'TEST'), 0777);
-        FileHelper::deleteDir(CACHE_DIR . DIRECTORY_SEPARATOR . 'TEST');
+        chmod(realpath(CACHE_DIR.DIRECTORY_SEPARATOR.$path), 0600);
+        $cache->storeData($path.$hash, json_encode(''));
+        chmod(realpath(CACHE_DIR.DIRECTORY_SEPARATOR.$path), 0777);
+        FileHelper::deleteDir(CACHE_DIR.DIRECTORY_SEPARATOR.$path);
+        chmod(realpath(CACHE_DIR.DIRECTORY_SEPARATOR.'TEST'), 0777);
+        FileHelper::deleteDir(CACHE_DIR.DIRECTORY_SEPARATOR.'TEST');
     }
 }
\ No newline at end of file