Passed
Push — master ( f17d15...6b8654 )
by Fran
02:50
created
src/base/types/traits/SystemTrait.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
                 $use /= 1024;
39 39
                 break;
40 40
             case "MBytes":
41
-                $use /= (1024 * 1024);
41
+                $use /= (1024*1024);
42 42
                 break;
43 43
             case "Bytes":
44 44
             default:
@@ -62,34 +62,34 @@  discard block
 block discarded – undo
62 62
     protected function bindWarningAsExceptions()
63 63
     {
64 64
         Logger::log('Added handlers for errors');
65
-        if(Config::getParam('debug')) {
65
+        if (Config::getParam('debug')) {
66 66
             Logger::log('Setting error_reporting as E_ALL');
67 67
             ini_set('error_reporting', E_ALL);
68 68
             ini_set('display_errors', 1);
69 69
         }
70 70
         //Warning & Notice handler
71
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
71
+        set_error_handler(function($errno, $errstr, $errfile, $errline) {
72 72
             Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
73 73
             return true;
74 74
         }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
75 75
 
76
-        register_shutdown_function(function () {
76
+        register_shutdown_function(function() {
77 77
             $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors();
78
-            if( $error !== NULL) {
78
+            if ($error !== NULL) {
79 79
                 $errno   = $error["type"];
80 80
                 $errfile = $error["file"];
81 81
                 $errline = $error["line"];
82 82
                 $errstr  = $error["message"];
83 83
                 Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
84
-                if(null !== Config::getParam('log.slack.hook')) {
84
+                if (null !== Config::getParam('log.slack.hook')) {
85 85
                     SlackHelper::getInstance()->trace($errstr, $errfile, $errline, $error);
86 86
                 }
87 87
             }
88 88
 
89
-            if(self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
89
+            if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
90 90
                 SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [
91
-                    'time' => round(self::getTs(), 3) . ' secs',
92
-                    'memory' => round(self::getMem('MBytes'), 3) . ' Mb',
91
+                    'time' => round(self::getTs(), 3).' secs',
92
+                    'memory' => round(self::getMem('MBytes'), 3).' Mb',
93 93
                 ]);
94 94
             }
95 95
             return false;
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
         Logger::log('Initializing stats (mem + ts)');
105 105
         if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
106 106
             $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
107
-        } else {
107
+        }else {
108 108
             $this->ts = PSFS_START_TS;
109 109
         }
110 110
         $this->mem = PSFS_START_MEM;
Please login to merge, or discard this patch.
src/functions.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,14 +48,14 @@
 block discarded – undo
48 48
     /* @var $file SplFileInfo */
49 49
     foreach ($finder as $file) {
50 50
         $path = $file->getRealPath();
51
-        if(!in_array($path, $loaded_files)) {
51
+        if (!in_array($path, $loaded_files)) {
52 52
             $loaded_files[] = $path;
53 53
             require_once($path);
54 54
         }
55 55
     }
56 56
 }
57 57
 
58
-if(!function_exists('t')) {
58
+if (!function_exists('t')) {
59 59
     function t($message, $key = null, $reload = false) {
60 60
         return CustomTranslateExtension::_($message, $key, $reload);
61 61
     }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,9 +34,10 @@
 block discarded – undo
34 34
     function getallheaders()
35 35
     {
36 36
         $headers = [];
37
-        foreach ($_SERVER as $h => $v)
38
-            if (preg_match('/HTTP_(.+)/', $h, $hp)) {
37
+        foreach ($_SERVER as $h => $v) {
38
+                    if (preg_match('/HTTP_(.+)/', $h, $hp)) {
39 39
                 $headers[$hp[1]] = $v;
40
+        }
40 41
             }
41 42
         return $headers;
42 43
     }
Please login to merge, or discard this patch.
src/base/Singleton.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
      */
23 23
     public function __construct()
24 24
     {
25
-        Logger::log(static::class . ' constructor invoked');
25
+        Logger::log(static::class.' constructor invoked');
26 26
         $this->init();
27 27
     }
28 28
 
@@ -81,14 +81,14 @@  discard block
 block discarded – undo
81 81
         $calledClass = static::class;
82 82
         try {
83 83
             $instance = InjectorHelper::constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass);
84
-            $setter = 'set' . ucfirst($variable);
84
+            $setter = 'set'.ucfirst($variable);
85 85
             if (method_exists($calledClass, $setter)) {
86 86
                 $this->$setter($instance);
87
-            } else {
87
+            }else {
88 88
                 $this->$variable = $instance;
89 89
             }
90
-        } catch (\Exception $e) {
91
-            Logger::log($e->getMessage() . ': ' . $e->getFile() . ' [' . $e->getLine() . ']', LOG_ERR);
90
+        }catch (\Exception $e) {
91
+            Logger::log($e->getMessage().': '.$e->getFile().' ['.$e->getLine().']', LOG_ERR);
92 92
             throw $e;
93 93
         }
94 94
         return $this;
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
     {
104 104
         if (!$this->isLoaded()) {
105 105
             $filename = sha1(get_class($this));
106
-            $cacheFilename = 'reflections' . DIRECTORY_SEPARATOR . substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2) . DIRECTORY_SEPARATOR . $filename . ".json";
106
+            $cacheFilename = 'reflections'.DIRECTORY_SEPARATOR.substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2).DIRECTORY_SEPARATOR.$filename.".json";
107 107
             /** @var \PSFS\base\Cache $cacheService */
108 108
             $cacheService = Cache::getInstance();
109 109
             /** @var \PSFS\base\config\Config $configService */
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
                 }
122 122
             }
123 123
             $this->setLoaded();
124
-        } else {
125
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
124
+        }else {
125
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
126 126
         }
127 127
     }
128 128
 }
Please login to merge, or discard this patch.
src/base/types/traits/SingletonTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
      */
41 41
     public static function dropInstance() {
42 42
         $class = static::class;
43
-        if(isset(self::$instance[$class])) {
43
+        if (isset(self::$instance[$class])) {
44 44
             self::$instance[$class] = null;
45 45
         }
46 46
     }
Please login to merge, or discard this patch.
src/base/types/helpers/I18nHelper.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $locale = Request::header('X-API-LANG', $default);
29 29
         if (empty($locale)) {
30 30
             $locale = Security::getInstance()->getSessionKey(self::PSFS_SESSION_LANGUAGE_KEY);
31
-            if(empty($locale) && array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
31
+            if (empty($locale) && array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
32 32
                 $BrowserLocales = explode(",", str_replace("-", "_", $_SERVER["HTTP_ACCEPT_LANGUAGE"])); // brosers use en-US, Linux uses en_US
33 33
                 for ($i = 0, $ct = count($BrowserLocales); $i < $ct; $i++) {
34 34
                     list($BrowserLocales[$i]) = explode(";", $BrowserLocales[$i]); //trick for "en;q=0.8"
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
         // TODO check more en locales
45 45
         if (strtolower($locale) === 'en') {
46 46
             $locale = 'en_GB';
47
-        } else {
48
-            $locale = $locale . '_' . strtoupper($locale);
47
+        }else {
48
+            $locale = $locale.'_'.strtoupper($locale);
49 49
         }
50 50
         $default_locales = explode(',', Config::getParam('i18n.locales', ''));
51 51
         if (!in_array($locale, array_merge($default_locales, self::$langs))) {
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
         $translations = array();
67 67
         if (file_exists($absoluteTranslationFileName)) {
68 68
             @include($absoluteTranslationFileName);
69
-        } else {
69
+        }else {
70 70
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
71 71
         }
72 72
 
@@ -81,13 +81,13 @@  discard block
 block discarded – undo
81 81
     public static function setLocale($default = null)
82 82
     {
83 83
         $locale = self::extractLocale($default);
84
-        Logger::log('Set locale to project [' . $locale . ']');
84
+        Logger::log('Set locale to project ['.$locale.']');
85 85
         // Load translations
86
-        putenv("LC_ALL=" . $locale);
86
+        putenv("LC_ALL=".$locale);
87 87
         setlocale(LC_ALL, $locale);
88 88
         // Load the locale path
89
-        $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
90
-        Logger::log('Set locale dir ' . $locale_path);
89
+        $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
90
+        Logger::log('Set locale dir '.$locale_path);
91 91
         GeneratorHelper::createDir($locale_path);
92 92
         bindtextdomain('translations', $locale_path);
93 93
         textdomain('translations');
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
      */
124 124
     public static function checkI18Class($namespace) {
125 125
         $isI18n = false;
126
-        if(preg_match('/I18n$/i', $namespace)) {
126
+        if (preg_match('/I18n$/i', $namespace)) {
127 127
             $parentClass = preg_replace('/I18n$/i', '', $namespace);
128
-            if(Router::exists($parentClass)) {
128
+            if (Router::exists($parentClass)) {
129 129
                 $isI18n = true;
130 130
             }
131 131
         }
@@ -151,12 +151,12 @@  discard block
 block discarded – undo
151 151
             ['i', 'i', 'i', 'i', 'I', 'I', 'I', 'I'],
152 152
             ['o', 'o', 'o', 'o', 'O', 'O', 'O', 'O'],
153 153
             ['u', 'u', 'u', 'u', 'U', 'U', 'U', 'U'],
154
-            ['n', 'N', 'c', 'C',],
154
+            ['n', 'N', 'c', 'C', ],
155 155
         ];
156 156
 
157 157
         $text = filter_var($string, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
158
-        for($i = 0, $total = count($from); $i < $total; $i++) {
159
-            $text = str_replace($from[$i],$to[$i], $text);
158
+        for ($i = 0, $total = count($from); $i < $total; $i++) {
159
+            $text = str_replace($from[$i], $to[$i], $text);
160 160
         }
161 161
 
162 162
         return $text;
Please login to merge, or discard this patch.
src/controller/ConfigController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         foreach ($domains as $domain => $routes) {
32 32
             $pDomain = str_replace('@', '', $domain);
33 33
             $pDomain = str_replace('/', '', $pDomain);
34
-            $response[] = strtolower($pDomain) . '.api.secret';
34
+            $response[] = strtolower($pDomain).'.api.secret';
35 35
         }
36 36
         return $this->json($response);
37 37
     }
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
      */
46 46
     public function config()
47 47
     {
48
-        Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri());
48
+        Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri());
49 49
         /* @var $form \PSFS\base\config\ConfigForm */
50 50
         $form = new ConfigForm(Router::getInstance()->getRoute('admin-config'), Config::$required, Config::$optional, Config::getInstance()->dumpConfig());
51 51
         $form->build();
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
                 }
83 83
                 Security::getInstance()->setFlash("callback_message", t("Configuración actualizada correctamente"));
84 84
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true));
85
-            } else {
85
+            }else {
86 86
                 throw new \HttpException(t('Error al guardar la configuración, prueba a cambiar los permisos'), 403);
87 87
             }
88 88
         }
Please login to merge, or discard this patch.
src/base/types/CustomAuthApi.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
     public function init()
14 14
     {
15
-        if(!Security::getInstance()->isLogged()) {
15
+        if (!Security::getInstance()->isLogged()) {
16 16
             throw new ApiException(t('Resource not authorized'), 401);
17 17
         }
18 18
         parent::init();
Please login to merge, or discard this patch.
src/base/types/traits/Api/ConnectionTrait.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
     {
33 33
         $this->con = Propel::getConnection($tableMap::DATABASE_NAME);
34 34
         $this->con->beginTransaction();
35
-        if(method_exists($this->con, 'useDebug')) {
35
+        if (method_exists($this->con, 'useDebug')) {
36 36
             Logger::log('Enabling debug queries mode', LOG_INFO);
37 37
             $this->con->useDebug(Config::getParam('debug'));
38 38
         }
@@ -45,12 +45,12 @@  discard block
 block discarded – undo
45 45
      */
46 46
     protected function closeTransaction($status)
47 47
     {
48
-        if(null !== $this->con) {
48
+        if (null !== $this->con) {
49 49
             $this->traceDebugQuery();
50 50
             if (null !== $this->con && $this->con->inTransaction()) {
51 51
                 if ($status === 200) {
52 52
                     $this->con->commit();
53
-                } else {
53
+                }else {
54 54
                     $this->con->rollBack();
55 55
                 }
56 56
             }
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
     protected function traceDebugQuery()
65 65
     {
66 66
         if (Config::getParam('debug')) {
67
-            Logger::log($this->con->getLastExecutedQuery()?: 'Empty Query', LOG_DEBUG);
67
+            Logger::log($this->con->getLastExecutedQuery() ?: 'Empty Query', LOG_DEBUG);
68 68
         }
69 69
     }
70 70
 
@@ -72,13 +72,13 @@  discard block
 block discarded – undo
72 72
      * Checks if the connection has a transaction initialized
73 73
      */
74 74
     protected function checkTransaction() {
75
-        if(null !== $this->con && !$this->con->inTransaction()) {
75
+        if (null !== $this->con && !$this->con->inTransaction()) {
76 76
             $this->con->beginTransaction();
77 77
         }
78
-        if(null !== $this->con && $this->con->inTransaction()) {
78
+        if (null !== $this->con && $this->con->inTransaction()) {
79 79
             $this->items++;
80 80
         }
81
-        if($this->items >= Config::getParam('api.block.limit', 1000)) {
81
+        if ($this->items >= Config::getParam('api.block.limit', 1000)) {
82 82
             $this->con->commit();
83 83
             $this->items = 0;
84 84
         }
Please login to merge, or discard this patch.
src/services/GeneratorService.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -45,24 +45,24 @@  discard block
 block discarded – undo
45 45
      */
46 46
     public static function findTranslations($path, $locale)
47 47
     {
48
-        $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
49
-        $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
48
+        $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
49
+        $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
50 50
 
51 51
         $translations = array();
52 52
         if (file_exists($path)) {
53 53
             $d = dir($path);
54 54
             while (false !== ($dir = $d->read())) {
55 55
                 GeneratorHelper::createDir($locale_path);
56
-                if (!file_exists($locale_path . 'translations.po')) {
57
-                    file_put_contents($locale_path . 'translations.po', '');
56
+                if (!file_exists($locale_path.'translations.po')) {
57
+                    file_put_contents($locale_path.'translations.po', '');
58 58
                 }
59
-                $inspect_path = realpath($path . DIRECTORY_SEPARATOR . $dir);
60
-                $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext " .
61
-                    $inspect_path . DIRECTORY_SEPARATOR .
59
+                $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir);
60
+                $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ".
61
+                    $inspect_path.DIRECTORY_SEPARATOR.
62 62
                     "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po";
63
-                if (is_dir($path . DIRECTORY_SEPARATOR . $dir) && preg_match('/^\./', $dir) == 0) {
64
-                    $res = _('Revisando directorio: ') . $inspect_path;
65
-                    $res .= _('Comando ejecutado: ') . $cmd_php;
63
+                if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) {
64
+                    $res = _('Revisando directorio: ').$inspect_path;
65
+                    $res .= _('Comando ejecutado: ').$cmd_php;
66 66
                     $res .= shell_exec($cmd_php);
67 67
                     usleep(10);
68 68
                     $translations[] = $res;
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
      */
84 84
     public function createStructureModule($module, $force = false, $type = "", $apiClass = "")
85 85
     {
86
-        $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
86
+        $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
87 87
         $module = ucfirst($module);
88 88
         $this->createModulePath($module, $mod_path);
89 89
         $this->createModulePathTree($module, $mod_path);
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
         // Creates the src folder
105 105
         GeneratorHelper::createDir($mod_path);
106 106
         // Create module path
107
-        GeneratorHelper::createDir($mod_path . $module);
107
+        GeneratorHelper::createDir($mod_path.$module);
108 108
     }
109 109
 
110 110
     /**
@@ -119,16 +119,16 @@  discard block
 block discarded – undo
119 119
         $this->log->addLog("Generamos la estructura");
120 120
         $paths = [
121 121
             "Api", "Api/base", "Config", "Controller", "Models", "Public", "Templates", "Services", "Test", "Doc",
122
-            "Locale", "Locale/" . Config::getParam('default.locale', 'es_ES'), "Locale/" . Config::getParam('default.locale', 'es_ES') . "/LC_MESSAGES"
122
+            "Locale", "Locale/".Config::getParam('default.locale', 'es_ES'), "Locale/".Config::getParam('default.locale', 'es_ES')."/LC_MESSAGES"
123 123
         ];
124
-        $module_path = $mod_path . $module;
124
+        $module_path = $mod_path.$module;
125 125
         foreach ($paths as $path) {
126
-            GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . $path);
126
+            GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR.$path);
127 127
         }
128 128
         //Creamos las carpetas de los assets
129 129
         $htmlPaths = array("css", "js", "img", "media", "font");
130 130
         foreach ($htmlPaths as $path) {
131
-            GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
131
+            GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
132 132
         }
133 133
     }
134 134
 
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
      */
142 142
     private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '')
143 143
     {
144
-        $module_path = $mod_path . $module;
144
+        $module_path = $mod_path.$module;
145 145
         $this->generateControllerTemplate($module, $module_path, $force, $controllerType);
146 146
         $this->generateServiceTemplate($module, $module_path, $force);
147 147
         $this->genereateAutoloaderTemplate($module, $module_path, $force);
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
159 159
      */
160 160
     private function createModuleModels($module, $path)
161 161
     {
162
-        $module_path = $path . $module;
163
-        $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
162
+        $module_path = $path.$module;
163
+        $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path);
164 164
 
165 165
         $configGenerator = $this->getConfigGenerator($module_path);
166 166
 
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
         $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array(
171 171
             "module" => $module,
172 172
         ));
173
-        $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config" .
174
-            DIRECTORY_SEPARATOR . "config.php", true);
173
+        $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config".
174
+            DIRECTORY_SEPARATOR."config.php", true);
175 175
         $this->log->addLog("Generado config genérico para propel");
176 176
     }
177 177
 
@@ -193,28 +193,28 @@  discard block
 block discarded – undo
193 193
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
194 194
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
195 195
             "class" => $class,
196
-            "controllerType" => $class . "Base",
196
+            "controllerType" => $class."Base",
197 197
             "is_base" => false
198 198
         ));
199
-        $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
200
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
199
+        $controller = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
200
+            DIRECTORY_SEPARATOR."{$class}Controller.php", $force);
201 201
 
202 202
         $controllerBody = $this->tpl->dump("generator/controller.template.twig", array(
203 203
             "module" => $module,
204 204
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
205 205
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
206
-            "class" => $class . "Base",
206
+            "class" => $class."Base",
207 207
             "service" => $class,
208 208
             "controllerType" => $controllerType,
209 209
             "is_base" => true,
210 210
             "domain" => $class,
211 211
         ));
212
-        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
213
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
212
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
213
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
214 214
 
215
-        $filename = $mod_path . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php";
215
+        $filename = $mod_path.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php";
216 216
         $test = true;
217
-        if(!file_exists($filename)) {
217
+        if (!file_exists($filename)) {
218 218
             $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
219 219
                 "module" => $module,
220 220
                 "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
@@ -235,8 +235,8 @@  discard block
 block discarded – undo
235 235
     private function generateBaseApiTemplate($module, $mod_path, $force = false, $apiClass = "")
236 236
     {
237 237
         $created = true;
238
-        $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
239
-        $api_path = $mod_path . $module . DIRECTORY_SEPARATOR . 'Api';
238
+        $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
239
+        $api_path = $mod_path.$module.DIRECTORY_SEPARATOR.'Api';
240 240
         if (file_exists($modelPath)) {
241 241
             $dir = dir($modelPath);
242 242
             while ($file = $dir->read()) {
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
         //Generamos el fichero de configuración
265 265
         $this->log->addLog("Generamos fichero vacío de configuración");
266 266
         return $this->writeTemplateToFile("<?php\n\t",
267
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php",
267
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
268 268
             $force);
269 269
     }
270 270
 
@@ -279,10 +279,10 @@  discard block
 block discarded – undo
279 279
         //Generamos el fichero de configuración
280 280
         $this->log->addLog("Generamos ficheros para assets base");
281 281
         $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n",
282
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css",
282
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css",
283 283
             $force);
284 284
         $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();",
285
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js",
285
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js",
286 286
             $force);
287 287
         return ($css && $js);
288 288
     }
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
             "class" => $class,
305 305
         ));
306 306
         return $this->writeTemplateToFile($controller,
307
-            $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php",
307
+            $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php",
308 308
             $force);
309 309
     }
310 310
 
@@ -323,13 +323,13 @@  discard block
 block discarded – undo
323 323
             "autoloader" => preg_replace('/(\\\|\/)/', '_', $module),
324 324
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
325 325
         ));
326
-        $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
326
+        $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
327 327
 
328 328
         $this->log->addLog("Generamos el phpunit");
329 329
         $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array(
330 330
             "module" => $module,
331 331
         ));
332
-        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force);
332
+        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force);
333 333
         return $autoload && $phpunit;
334 334
     }
335 335
 
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
             "db" => $this->config->get("db_name"),
351 351
         ));
352 352
         return $this->writeTemplateToFile($schema,
353
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
353
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
354 354
             $force);
355 355
     }
356 356
 
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
369 369
         ));
370 370
         return $this->writeTemplateToFile($build_properties,
371
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml",
371
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml",
372 372
             $force);
373 373
     }
374 374
 
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
             "module" => $module,
387 387
         ));
