Passed
Push — master ( 5b4546...2dd92a )
by Fran
09:27
created
src/base/types/helpers/RequestHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
                     header("Access-Control-Allow-Credentials: true");
43 43
                     header("Access-Control-Allow-Origin: *");
44 44
                     header("Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS");
45
-                    header("Access-Control-Allow-Headers: " . implode(', ', self::getCorsHeaders()));
45
+                    header("Access-Control-Allow-Headers: ".implode(', ', self::getCorsHeaders()));
46 46
                 }
47 47
                 if (Request::getInstance()->getMethod() == 'OPTIONS') {
48 48
                     Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests');
Please login to merge, or discard this patch.
src/base/types/helpers/I18nHelper.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
         $translations = array();
25 25
         if (file_exists($absoluteTranslationFileName)) {
26 26
             @include($absoluteTranslationFileName);
27
-        } else {
27
+        }else {
28 28
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
29 29
         }
30 30
 
@@ -36,13 +36,13 @@  discard block
 block discarded – undo
36 36
      */
37 37
     public static function setLocale() {
38 38
         $locale = Config::getParam("default.language", 'es_ES');
39
-        Logger::log('Set locale to project [' . $locale . ']');
39
+        Logger::log('Set locale to project ['.$locale.']');
40 40
         // Load translations
41
-        putenv("LC_ALL=" . $locale);
41
+        putenv("LC_ALL=".$locale);
42 42
         setlocale(LC_ALL, $locale);
43 43
         // Load the locale path
44
-        $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
45
-        Logger::log('Set locale dir ' . $locale_path);
44
+        $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
45
+        Logger::log('Set locale dir '.$locale_path);
46 46
         GeneratorHelper::createDir($locale_path);
47 47
         bindtextdomain('translations', $locale_path);
48 48
         textdomain('translations');
@@ -54,17 +54,17 @@  discard block
 block discarded – undo
54 54
      * @return string
55 55
      */
56 56
     public static function utf8Encode($data) {
57
-        if(is_array($data)) {
58
-            foreach($data as $key => &$field) {
57
+        if (is_array($data)) {
58
+            foreach ($data as $key => &$field) {
59 59
                 $field = self::utf8Encode($field);
60 60
             }
61
-        } elseif(is_object($data)) {
61
+        } elseif (is_object($data)) {
62 62
             $properties = get_class_vars($data);
63
-            foreach($properties as $property => $value) {
63
+            foreach ($properties as $property => $value) {
64 64
                 $data->$property = self::utf8Encode($data->$property);
65 65
             }
66 66
 
67
-        } elseif(is_string($data)) {
67
+        } elseif (is_string($data)) {
68 68
             $data = utf8_encode($data);
69 69
         }
70 70
         return $data;
Please login to merge, or discard this patch.
src/base/types/traits/JsonTrait.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,12 +19,12 @@
 block discarded – undo
19 19
      */
20 20
     public function json($response, $statusCode = 200)
21 21
     {
22
-        if(Config::getParam('json.encodeUTF8', false)) {
22
+        if (Config::getParam('json.encodeUTF8', false)) {
23 23
             $response = I18nHelper::utf8Encode($response);
24 24
         }
25 25
         $data = json_encode($response, JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
26
-        if(Config::getParam('angular.protection', false)) {
27
-            $data = ")]}',\n" . $data;
26
+        if (Config::getParam('angular.protection', false)) {
27
+            $data = ")]}',\n".$data;
28 28
         }
29 29
         $this->setStatus($statusCode);
30 30
         return $this->output($data, "application/json");
Please login to merge, or discard this patch.
src/base/extension/AssetsParser.php 1 patch
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     public function __construct($type = 'js')
34 34
     {
35 35
         $this->type = $type;
36
-        $this->path = WEB_DIR . DIRECTORY_SEPARATOR;
36
+        $this->path = WEB_DIR.DIRECTORY_SEPARATOR;
37 37
         $this->domains = Template::getDomains(true);
38 38
         $this->debug = Config::getInstance()->getDebugMode();
39 39
     }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             $source_file = explode("?", $source_file);
56 56
             $source_file = $source_file[0];
57 57
         }
58
-        $orig = realpath(dirname($filename_path) . DIRECTORY_SEPARATOR . $source_file);
58
+        $orig = realpath(dirname($filename_path).DIRECTORY_SEPARATOR.$source_file);
59 59
         return $orig;
60 60
     }
61 61
 
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
      */
69 69
     public function addFile($filename)
70 70
     {
71
-        if (file_exists($this->path . $filename) && preg_match('/\.' . $this->type . '$/i', $filename)) {
71
+        if (file_exists($this->path.$filename) && preg_match('/\.'.$this->type.'$/i', $filename)) {
72 72
             $this->files[] = $filename;
73 73
         } elseif (!empty($this->domains)) {
74 74
             foreach ($this->domains as $domain => $paths) {
75 75
                 $domain_filename = str_replace($domain, $paths["public"], $filename);
76
-                if (file_exists($domain_filename) && preg_match('/\.' . $this->type . '$/i', $domain_filename)) {
76
+                if (file_exists($domain_filename) && preg_match('/\.'.$this->type.'$/i', $domain_filename)) {
77 77
                     $this->files[] = $domain_filename;
78 78
                 }
79 79
             }
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
     public function setHash($hash)
91 91
     {
92 92
         $cache = Config::getParam('cache.var', '');
93
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
93
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
94 94
         return $this;
95 95
     }
96 96
 
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
      */
125 125
     protected function compileCss()
126 126
     {
127
-        $base = $this->path . "css" . DIRECTORY_SEPARATOR;
128
-        if ($this->debug || !file_exists($base . $this->hash . ".css")) {
127
+        $base = $this->path."css".DIRECTORY_SEPARATOR;
128
+        if ($this->debug || !file_exists($base.$this->hash.".css")) {
129 129
             $data = '';
130 130
             if (0 < count($this->files)) {
131 131
                 $minifier = new CSS();
@@ -133,15 +133,15 @@  discard block
 block discarded – undo
133 133
                     $data = $this->processCssLine($file, $base, $data);
134 134
                 }
135 135
             }
136
-            if($this->debug) {
137
-                $this->storeContents($base . $this->hash . ".css", $data);
138
-            } else {
136
+            if ($this->debug) {
137
+                $this->storeContents($base.$this->hash.".css", $data);
138
+            }else {
139 139
                 $minifier = new CSS();
140 140
                 $minifier->add($data);
141 141
                 ini_set('max_execution_time', -1);
142 142
                 ini_set('memory_limit', -1);
143 143
                 GeneratorHelper::createDir($base);
144
-                $minifier->minify($base . $this->hash . ".css");
144
+                $minifier->minify($base.$this->hash.".css");
145 145
                 unset($cssMinifier);
146 146
                 ini_restore('memory_limit');
147 147
                 ini_restore('max_execution_time');
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
      */
158 158
     protected function compileJs()
159 159
     {
160
-        $base = $this->path . "js" . DIRECTORY_SEPARATOR;
161
-        if ($this->debug || !file_exists($base . $this->hash . ".js")) {
160
+        $base = $this->path."js".DIRECTORY_SEPARATOR;
161
+        if ($this->debug || !file_exists($base.$this->hash.".js")) {
162 162
             $data = '';
163 163
             if (0 < count($this->files)) {
164 164
                 $minifier = new JS();
@@ -167,19 +167,19 @@  discard block
 block discarded – undo
167 167
                     if (file_exists($file)) {
168 168
                         if ($this->debug) {
169 169
                             $data = $this->putDebugJs($path_parts, $base, $file);
170
-                        } elseif (!file_exists($base . $this->hash . ".js")) {
170
+                        } elseif (!file_exists($base.$this->hash.".js")) {
171 171
                             $minifier->add($file);
172 172
                             //$data = $this->putProductionJs($base, $file, $data);
173 173
                         }
174 174
                     }
175 175
                 }
176
-                if($this->debug) {
177
-                    $this->storeContents($base . $this->hash . ".js", $data);
178
-                } else {
176
+                if ($this->debug) {
177
+                    $this->storeContents($base.$this->hash.".js", $data);
178
+                }else {
179 179
                     ini_set('max_execution_time', -1);
180 180
                     ini_set('memory_limit', -1);
181 181
                     GeneratorHelper::createDir($base);
182
-                    $minifier->minify($base . $this->hash . ".js");
182
+                    $minifier->minify($base.$this->hash.".js");
183 183
                     ini_restore('memory_limit');
184 184
                     ini_restore('max_execution_time');
185 185
                 }
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
     {
200 200
         GeneratorHelper::createDir(dirname($path));
201 201
         if ("" !== $content && false === file_put_contents($path, $content)) {
202
-            throw new ConfigException(_('No se tienen permisos para escribir en ' . $path));
202
+            throw new ConfigException(_('No se tienen permisos para escribir en '.$path));
203 203
         }
204 204
     }
205 205
 
@@ -228,8 +228,8 @@  discard block
 block discarded – undo
228 228
             foreach ($this->compiled_files as $file) {
229 229
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
230 230
             }
231
-        } else {
232
-            echo "\t\t<script type='text/javascript' src='/js/" . $this->hash . ".js'></script>\n";
231
+        }else {
232
+            echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n";
233 233
         }
234 234
     }
235 235
 
@@ -242,8 +242,8 @@  discard block
 block discarded – undo
242 242
             foreach ($this->compiled_files as $file) {
243 243
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
244 244
             }
245
-        } else {
246
-            echo "\t\t<link href='/css/" . $this->hash . ".css' rel='stylesheet'>";
245
+        }else {
246
+            echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet'>";
247 247
         }
248 248
     }
249 249
 
@@ -254,20 +254,20 @@  discard block
 block discarded – undo
254 254
     protected function extractCssResources($source, $file)
255 255
     {
256 256
         $source_file = $this->extractSourceFilename($source);
257
-        $orig = realpath(dirname($file) . DIRECTORY_SEPARATOR . $source_file);
257
+        $orig = realpath(dirname($file).DIRECTORY_SEPARATOR.$source_file);
258 258
         $orig_part = preg_split('/(\/|\\\)public(\/|\\\)/i', $orig);
259 259
         try {
260 260
             if (count($source) > 1 && array_key_exists(1, $orig_part)) {
261
-                $dest = $this->path . $orig_part[1];
261
+                $dest = $this->path.$orig_part[1];
262 262
                 GeneratorHelper::createDir(dirname($dest));
263 263
                 if (!file_exists($dest) || filemtime($orig) > filemtime($dest)) {
264 264
                     if (@copy($orig, $dest) === FALSE) {
265
-                        throw new \RuntimeException('Can\' copy ' . $dest . '');
265
+                        throw new \RuntimeException('Can\' copy '.$dest.'');
266 266
                     }
267 267
                     Logger::log("$orig copiado a $dest", LOG_INFO);
268 268
                 }
269 269
             }
270
-        } catch (\Exception $e) {
270
+        }catch (\Exception $e) {
271 271
             Logger::log($e->getMessage(), LOG_ERR);
272 272
         }
273 273
     }
@@ -284,21 +284,21 @@  discard block
 block discarded – undo
284 284
     {
285 285
         if (file_exists($file)) {
286 286
             $path_parts = explode("/", $file);
287
-            $file_path = $this->hash . "_" . $path_parts[count($path_parts) - 1];
288
-            if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($file) || $this->debug) {
287
+            $file_path = $this->hash."_".$path_parts[count($path_parts) - 1];
288
+            if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($file) || $this->debug) {
289 289
                 //Si tenemos modificaciones tenemos que compilar de nuevo todos los ficheros modificados
290
-                if (file_exists($base . $this->hash . ".css") && @unlink($base . $this->hash . ".css") === false) {
291
-                    throw new ConfigException("Can't unlink file " . $base . $this->hash . ".css");
290
+                if (file_exists($base.$this->hash.".css") && @unlink($base.$this->hash.".css") === false) {
291
+                    throw new ConfigException("Can't unlink file ".$base.$this->hash.".css");
292 292
                 }
293 293
                 $this->loopCssLines($file);
294 294
             }
295 295
             if ($this->debug) {
296 296
                 $data = file_get_contents($file);
297
-                $this->storeContents($base . $file_path, $data);
298
-            } else {
297
+                $this->storeContents($base.$file_path, $data);
298
+            }else {
299 299
                 $data .= file_get_contents($file);
300 300
             }
301
-            $this->compiled_files[] = "/css/" . $file_path;
301
+            $this->compiled_files[] = "/css/".$file_path;
302 302
         }
303 303
 
304 304
         return $data;
@@ -313,12 +313,12 @@  discard block
 block discarded – undo
313 313
      */
314 314
     protected function putDebugJs($path_parts, $base, $file)
315 315
     {
316
-        $file_path = $this->hash . "_" . $path_parts[count($path_parts) - 1];
317
-        $this->compiled_files[] = "/js/" . $file_path;
316
+        $file_path = $this->hash."_".$path_parts[count($path_parts) - 1];
317
+        $this->compiled_files[] = "/js/".$file_path;
318 318
         $data = "";
319
-        if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($file)) {
319
+        if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($file)) {
320 320
             $data = file_get_contents($file);
321
-            $this->storeContents($base . $file_path, $data);
321
+            $this->storeContents($base.$file_path, $data);
322 322
         }
323 323
         return $data;
324 324
     }
@@ -360,60 +360,60 @@  discard block
 block discarded – undo
360 360
     {
361 361
         $ppath = explode("/", $string);
362 362
         $original_filename = $ppath[count($ppath) - 1];
363
-        $base = WEB_DIR . DIRECTORY_SEPARATOR;
363
+        $base = WEB_DIR.DIRECTORY_SEPARATOR;
364 364
         $file = "";
365 365
         $html_base = "";
366 366
         $debug = Config::getInstance()->getDebugMode();
367 367
         $cache = Config::getInstance()->get('cache.var');
368
-        $cache = $cache ? '.' . $cache : '';
368
+        $cache = $cache ? '.'.$cache : '';
369 369
         $finfo = finfo_open(FILEINFO_MIME_TYPE); // devuelve el tipo mime de su extensión
370 370
         $mime = finfo_file($finfo, $filename_path);
371 371
         finfo_close($finfo);
372 372
         if (preg_match('/\.css$/i', $string)) {
373
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.css";
373
+            $file = "/".substr(md5($string), 0, 8)."$cache.css";
374 374
             $html_base = "css";
375 375
             if ($debug) {
376
-                $file = str_replace(".css", "_" . $original_filename, $file);
376
+                $file = str_replace(".css", "_".$original_filename, $file);
377 377
             }
378 378
         } elseif (preg_match('/\.js$/i', $string)) {
379
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.js";
379
+            $file = "/".substr(md5($string), 0, 8)."$cache.js";
380 380
             $html_base = "js";
381 381
             if ($debug) {
382
-                $file = str_replace(".js", "_" . $original_filename, $file);
382
+                $file = str_replace(".js", "_".$original_filename, $file);
383 383
             }
384 384
         } elseif (preg_match("/image/i", $mime)) {
385 385
             $ext = explode(".", $string);
386
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
386
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
387 387
             $html_base = "img";
388 388
             if ($debug) {
389
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
389
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
390 390
             }
391 391
         } elseif (preg_match("/(doc|pdf)/i", $mime)) {
392 392
             $ext = explode(".", $string);
393
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
393
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
394 394
             $html_base = "docs";
395 395
             if ($debug) {
396
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
396
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
397 397
             }
398 398
         } elseif (preg_match("/(video|audio|ogg)/i", $mime)) {
399 399
             $ext = explode(".", $string);
400
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
400
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
401 401
             $html_base = "media";
402 402
             if ($debug) {
403
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
403
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
404 404
             }
405 405
         } elseif (preg_match("/(text|html)/i", $mime)) {
406 406
             $ext = explode(".", $string);
407
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
407
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
408 408
             $html_base = "templates";
409 409
             if ($debug) {
410
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
410
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
411 411
             }
412 412
         } elseif (!$return && !is_null($name)) {
413 413
             $html_base = '';
414 414
             $file = $name;
415 415
         }
416
-        $file_path = $html_base . $file;
416
+        $file_path = $html_base.$file;
417 417
 
418 418
         return array($base, $html_base, $file_path);
419 419
     }
@@ -432,10 +432,10 @@  discard block
 block discarded – undo
432 432
             foreach ($urls as $source) {
433 433
                 $orig = self::calculateResourcePathname($filename_path, $source);
434 434
                 $orig_part = preg_split("/Public/i", $orig);
435
-                $dest = WEB_DIR . $orig_part[1];
435
+                $dest = WEB_DIR.$orig_part[1];
436 436
                 GeneratorHelper::createDir(dirname($dest));
437 437
                 if (@copy($orig, $dest) === false) {
438
-                    throw new ConfigException("Can't copy " . $orig . " to " . $dest);
438
+                    throw new ConfigException("Can't copy ".$orig." to ".$dest);
439 439
                 }
440 440
             }
441 441
         }
Please login to merge, or discard this patch.