psfs / core

src/controller/RouteController.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
             $router->simpatize();
             Security::getInstance()->setFlash("callback_message", t("Rutas generadas correctamente"));
             Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true));
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             Security::getInstance()->setFlash("callback_message", t("Algo no ha salido bien, revisa los logs"));
             Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true));

src/controller/UserController.php

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
                 Logger::log('Configuration saved successful');
                 Security::getInstance()->setFlash("callback_message", t("Usuario agregado correctamente"));
                 Security::getInstance()->setFlash("callback_route", Router::getInstance()->getRoute("admin", true));
-            } else {
+            }else {
                 throw new ConfigException(t('Error al guardar los administradores, prueba a cambiar los permisos'));
             }
         }
@@ -99,7 +99,7 @@ 
     {
         if ($this->isAdmin()) {
             return $this->redirect('admin');
-        } else {
+        }else {
             return Admin::staticAdminLogon($route);
         }
     }
@@ -131,7 +131,7 @@ 
                 $cookies = array(
                     array(
                         "name" => Security::getInstance()->getHash(),
-                        "value" => base64_encode($form->getFieldValue("user") . ":" . $form->getFieldValue("pass")),
+                        "value" => base64_encode($form->getFieldValue("user").":".$form->getFieldValue("pass")),
                         "expire" => time() + 3600,
                         "http" => true,
                     )
@@ -142,7 +142,7 @@ 
                     'status_message' => t("Acceso permitido... redirigiendo!!"),
                     'delay' => 1,
                 );
-            } else {
+            }else {
                 $form->setError("user", t("El usuario no tiene acceso a la web"));
             }
         }

src/services/GeneratorService.php

Spacing +60 added lines, -60 removed lines

@@ -39,24 +39,24 @@ 
      */
     public static function findTranslations($path, $locale)
     {
-        $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;
 
         $translations = array();
         if (file_exists($path)) {
             $d = dir($path);
             while (false !== ($dir = $d->read())) {
                 GeneratorHelper::createDir($localePath);
-                if (!file_exists($localePath . 'translations.po')) {
-                    file_put_contents($localePath . 'translations.po', '');
+                if (!file_exists($localePath.'translations.po')) {
+                    file_put_contents($localePath.'translations.po', '');
                 }
-                $inspect_path = realpath($path . DIRECTORY_SEPARATOR . $dir);
-                $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext " .
-                    $inspect_path . DIRECTORY_SEPARATOR .
+                $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir);
+                $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ".
+                    $inspect_path.DIRECTORY_SEPARATOR.
                     "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$localePath}translations.po";
-                if (is_dir($path . DIRECTORY_SEPARATOR . $dir) && preg_match('/^\./', $dir) == 0) {
-                    $res = t('Revisando directorio: ') . $inspect_path;
-                    $res .= t('Comando ejecutado: ') . $cmd_php;
+                if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) {
+                    $res = t('Revisando directorio: ').$inspect_path;
+                    $res .= t('Comando ejecutado: ').$cmd_php;
                     $res .= shell_exec($cmd_php);
                     usleep(10);
                     $translations[] = $res;
@@ -77,7 +77,7 @@ 
      */
     public function createStructureModule($module, $force = false, $type = "", $apiClass = "")
     {
-        $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
+        $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
         $module = ucfirst($module);
         $this->createModulePath($module, $mod_path);
         $this->createModulePathTree($module, $mod_path);
@@ -98,7 +98,7 @@ 
         // Creates the src folder
         GeneratorHelper::createDir($mod_path);
         // Create module path
-        GeneratorHelper::createDir($mod_path . $module);
+        GeneratorHelper::createDir($mod_path.$module);
     }
 
     /**
@@ -113,16 +113,16 @@ 
         $this->log->addLog("Generamos la estructura");
         $paths = [
             "Api", "Api/base", "Config", "Controller", "Models", "Public", "Templates", "Services", "Test", "Doc",
-            "Locale", "Locale/" . Config::getParam('default.locale', 'es_ES'), "Locale/" . Config::getParam('default.locale', 'es_ES') . "/LC_MESSAGES"
+            "Locale", "Locale/".Config::getParam('default.locale', 'es_ES'), "Locale/".Config::getParam('default.locale', 'es_ES')."/LC_MESSAGES"
         ];
-        $module_path = $mod_path . $module;
+        $module_path = $mod_path.$module;
         foreach ($paths as $path) {
-            GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR.$path);
         }
         //Creamos las carpetas de los assets
         $htmlPaths = array("css", "js", "img", "media", "font");
         foreach ($htmlPaths as $path) {
-            GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
         }
     }
 
@@ -135,7 +135,7 @@ 
      */
     private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '')
     {
-        $module_path = $mod_path . $module;
+        $module_path = $mod_path.$module;
         $this->generateControllerTemplate($module, $module_path, $force, $controllerType);
         $this->generateServiceTemplate($module, $module_path, $force);
         $this->genereateAutoloaderTemplate($module, $module_path, $force);
@@ -153,8 +153,8 @@ 
      */
     private function createModuleModels($module, $path)
     {
-        $module_path = $path . $module;
-        $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
+        $module_path = $path.$module;
+        $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path);
 
         $configGenerator = $this->getConfigGenerator($module_path);
 
@@ -164,8 +164,8 @@ 
         $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array(
             "module" => $module,
         ));
-        $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config" .
-            DIRECTORY_SEPARATOR . "config.php", true);
+        $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config".
+            DIRECTORY_SEPARATOR."config.php", true);
         $this->log->addLog("Generado config genérico para propel");
     }
 
