psfs / core

src/Dispatcher.php

Spacing +6 added lines, -6 removed lines

@@ -73,18 +73,18 @@
                 if (!Request::getInstance()->isFile()) {
                     return $this->router->execute($uri ?: $this->actualUri);
                 }
-            } else {
+            }else {
                 return ConfigController::getInstance()->config();
             }
-        } catch (AdminCredentialsException $a) {
+        }catch (AdminCredentialsException $a) {
             return UserController::showAdminManager();
-        } catch (SecurityException $s) {
+        }catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             return $this->router->httpNotFound($r);
-        } catch(ApiException $a) {
+        }catch (ApiException $a) {
             return $this->router->httpNotFound($a, true);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $this->dumpException($e);
         }
     }

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 = _('Revisando directorio: ') . $inspect_path;
-                    $res .= _('Comando ejecutado: ') . $cmd_php;
+                if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) {
+                    $res = _('Revisando directorio: ').$inspect_path;
+                    $res .= _('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 . _(' not exists or cant write'), LOG_ERR);
+        }else {
+            Logger::log($filename._(' 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/controller/I18nController.php

Spacing +3 added lines, -3 removed lines

@@ -42,8 +42,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, GeneratorService::findTranslations(SOURCE_DIR, $locale));
@@ -51,7 +51,7 @@ 
         $translations = array_merge($translations, GeneratorService::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/base/config/ConfigForm.php

Spacing +3 added lines, -3 removed lines

@@ -83,9 +83,9 @@
             'class' => 'btn-warning md-default',
             'icon' => 'fa-plus',
         ];
-        if(Config::getParam('admin.version', 'v1') === 'v1') {
-            $add['onclick'] = 'javascript:addNewField(document.getElementById("' . $this->getName() . '"));';
-        } else {
+        if (Config::getParam('admin.version', 'v1') === 'v1') {
+            $add['onclick'] = 'javascript:addNewField(document.getElementById("'.$this->getName().'"));';
+        }else {
             $add['ng-click'] = 'addNewField()';
         }
         $this->addButton('submit', _('Guardar configuración'), 'submit', array(

src/base/types/Form.php

Spacing +24 added lines, -24 removed lines

@@ -69,8 +69,8 @@ 
     public function add($name, array $value = array())
     {
         $this->fields[$name] = $value;
-        $this->fields[$name]['name'] = $this->getName() . '['.$name.']';
-        $this->fields[$name]['id'] = $this->getName() . '_' . $name;
+        $this->fields[$name]['name'] = $this->getName().'['.$name.']';
+        $this->fields[$name]['id'] = $this->getName().'_'.$name;
         $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name;
         $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true;
         return $this;
@@ -133,7 +133,7 @@ 
         }
         if ('' !== $hashOrig) {
             $this->crfs = sha1($hashOrig);
-            $this->add($this->getName() . '_token', array(
+            $this->add($this->getName().'_token', array(
                 'type' => 'hidden',
                 'value' => $this->crfs,
             ));
@@ -202,7 +202,7 @@ 
     public function isValid()
     {
         $valid = true;
-        $tokenField = $this->getName() . '_token';
+        $tokenField = $this->getName().'_token';
         //Controlamos CSRF token
         if (!$this->existsFormToken($tokenField)) {
             $this->errors[$tokenField] = t('Formulario no válido');
@@ -276,7 +276,7 @@ 
         $data = array();
         if (count($this->fields) > 0) {
             foreach ($this->fields as $key => $field) {
-                if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) {
+                if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) {
                     $data[$key] = array_key_exists('value', $field) ? $field['value'] : null;
                 }
             }
@@ -390,8 +390,8 @@ 
             $model = $this->getHydratedModel();
             $model->save();
             $save = true;
-            Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO);
-        } catch (\Exception $e) {
+            Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO);
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw new FormException($e->getMessage(), $e->getCode(), $e);
         }
@@ -410,10 +410,10 @@ 
         if (null === $value) {
             $isEmpty = true;
             // Empty Array check
-        } else if (is_array($value) && 0 === count($value)) {
+        }else if (is_array($value) && 0 === count($value)) {
             $isEmpty = true;
             // Empty string check
-        } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) {
+        }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) {
             $isEmpty = true;
         }
 
@@ -440,7 +440,7 @@ 
             && array_key_exists($key, $field)
             && !array_key_exists('error', $field[$key])
             && !empty($field['value'])
-            && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0
+            && preg_match('/'.$field['pattern'].'/', $field['value']) === 0
         ) {
             $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", t('El campo %s no tiene un formato válido')));
             $field['error'] = $this->getError($key);
@@ -462,10 +462,10 @@ 
         if (array_key_exists($key, $data[$formName])) {
             if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) {
                 $field['value'] = null;
-            } else {
+            }else {
                 $field['value'] = $data[$formName][$key];
             }
-        } else {
+        }else {
             unset($field['value']);
         }
         return array($data, $field);
@@ -479,8 +479,8 @@ 
      */
     private function hydrateModelField($key, $value)
     {
-        $setter = 'set' . ucfirst($key);
-        $getter = 'get' . ucfirst($key);
+        $setter = 'set'.ucfirst($key);
+        $getter = 'get'.ucfirst($key);
         if (method_exists($this->model, $setter)) {
             if (method_exists($this->model, $getter)) {
                 $tmp = $this->model->$getter();
@@ -505,16 +505,16 @@ 
     {
         //Extraemos el dato del modelo relacionado si existe el getter
         $method = null;
-        if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) {
-            $classMethod = 'get' . $field['class_data'];
+        if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) {
+            $classMethod = 'get'.$field['class_data'];
             $class = $val->$classMethod();
-            if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) {
-                $method = 'get' . $field['class_id'];
+            if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) {
+                $method = 'get'.$field['class_id'];
                 $data[] = $class->$method();
-            } else {
+            }else {
                 $data[] = $class->getPrimaryKey();
             }
-        } else {
+        }else {
             $data[] = $val;
         }
 
@@ -530,7 +530,7 @@ 
     private function extractModelFieldValue($key, $field)
     {
         //Extraemos el valor del campo del modelo
-        $method = 'get' . ucfirst($key);
+        $method = 'get'.ucfirst($key);
         $type = (array_key_exists('type', $field)) ? $field['type'] : 'text';
         //Extraemos los campos del modelo
         if (method_exists($this->model, $method)) {
@@ -540,16 +540,16 @@ 
                 //Si es una relación múltiple
                 if ($value instanceof ObjectCollection) {
                     $field = $this->computeModelFieldValue($field, $value, $type);
-                } else { //O una relación unitaria
+                }else { //O una relación unitaria
                     if (method_exists($value, '__toString')) {
                         $field['value'] = $value;
                     } elseif ($value instanceof \DateTime) {
                         $field['value'] = $value->format('Y-m-d H:i:s');
-                    } else {
+                    }else {
                         $field['value'] = $value->getPrimaryKey();
                     }
                 }
-            } else {
+            }else {
                 $field['value'] = $value;
             }
         }

src/services/DocumentorService.php

Spacing +24 added lines, -24 removed lines

@@ -56,10 +56,10 @@ 
                     if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) {
                         $modules = [
                             'name' => $module,
-                            'path' => dirname($info['base'] . DIRECTORY_SEPARATOR . '..'),
+                            'path' => dirname($info['base'].DIRECTORY_SEPARATOR.'..'),
                         ];
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -77,7 +77,7 @@ 
      */
     public function extractApiEndpoints(array $module)
     {
-        $modulePath = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
+        $modulePath = $module['path'].DIRECTORY_SEPARATOR.'Api';
         $moduleName = $module['name'];
         $endpoints = [];
         if (file_exists($modulePath)) {
@@ -86,7 +86,7 @@ 
             if (count($finder)) {
                 /** @var \SplFileInfo $file */
                 foreach ($finder as $file) {
-                    $namespace = "\\{$moduleName}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                    $namespace = "\\{$moduleName}\\Api\\".str_replace('.php', '', $file->getFilename());
                     $info = $this->extractApiInfo($namespace, $moduleName);
                     if (!empty($info)) {
                         $endpoints[$namespace] = $info;
@@ -109,14 +109,14 @@ 
         if (Router::exists($namespace) && !I18nHelper::checkI18Class($namespace)) {
             $reflection = new \ReflectionClass($namespace);
             $visible = InjectorHelper::checkIsVisible($reflection->getDocComment());
-            if($visible) {
+            if ($visible) {
                 foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                     try {
                         $mInfo = $this->extractMethodInfo($namespace, $method, $reflection, $module);
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::log($e->getMessage(), LOG_ERR);
                     }
                 }
@@ -249,7 +249,7 @@ 
             $payload = $this->extractModelFields($namespace);
             $reflector = new \ReflectionClass($namespace);
             $shortName = $reflector->getShortName();
-        } else {
+        }else {
             $namespace = $model;
             $shortName = $model;
         }
@@ -338,10 +338,10 @@ 
                         "required" => $field->isNotNull(),
                         'format' => $format,
                     ];
-                    if(count($field->getValueSet())) {
+                    if (count($field->getValueSet())) {
                         $info['enum'] = array_values($field->getValueSet());
                     }
-                    if(null !== $field->getDefaultValue()) {
+                    if (null !== $field->getDefaultValue()) {
                         $info['default'] = $field->getDefaultValue();
                     }
                     $payload[ApiHelper::getColumnMapName($field)] = $info;
@@ -349,7 +349,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
 
@@ -380,7 +380,7 @@ 
                     $return = $this->extractReturn($modelNamespace, $docComments);
                     $url = array_pop($route);
                     $methodInfo = [
-                        'url' => str_replace('/' . $module . '/api', '', $url),
+                        'url' => str_replace('/'.$module.'/api', '', $url),
                         'method' => $info['http'],
                         'description' => $info['label'],
                         'return' => $return,
@@ -391,7 +391,7 @@ 
                     $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments);
                     $this->setQueryParams($method, $methodInfo);
                     $this->setRequestHeaders($reflection, $methodInfo);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                 }
             }
@@ -460,10 +460,10 @@ 
         $formatted = [
             "swagger" => "2.0",
             "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)),
-            "basePath" => '/' . $module['name'] . '/api',
+            "basePath" => '/'.$module['name'].'/api',
             "schemes" => [Request::getInstance()->getServer('HTTPS') === 'on' ? 'https' : 'http'],
             "info" => [
-                "title" => t('Documentación API módulo ') . $module['name'],
+                "title" => t('Documentación API módulo ').$module['name'],
                 "version" => Config::getParam('api.version', '1.0.0'),
                 "contact" => [
                     "name" => Config::getParam("author", "Fran López"),
@@ -476,7 +476,7 @@ 
         foreach ($endpoints as $model) {
             foreach ($model as $endpoint) {
                 if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) {
-                    $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']);
+                    $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']);
                     $description = $endpoint['description'];
                     $method = strtolower($endpoint['method']);
                     $paths[$url][$method] = [
@@ -537,7 +537,7 @@ 
     protected function extractDtoName($dto, $isArray = false)
     {
         $dto = explode('\\', $dto);
-        $modelDto = array_pop($dto) . "Dto";
+        $modelDto = array_pop($dto)."Dto";
         if ($isArray) {
             $modelDto .= "List";
         }
@@ -587,10 +587,10 @@ 
     {
 
         $methodInfo['headers'] = [];
-        foreach($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property) {
             $doc = $property->getDocComment();
             preg_match('/@header\ (.*)\n/i', $doc, $headers);
-            if(count($headers)) {
+            if (count($headers)) {
                 $header = [
                     "name" => $headers[1],
                     "in" => "header",
@@ -635,7 +635,7 @@ 
             foreach ($method->getParameters() as $parameter) {
                 $parameterName = $parameter->getName();
                 $types = [];
-                preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types);
+                preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types);
                 if (count($types) > 1 && count($types[1]) > 0) {
                     $methodInfo['parameters'][$parameterName] = $types[1][0];
                 }
@@ -657,21 +657,21 @@ 
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'array',
                         'items' => [
-                            '$ref' => '#/definitions/' . $info['type'],
+                            '$ref' => '#/definitions/'.$info['type'],
                         ]
                     ];
-                } else {
+                }else {
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'object',
-                        '$ref' => '#/definitions/' . $info['type'],
+                        '$ref' => '#/definitions/'.$info['type'],
                     ];
                 }
                 $modelDto['objects'][$info['class']] = $info['properties'];
                 $paramDto = $this->checkDtoAttributes($info['properties'], $info['properties'], $info['class']);
-                if(array_key_exists('objects', $paramDto)) {
+                if (array_key_exists('objects', $paramDto)) {
                     $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']);
                 }
-            } else {
+            }else {
                 $modelDto['objects'][$dtoName][$param] = $info;
             }
         }

src/base/Singleton.php

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        Logger::log(static::class . ' constructor invoked');
+        Logger::log(static::class.' constructor invoked');
         $this->init();
     }
 
@@ -81,14 +81,14 @@ 
         $calledClass = static::class;
         try {
             $instance = InjectorHelper::constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass);
-            $setter = 'set' . ucfirst($variable);
+            $setter = 'set'.ucfirst($variable);
             if (method_exists($calledClass, $setter)) {
                 $this->$setter($instance);
-            } else {
+            }else {
                 $this->$variable = $instance;
             }
-        } catch (\Exception $e) {
-            Logger::log($e->getMessage() . ': ' . $e->getFile() . ' [' . $e->getLine() . ']', LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log($e->getMessage().': '.$e->getFile().' ['.$e->getLine().']', LOG_ERR);
             throw $e;
         }
         return $this;
@@ -103,7 +103,7 @@ 
     {
         if (!$this->isLoaded()) {
             $filename = sha1(get_class($this));
-            $cacheFilename = 'reflections' . DIRECTORY_SEPARATOR . substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2) . DIRECTORY_SEPARATOR . $filename . '.json';
+            $cacheFilename = 'reflections'.DIRECTORY_SEPARATOR.substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2).DIRECTORY_SEPARATOR.$filename.'.json';
             /** @var \PSFS\base\Cache $cacheService */
             $cacheService = Cache::getInstance();
             /** @var \PSFS\base\config\Config $configService */
@@ -121,8 +121,8 @@ 
                 }
             }
             $this->setLoaded();
-        } else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+        }else {
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 }

src/base/types/traits/OutputTrait.php

Spacing +16 added lines, -16 removed lines

@@ -121,7 +121,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;
@@ -135,11 +135,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);
 
     }
 
@@ -152,20 +152,20 @@ 
      */
     public function output($output = '', $contentType = 'text/html', array $cookies = array())
     {
-        if(!self::isTest()) {
+        if (!self::isTest()) {
             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();
             }
@@ -175,7 +175,7 @@ 
             ob_end_clean();
             Logger::log('End output response');
             $this->closeRender();
-        } else {
+        }else {
             return $output;
         }
     }
@@ -188,11 +188,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;
     }
 
@@ -230,17 +230,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/Api.php

Spacing +36 added lines, -36 removed lines

@@ -82,20 +82,20 @@ 
     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();
-        if($this instanceof CustomApi === false) {
+        if ($this instanceof CustomApi === false) {
             $this->createConnection($this->getTableMap());
         }
         $this->checkFieldType();
         $this->setLoaded(true);
-        Logger::log(static::class . ' loaded', LOG_DEBUG);
+        Logger::log(static::class.' loaded', LOG_DEBUG);
     }
 
     private function checkActions($method) {
-        switch($method) {
+        switch ($method) {
             default:
             case 'modelList': $this->action = self::API_ACTION_LIST; break;
             case 'get': $this->action = self::API_ACTION_GET; break;
@@ -112,7 +112,7 @@ 
     protected function hydrateOrders()
     {
         if (count($this->query)) {
-            Logger::log(static::class . ' gathering query string', LOG_DEBUG);
+            Logger::log(static::class.' gathering query string', LOG_DEBUG);
             foreach ($this->query as $key => $value) {
                 if ($key === self::API_ORDER_FIELD && is_array($value)) {
                     foreach ($value as $field => $direction) {
@@ -129,10 +129,10 @@ 
      */
     protected function extractPagination()
     {
-        Logger::log(static::class . ' extract pagination start', LOG_DEBUG);
+        Logger::log(static::class.' extract pagination start', LOG_DEBUG);
         $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1;
         $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100;
-        Logger::log(static::class . ' extract pagination end', LOG_DEBUG);
+        Logger::log(static::class.' extract pagination end', LOG_DEBUG);
         return array($page, (int)$limit);
     }
 
@@ -143,7 +143,7 @@ 
      */
     private function addOrders(ModelCriteria &$query)
     {
-        Logger::log(static::class . ' extract orders start ', LOG_DEBUG);
+        Logger::log(static::class.' extract orders start ', LOG_DEBUG);
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
         foreach ($this->order->getOrders() as $field => $direction) {
@@ -151,18 +151,18 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
         }
         if (!$orderAdded) {
             $pks = $this->getPkDbName();
-            foreach(array_keys($pks) as $key) {
+            foreach (array_keys($pks) as $key) {
                 $query->addAscendingOrderByColumn($key);
             }
         }
-        Logger::log(static::class . ' extract orders end', LOG_DEBUG);
+        Logger::log(static::class.' extract orders end', LOG_DEBUG);
     }
 
     /**
@@ -177,7 +177,7 @@ 
             foreach ($this->query as $field => $value) {
                 if (self::API_COMBO_FIELD === $field) {
                     ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
-                } elseif(!preg_match('/^__/', $field)) {
+                } elseif (!preg_match('/^__/', $field)) {
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
                 }
             }
@@ -198,10 +198,10 @@ 
             list($page, $limit) = $this->extractPagination();
             if ($limit === -1) {
                 $this->list = $query->find($this->con);
-            } else {
+            }else {
                 $this->list = $query->paginate($page, $limit, $this->con);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -220,7 +220,7 @@ 
         $code = 200;
         list($return, $total, $pages) = $this->getList();
         $message = null;
-        if(!$total) {
+        if (!$total) {
             $message = i18n::_('No se han encontrado elementos para la búsqueda');
         }
 
@@ -246,7 +246,7 @@ 
         $pages = 1;
         $message = null;
         list($code, $return) = $this->getSingleResult($pk);
-        if($code !== 200) {
+        if ($code !== 200) {
             $message = i18n::_('No se ha encontrado el elemento solicitado');
         }
 
@@ -275,13 +275,13 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-            } else {
+            }else {
                 $message = i18n::_('No se ha podido guardar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            $message = i18n::_('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage();
+        }catch (\Exception $e) {
+            $message = i18n::_('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
             $context = [];
-            if(null !== $e->getPrevious()) {
+            if (null !== $e->getPrevious()) {
                 $context[] = $e->getPrevious()->getMessage();
             }
             Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -317,18 +317,18 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-                } else {
+                }else {
                     $message = i18n::_('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = i18n::_('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 $context = [];
-                if(null !== $e->getPrevious()) {
+                if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
             }
-        } else {
+        }else {
             $message = i18n::_('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -356,15 +356,15 @@ 
                 $this->con->beginTransaction();
                 $this->hydrateModel($pk);
                 if (NULL !== $this->model) {
-                    if(method_exists('clearAllReferences', $this->model)) {
+                    if (method_exists('clearAllReferences', $this->model)) {
                         $this->model->clearAllReferences(true);
                     }
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $context = [];
-                if(null !== $e->getPrevious()) {
+                if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -393,7 +393,7 @@ 
             $this->saveBulk();
             $saved = true;
             $status = 200;
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData());
             $message = i18n::_('Bulk insert rolled back');
         }
@@ -415,7 +415,7 @@ 
 
         /** @var CustomerTableMap $tableMap */
         $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap());
-        foreach($this->list->getData() as $data) {
+        foreach ($this->list->getData() as $data) {
             $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data);
         }
         return $return;
@@ -432,23 +432,23 @@ 
         try {
             $this->paginate();
             if (null !== $this->list) {
-                if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
+                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;
                 $pages = 0;
-                if($this->list instanceof PropelModelPager) {
+                if ($this->list instanceof PropelModelPager) {
                     $total = $this->list->getNbResults();
                     $pages = $this->list->getLastPage();
-                } elseif($this->list instanceof ArrayCollection) {
+                } elseif ($this->list instanceof ArrayCollection) {
                     $total = count($return);
                     $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);
@@ -466,7 +466,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
         }