388 388
         return $this->writeTemplateToFile($index,
389
-            $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
389
+            $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
390 390
             $force);
391 391
     }
392 392
 
@@ -404,11 +404,11 @@  discard block
 block discarded – undo
404 404
             try {
405 405
                 $this->cache->storeData($filename, $fileContent, Cache::TEXT, true);
406 406
                 $created = true;
407
-            } catch (\Exception $e) {
407
+            }catch (\Exception $e) {
408 408
                 Logger::log($e->getMessage(), LOG_ERR);
409 409
             }
410
-        } else {
411
-            Logger::log($filename . _(' not exists or cant write'), LOG_ERR);
410
+        }else {
411
+            Logger::log($filename._(' not exists or cant write'), LOG_ERR);
412 412
         }
413 413
         return $created;
414 414
     }
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
         ));
438 438
 
439 439
         return $this->writeTemplateToFile($controller,
440
-            $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
440
+            $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
441 441
     }
442 442
 
443 443
     /**
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
             "class" => $class,
461 461
         ));
462 462
 
463
-        return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force);
463
+        return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force);
464 464
     }
465 465
 
466 466
     /**
@@ -474,12 +474,12 @@  discard block
 block discarded – undo
474 474
     {
475 475
         if (file_exists($filename_path)) {
476 476
             $destfolder = basename($filename_path);
477
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
477
+            if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
478 478
                 if (is_dir($filename_path)) {
479
-                    self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
480
-                } else {
481
-                    if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
482
-                        throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
479
+                    self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
480
+                }else {
481
+                    if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
482
+                        throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
483 483
                     }
484 484
                 }
485 485
             }
@@ -498,10 +498,10 @@  discard block
 block discarded – undo
498 498
         GeneratorHelper::createDir($dst);
499 499
         while (false !== ($file = readdir($dir))) {
500 500
             if (($file != '.') && ($file != '..')) {
501
-                if (is_dir($src . '/' . $file)) {
502
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
503
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
504
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
501
+                if (is_dir($src.'/'.$file)) {
502
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
503
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
504
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
505 505
                 }
506 506
             }
507 507
         }
@@ -514,12 +514,12 @@  discard block
 block discarded – undo
514 514
      */
515 515
     private function getPropelPaths($module_path)
516 516
     {
517
-        $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $module_path;
517
+        $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$module_path;
518 518
         GeneratorHelper::createDir($moduleDir);
519 519
         $moduleDir = realpath($moduleDir);
520
-        $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config';
521
-        $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql';
522
-        $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations';
520
+        $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config';
521
+        $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql';
522
+        $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations';
523 523
         $paths = [
524 524
             'projectDir' => $moduleDir,
525 525
             'outputDir' => $moduleDir,
@@ -584,9 +584,9 @@  discard block
 block discarded – undo
584 584
     private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR)
585 585
     {
586 586
         $manager->setGeneratorConfig($configGenerator);
587
-        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml');
587
+        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml');
588 588
         $manager->setSchemas([$schemaFile]);
589
-        $manager->setLoggerClosure(function ($message) {
589
+        $manager->setLoggerClosure(function($message) {
590 590
             Logger::log($message, LOG_INFO);
591 591
         });
592 592
         $manager->setWorkingDirectory($workingDir);
Please login to merge, or discard this patch.