@@ -187,28 +187,28 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
             "class" => $class,
-            "controllerType" => $class . "Base",
+            "controllerType" => $class."Base",
             "is_base" => false
         ));
-        $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
+        $controller = $this->writeTemplateToFile($controllerBody, $mod_path.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, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
 
-        $filename = $mod_path . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php";
+        $filename = $mod_path.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),
@@ -229,8 +229,8 @@ 
     private function generateBaseApiTemplate($module, $mod_path, $force = false, $apiClass = "")
     {
         $created = true;
-        $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
-        $api_path = $mod_path . $module . DIRECTORY_SEPARATOR . 'Api';
+        $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
+        $api_path = $mod_path.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             while ($file = $dir->read()) {
@@ -258,7 +258,7 @@ 
         //Generamos el fichero de configuración
         $this->log->addLog("Generamos fichero vacío de configuración");
         return $this->writeTemplateToFile("<?php\n\t",
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
             $force);
     }
 
@@ -273,10 +273,10 @@ 
         //Generamos el fichero de configuración
         $this->log->addLog("Generamos ficheros para assets base");
         $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n",
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css",
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css",
             $force);
         $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();",
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js",
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js",
             $force);
         return ($css && $js);
     }
@@ -298,7 +298,7 @@ 
             "class" => $class,
         ));
         return $this->writeTemplateToFile($controller,
-            $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php",
+            $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php",
             $force);
     }
 
@@ -317,13 +317,13 @@ 
             "autoloader" => preg_replace('/(\\\|\/)/', '_', $module),
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
         ));
-        $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
+        $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
 
         $this->log->addLog("Generamos el phpunit");
         $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array(
             "module" => $module,
         ));
-        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force);
+        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force);
         return $autoload && $phpunit;
     }
 
@@ -344,7 +344,7 @@ 
             "db" => $this->config->get("db_name"),
         ));
         return $this->writeTemplateToFile($schema,
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
             $force);
     }
 
@@ -362,7 +362,7 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
         ));
         return $this->writeTemplateToFile($build_properties,
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml",
             $force);
     }
 
@@ -380,7 +380,7 @@ 
             "module" => $module,
         ));
         return $this->writeTemplateToFile($index,
-            $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
+            $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
             $force);
     }
 
@@ -398,11 +398,11 @@ 
             try {
                 $this->cache->storeData($filename, $fileContent, Cache::TEXT, true);
                 $created = true;
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
             }
-        } else {
-            Logger::log($filename . t(' not exists or cant write'), LOG_ERR);
+        }else {
+            Logger::log($filename.t(' not exists or cant write'), LOG_ERR);
         }
         return $created;
     }
@@ -431,7 +431,7 @@ 
         ));
 
         return $this->writeTemplateToFile($controller,
-            $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
     }
 
     /**
@@ -454,7 +454,7 @@ 
             "class" => $class,
         ));
 
-        return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+        return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force);
     }
 
     /**
@@ -468,12 +468,12 @@ 
     {
         if (file_exists($filename_path)) {
             $destfolder = basename($filename_path);
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
+            if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
                 if (is_dir($filename_path)) {
-                    self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
-                } else {
-                    if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
-                        throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
+                    self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
+                }else {
+                    if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
+                        throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
                     }
                 }
             }
@@ -492,10 +492,10 @@ 
         GeneratorHelper::createDir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
+                if (is_dir($src.'/'.$file)) {
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
                 }
             }
         }
@@ -508,12 +508,12 @@ 
      */
     private function getPropelPaths($module_path)
     {
-        $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $module_path;
+        $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$module_path;
         GeneratorHelper::createDir($moduleDir);
         $moduleDir = realpath($moduleDir);
-        $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config';
-        $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql';
-        $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations';
+        $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config';
+        $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql';
+        $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations';
         $paths = [
             'projectDir' => $moduleDir,
             'outputDir' => $moduleDir,
@@ -578,9 +578,9 @@ 
     private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR)
     {
         $manager->setGeneratorConfig($configGenerator);
-        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml');
+        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml');
         $manager->setSchemas([$schemaFile]);
-        $manager->setLoggerClosure(function ($message) {
+        $manager->setLoggerClosure(function($message) {
             Logger::log($message, LOG_INFO);
         });
         $manager->setWorkingDirectory($workingDir);

src/base/types/helpers/InjectorHelper.php

Spacing +11 added lines, -11 removed lines

@@ -27,10 +27,10 @@ 
                 $label = self::getLabel($property->getDocComment());
                 $values = self::getValues($property->getDocComment());
                 $isArray = (bool)preg_match('/\[\]$/', $instanceType);
-                if($isArray) {
+                if ($isArray) {
                     $instanceType = str_replace('[]', '', $instanceType);
                 }
-                if($instanceType === '\\DateTime' || !Router::exists($instanceType)) {
+                if ($instanceType === '\\DateTime' || !Router::exists($instanceType)) {
                     list($type, $format) = DocumentorHelper::translateSwaggerFormats($instanceType);
                     $variables[$property->getName()] = [
                         'type' => $type,
@@ -38,7 +38,7 @@ 
                         'required' => $isRequired,
                         'description' => $label,
                     ];
-                } else {
+                }else {
                     $instance = new \ReflectionClass($instanceType);
                     $variables[$property->getName()] = [
                         'is_array' => $isArray,
@@ -47,7 +47,7 @@ 
                         'properties' => self::extractVariables($instance),
                     ];
                 }
-                if(!empty($values)){
+                if (!empty($values)) {
                     $variables[$property->getName()]['enum'] = $values;
                 }
             }
@@ -114,7 +114,7 @@ 
     {
         $visible = false;
         if (false !== preg_match('/@visible\s+([^\s]+)/', $doc, $matches)) {
-            $visible =  count($matches) < 2 || 'false' !== strtolower($matches[1]);
+            $visible = count($matches) < 2 || 'false' !== strtolower($matches[1]);
         }
         return $visible;
     }
@@ -127,7 +127,7 @@ 
         // Extract description
         $label = null;
         preg_match('/@label\ (.*)\n/i', $doc, $matches);
-        if(count($matches) > 1) {
+        if (count($matches) > 1) {
             $label = t($matches[1]);
         }
         return $label;
@@ -141,7 +141,7 @@ 
         // Extract description
         $label = null;
         preg_match('/@values\ (.*)\n/i', $doc, $matches);
-        if(count($matches) > 1) {
+        if (count($matches) > 1) {
             $label = t($matches[1]);
         }
         return false !== strpos($label, '|') ? explode('|', $label) : $label;
@@ -154,7 +154,7 @@ 
     public static function getDefaultValue($doc) {
         $default = null;
         preg_match('/@default\ (.*)\n/i', $doc, $matches);
-        if(count($matches) > 1) {
+        if (count($matches) > 1) {
             $default = $matches[1];
         }
         return $default;
@@ -169,13 +169,13 @@ 
      */
     public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace);
+        Logger::log('Create inyectable instance for '.$classNameSpace);
         $reflector = new \ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, 'getInstance')) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;
@@ -189,7 +189,7 @@ 
     public static function getClassProperties($class)
     {
         $properties = [];
-        Logger::log('Extracting annotations properties from class ' . $class);
+        Logger::log('Extracting annotations properties from class '.$class);
         $selfReflector = new \ReflectionClass($class);
         if (false !== $selfReflector->getParentClass()) {
             $properties = self::getClassProperties($selfReflector->getParentClass()->getName());

src/base/types/helpers/DocumentorHelper.php

Spacing +15 added lines, -15 removed lines

@@ -14,9 +14,9 @@ 
      */
     private static function searchPayloadParam($params, $variable) {
         $exists = false;
-        if(null !== $params && count($params)) {
-            foreach($params as $param) {
-                if($param['name'] === $variable) {
+        if (null !== $params && count($params)) {
+            foreach ($params as $param) {
+                if ($param['name'] === $variable) {
                     $exists = true;
                     break;
                 }
@@ -40,12 +40,12 @@ 
         ];
         if ($endpoint['payload']['is_array']) {
             $schema['items'] = [
-                '$ref' => '#/definitions/' . $endpoint['payload']['type'],
+                '$ref' => '#/definitions/'.$endpoint['payload']['type'],
             ];
-        } else {
-            $schema['$ref'] = '#/definitions/' . $endpoint['payload']['type'];
+        }else {
+            $schema['$ref'] = '#/definitions/'.$endpoint['payload']['type'];
         }
-        if(!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) {
+        if (!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) {
             $paths[$url][$method]['parameters'][] = [
                 'in' => 'body',
                 'name' => $endpoint['payload']['type'],
@@ -74,18 +74,18 @@ 
             if (array_key_exists('data', $endpoint['return']) && count(array_keys($object)) === count(array_keys($endpoint['return']['data']))) {
                 $classDefinition = [
                     'type' => 'object',
-                    '$ref' => '#/definitions/' . $class,
+                    '$ref' => '#/definitions/'.$class,
                 ];
-            } else {
+            }else {
                 $classDefinition = [
                     'type' => 'array',
                     'items' => [
-                        '$ref' => '#/definitions/' . $class,
+                        '$ref' => '#/definitions/'.$class,
                     ],
                 ];
             }
 
-            if($paths[$url][$method]['responses'][200]['schema']['properties']['data']['type'] === 'boolean') {
+            if ($paths[$url][$method]['responses'][200]['schema']['properties']['data']['type'] === 'boolean') {
                 $paths[$url][$method]['responses'][200]['schema']['properties']['data'] = $classDefinition;
             }
             $dtos += self::extractSwaggerDefinition($class, $object);
@@ -163,18 +163,18 @@ 
             ],
         ];
         foreach ($fields as $field => $info) {
-            if(array_key_exists('type', $info) && in_array($info['type'], ['array', 'object'])) {
+            if (array_key_exists('type', $info) && in_array($info['type'], ['array', 'object'])) {
                 $definition[$name]['properties'][$field] = $info;
-            } elseif(array_key_exists('type', $info)) {
+            } elseif (array_key_exists('type', $info)) {
                 list($type, $format) = self::translateSwaggerFormats($info['type']);
                 $fieldData = [
                     "type" => $type,
                     "required" => $info['required'],
                 ];
-                if(array_key_exists('description', $info)) {
+                if (array_key_exists('description', $info)) {
                     $fieldData['description'] = $info['description'];
                 }
-                if(array_key_exists('format', $info)) {
+                if (array_key_exists('format', $info)) {
                     $fieldData['format'] = $info['format'];
                 }
                 $dto['properties'][$field] = $fieldData;

src/base/dto/Dto.php

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
     public function __construct($hydrate = true)
     {
         parent::__construct();
-        if($hydrate) {
+        if ($hydrate) {
             $this->fromArray(Request::getInstance()->getData());
         }
     }
@@ -43,22 +43,22 @@ 
                 /** @var \ReflectionProperty $property */
                 foreach ($properties as $property) {
                     $value = $property->getValue($this);
-                    if(is_object($value) && method_exists($value, 'toArray')) {
+                    if (is_object($value) && method_exists($value, 'toArray')) {
                         $dto[$property->getName()] = $value->toArray();
-                    } elseif(is_array($value)) {
-                        foreach($value as &$arrValue) {
-                            if($arrValue instanceof Dto) {
+                    } elseif (is_array($value)) {
+                        foreach ($value as &$arrValue) {
+                            if ($arrValue instanceof Dto) {
                                 $arrValue = $arrValue->toArray();
                             }
                         }
                         $dto[$property->getName()] = $value;
-                    } else {
+                    }else {
                         $dto[$property->getName()] = $property->getValue($this);
                     }
                 }
             }
-        } 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 $dto;
     }
@@ -80,32 +80,32 @@ 
     protected function parseDtoField(array $properties, $key, $value = null) {
         $type = 'string';
         $is_array = false;
-        if(array_key_exists($key, $properties)) {
+        if (array_key_exists($key, $properties)) {
             $type = $properties[$key];
-            if(preg_match('/(\[\]|Array)/i', $type)) {
+            if (preg_match('/(\[\]|Array)/i', $type)) {
                 $type = preg_replace('/(\[\]|Array)/i', '', $type);
                 $is_array = true;
             }
         }
         $reflector = (class_exists($type)) ? new \ReflectionClass($type) : null;
-        if(null !== $reflector && $reflector->isSubclassOf(Dto::class)) {
-            if(null !== $value && is_array($value)) {
-                if($is_array) {
+        if (null !== $reflector && $reflector->isSubclassOf(Dto::class)) {
+            if (null !== $value && is_array($value)) {
+                if ($is_array) {
                     $this->$key = [];
-                    foreach($value as $data) {
-                        if(null !== $data && is_array($data)) {
+                    foreach ($value as $data) {
+                        if (null !== $data && is_array($data)) {
                             $dto = new $type(false);
                             $dto->fromArray($data);
                             array_push($this->$key, $dto);
                         }
                     }
-                } else {
+                }else {
                     $this->$key = new $type(false);
                     $this->$key->fromArray($value);
                 }
             }
-        } else {
-            switch($type) {
+        }else {
+            switch ($type) {
                 default:
                 case 'string':
                     $this->$key = $value;

src/base/types/traits/JsonTrait.php

Spacing +7 added lines, -7 removed lines

@@ -25,10 +25,10 @@ 
      */
     public function json($response, $statusCode = 200)
     {
-        if(Config::getParam('profiling.enable')) {
-            if(is_array($response)) {
+        if (Config::getParam('profiling.enable')) {
+            if (is_array($response)) {
                 $response['profiling'] = Inspector::getStats();
-            } elseif($response instanceof JsonResponse) {
+            } elseif ($response instanceof JsonResponse) {
                 $response = ProfilingJsonResponse::createFromPrevious($response, Inspector::getStats());
             }
         }
@@ -36,17 +36,17 @@ 
         $this->decodeJsonResponse($response);
 
         $mask = JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING;
-        if(Config::getParam('output.json.strict_numbers')) {
+        if (Config::getParam('output.json.strict_numbers')) {
             $mask = JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING | JSON_NUMERIC_CHECK;
         }
 
         $data = json_encode($response, $mask);
-        if(json_last_error() !== JSON_ERROR_NONE) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             Logger::log(json_last_error_msg(), LOG_CRIT);
         }
 
-        if(Config::getParam('angular.protection', false)) {
-            $data = ")]}',\n" . $data;
+        if (Config::getParam('angular.protection', false)) {
+            $data = ")]}',\n".$data;
         }
         $this->setStatus($statusCode);
         ResponseHelper::setDebugHeaders([]);

src/base/types/helpers/ApiHelper.php

Spacing +38 added lines, -38 removed lines

@@ -37,20 +37,20 @@ 
         $behaviors = $tableMap->getBehaviors();
         foreach ($map::getFieldNames() as $field) {
             $fDto = self::parseFormField($domain, $tableMap, $field, $behaviors);
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $form->addField($fDto);
             }
         }
 
-        if(array_key_exists('i18n', $behaviors)) {
-            $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
-            if(null !== $relateI18n) {
+        if (array_key_exists('i18n', $behaviors)) {
+            $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
+            if (null !== $relateI18n) {
                 $i18NTableMap = $relateI18n->getLocalTable();
-                foreach($i18NTableMap->getColumns() as $columnMap) {
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
                     $columnName = self::getColumnMapName($columnMap);
-                    if(!$form->fieldExists($columnName)) {
+                    if (!$form->fieldExists($columnName)) {
                         $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors());
-                        if(null !== $fDto) {
+                        if (null !== $fDto) {
                             $fDto->pk = false;
                             $fDto->required = true;
                             $form->addField($fDto);
@@ -80,7 +80,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;
     }
 
@@ -187,14 +187,14 @@ 
     {
         $column = null;
         try {
-            foreach($tableMap->getColumns() as $tableMapColumn) {
+            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;
@@ -208,18 +208,18 @@ 
     private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null)
     {
         $tableField = $column->getFullyQualifiedName();
-        if(is_array($value)) {
+        if (is_array($value)) {
             $query->add($tableField, $value, Criteria::IN);
         } elseif (preg_match('/^\[/', $value) && preg_match('/\]$/', $value)) {
             $query->add($tableField, explode(',', preg_replace('/(\[|\])/', '', $value)), Criteria::IN);
         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
             $text = preg_replace('/(\'|\")/', '', $value);
             $text = preg_replace('/\ /', '%', $text);
-            $query->add($tableField, '%' . $text . '%', Criteria::LIKE);
-        } else {
-            if(null !== $column->getValueSet()) {
+            $query->add($tableField, '%'.$text.'%', Criteria::LIKE);
+        }else {
+            if (null !== $column->getValueSet()) {
                 $valueSet = $column->getValueSet();
-                if(in_array($value, $valueSet)) {
+                if (in_array($value, $valueSet)) {
                     $value = array_search($value, $valueSet);
                 }
             }
@@ -239,31 +239,31 @@ 
         $sep = '';
         foreach ($tableMap->getColumns() as $column) {
             if ($column->isText()) {
-                $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                 $sep = ', " ", ';
             }
         }
-        foreach($tableMap->getRelations() as $relation) {
-            if(preg_match('/I18n$/i', $relation->getName())) {
+        foreach ($tableMap->getRelations() as $relation) {
+            if (preg_match('/I18n$/i', $relation->getName())) {
                 $localeTableMap = $relation->getLocalTable();
                 foreach ($localeTableMap->getColumns() as $column) {
                     if ($column->isText()) {
-                        $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                        $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                         $sep = ', " ", ';
                     }
                 }
             }
         }
         foreach ($extraColumns as $extra => $name) {
-            if(!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
-                $exp .= $sep . $extra;
+            if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $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.'%"');
     }
 
     /**
@@ -288,7 +288,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);
 
@@ -317,7 +317,7 @@ 
         } elseif ($mappedColumn->isText()) {
             if ($mappedColumn->getSize() > 100) {
                 $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required);
-            } else {
+            }else {
                 $fDto = self::generateStringField($field, $required);
             }
         } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) {
@@ -333,7 +333,7 @@ 
         } elseif (in_array($mappedColumn->getType(), [PropelTypes::ENUM, PropelTypes::SET])) {
             $fDto = self::generateEnumField($field, $required);
             foreach ($mappedColumn->getValueSet() as $value) {
-                switch(Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) {
+                switch (Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) {
                     default:
                     case TableMap::TYPE_PHPNAME:
                         $fieldName = $mappedColumn->getPhpName();
@@ -357,7 +357,7 @@ 
                 $fDto->pk = true;
             }
         }
-        switch(Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) {
+        switch (Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) {
             default:
             case TableMap::TYPE_PHPNAME:
                 $fDto->name = $mappedColumn->getPhpName();
@@ -381,7 +381,7 @@ 
      */
     public static function extractPrimaryKeyColumnName(TableMap $tableMap) {
         $modelPk = null;
-        foreach($tableMap->getPrimaryKeys() as $pk) {
+        foreach ($tableMap->getPrimaryKeys() as $pk) {
             $modelPk = $pk;
             break;
         }
@@ -390,15 +390,15 @@ 
 
     private static function mapResult(ActiveRecordInterface $model, array $data = []) {
         $result = [];
-        foreach($data as $key => $value) {
+        foreach ($data as $key => $value) {
             try {
                 $realValue = $model->getByName($key);
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 $realValue = $value;
             }
-            if(Api::API_MODEL_KEY_FIELD === $key) {
+            if (Api::API_MODEL_KEY_FIELD === $key) {
                 $result[$key] = (integer)$realValue;
-            } else {
+            }else {
                 $result[$key] = $realValue;
             }
         }
@@ -415,14 +415,14 @@ 
         $objTableMap = get_class($formatter->getTableMap());
         /** @var TableMapTrait $objTableMap */
         $objData = $data;
-        foreach($objTableMap::getFieldNames() as $field) {
-            if(!array_key_exists($field, $objData)) {
+        foreach ($objTableMap::getFieldNames() as $field) {
+            if (!array_key_exists($field, $objData)) {
                 $objData[$field] = null;
             }
         }
         $obj = @$formatter->getAllObjectsFromRow($objData);
         $result = self::mapResult($obj, $data);
-        if(!preg_match('/' . $modelPk->getPhpName() . '/i', $query[Api::API_FIELDS_RESULT_FIELD])) {
+        if (!preg_match('/'.$modelPk->getPhpName().'/i', $query[Api::API_FIELDS_RESULT_FIELD])) {
             unset($result[$modelPk->getPhpName()]);
         }
         return $result;
@@ -433,7 +433,7 @@ 
      */
     public static function getFieldTypes() {
         $configType = Config::getParam('api.field.case');
-        switch($configType) {
+        switch ($configType) {
             default:
             case 'UpperCamelCase':
             case TableMap::TYPE_PHPNAME:
@@ -459,11 +459,11 @@ 
     }
 
     public static function getColumnMapName(ColumnMap $field) {
-        switch(self::getFieldTypes()) {
+        switch (self::getFieldTypes()) {
             default:
             case 'UpperCamelCase':
             case TableMap::TYPE_PHPNAME:
-                $columnName =$field->getPhpName();
+                $columnName = $field->getPhpName();
                 break;
             case 'camelCase':
             case 'lowerCamelCase':

src/base/dto/Form.php

Spacing +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@ 
             $array['fields'][] = $field->__toArray();
         }
         usort($array['fields'], function($fA, $fB) {
-            if((bool)$fA['required'] !== (bool)$fB['required']) {
-                if((bool)$fa['required']) {
+            if ((bool)$fA['required'] !== (bool)$fB['required']) {
+                if ((bool)$fa['required']) {
                     return -1;
-                } else {
+                }else {
                     return 1;
                 }
             }
@@ -56,7 +56,7 @@ 
             }
             return ($aOrder < $bOrder) ? -1 : 1;
         });
-        foreach($this->actions as $action) {
+        foreach ($this->actions as $action) {
             $array['actions'][] = $action->__toArray();
         }
         return $array;