Passed
Push — master ( e3c67b...98eade )
by Fran
08:10
created
src/controller/I18nController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
         //Generating the templates translations
43 43
         $translations = $this->tpl->regenerateTemplates();
44 44
 
45
-        $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
46
-        $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
45
+        $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
46
+        $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
47 47
 
48 48
         //xgettext localizations
49 49
         $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale));
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         $translations = array_merge($translations, GeneratorService::findTranslations(CACHE_DIR, $locale));
52 52
 
53 53
         $translations[] = "msgfmt {$localePath}translations.po -o {$localePath}translations.mo";
54
-        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '. $localePath . 'translations.po -o ' . $localePath . 'translations.mo');
54
+        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo');
55 55
         return $this->render('translations.html.twig', array(
56 56
             'translations' => $translations,
57 57
         ));
Please login to merge, or discard this patch.
src/services/DocumentorService.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
                     if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) {
57 57
                         $modules = [
58 58
                             'name' => $module,
59
-                            'path' => dirname($info['base'] . DIRECTORY_SEPARATOR . '..'),
59
+                            'path' => dirname($info['base'].DIRECTORY_SEPARATOR.'..'),
60 60
                         ];
61 61
                     }
62
-                } catch (\Exception $e) {
62
+                }catch (\Exception $e) {
63 63
                     $modules[] = $e->getMessage();
64 64
                 }
65 65
             }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
      */
78 78
     public function extractApiEndpoints(array $module)
79 79
     {
80
-        $modulePath = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
80
+        $modulePath = $module['path'].DIRECTORY_SEPARATOR.'Api';
81 81
         $moduleName = $module['name'];
82 82
         $endpoints = [];
83 83
         if (file_exists($modulePath)) {
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
             if (count($finder)) {
87 87
                 /** @var \SplFileInfo $file */
88 88
                 foreach ($finder as $file) {
89
-                    $namespace = "\\{$moduleName}\\Api\\" . str_replace('.php', '', $file->getFilename());
89
+                    $namespace = "\\{$moduleName}\\Api\\".str_replace('.php', '', $file->getFilename());
90 90
                     $info = $this->extractApiInfo($namespace, $moduleName);
91 91
                     if (!empty($info)) {
92 92
                         $endpoints[$namespace] = $info;
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
         if (Router::exists($namespace) && !I18nHelper::checkI18Class($namespace)) {
110 110
             $reflection = new \ReflectionClass($namespace);
111 111
             $visible = InjectorHelper::checkIsVisible($reflection->getDocComment());
112
-            if($visible) {
112
+            if ($visible) {
113 113
                 foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
114 114
                     try {
115 115
                         $mInfo = $this->extractMethodInfo($namespace, $method, $reflection, $module);
116 116
                         if (NULL !== $mInfo) {
117 117
                             $info[] = $mInfo;
118 118
                         }
119
-                    } catch (\Exception $e) {
119
+                    }catch (\Exception $e) {
120 120
                         Logger::log($e->getMessage(), LOG_ERR);
121 121
                     }
122 122
                 }
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
             $payload = $this->extractModelFields($namespace);
250 250
             $reflector = new \ReflectionClass($namespace);
251 251
             $shortName = $reflector->getShortName();
252
-        } else {
252
+        }else {
253 253
             $namespace = $model;
254 254
             $shortName = $model;
255 255
         }
@@ -338,10 +338,10 @@  discard block
 block discarded – undo
338 338
                         "required" => $field->isNotNull(),
339 339
                         'format' => $format,
340 340
                     ];
341
-                    if(count($field->getValueSet())) {
341
+                    if (count($field->getValueSet())) {
342 342
                         $info['enum'] = array_values($field->getValueSet());
343 343
                     }
344
-                    if(null !== $field->getDefaultValue()) {
344
+                    if (null !== $field->getDefaultValue()) {
345 345
                         $info['default'] = $field->getDefaultValue();
346 346
                     }
347 347
                     $payload[ApiHelper::getColumnMapName($field)] = $info;
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
350 350
                 $payload = $this->extractDtoProperties($namespace);
351 351
             }
352
-        } catch (\Exception $e) {
352
+        }catch (\Exception $e) {
353 353
             Logger::log($e->getMessage(), LOG_ERR);
354 354
         }
355 355
 
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
                     $return = $this->extractReturn($modelNamespace, $docComments);
381 381
                     $url = array_pop($route);
382 382
                     $methodInfo = [
383
-                        'url' => str_replace('/' . $module . '/api', '', $url),
383
+                        'url' => str_replace('/'.$module.'/api', '', $url),
384 384
                         'method' => $info['http'],
385 385
                         'description' => $info['label'],
386 386
                         'return' => $return,
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
                     $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments);
392 392
                     $this->setQueryParams($method, $methodInfo);
393 393
                     $this->setRequestHeaders($reflection, $methodInfo);
394
-                } catch (\Exception $e) {
394
+                }catch (\Exception $e) {
395 395
                     Logger::log($e->getMessage(), LOG_ERR);
396 396
                 }
397 397
             }
@@ -460,10 +460,10 @@  discard block
 block discarded – undo
460 460
         $formatted = [
461 461
             "swagger" => "2.0",
462 462
             "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)),
463
-            "basePath" => '/' . $module['name'] . '/api',
463
+            "basePath" => '/'.$module['name'].'/api',
464 464
             "schemes" => [Request::getInstance()->getServer('HTTPS') === 'on' ? 'https' : 'http'],
465 465
             "info" => [
466
-                "title" => t('Documentación API módulo ') . $module['name'],
466
+                "title" => t('Documentación API módulo ').$module['name'],
467 467
                 "version" => Config::getParam('api.version', '1.0.0'),
468 468
                 "contact" => [
469 469
                     "name" => Config::getParam("author", "Fran López"),
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
         foreach ($endpoints as $model) {
477 477
             foreach ($model as $endpoint) {
478 478
                 if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) {
479
-                    $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']);
479
+                    $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']);
480 480
                     $description = $endpoint['description'];
481 481
                     $method = strtolower($endpoint['method']);
482 482
                     $paths[$url][$method] = [
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
     protected function extractDtoName($dto, $isArray = false)
538 538
     {
539 539
         $dto = explode('\\', $dto);
540
-        $modelDto = array_pop($dto) . "Dto";
540
+        $modelDto = array_pop($dto)."Dto";
541 541
         if ($isArray) {
542 542
             $modelDto .= "List";
543 543
         }
@@ -587,10 +587,10 @@  discard block
 block discarded – undo
587 587
     {
588 588
 
589 589
         $methodInfo['headers'] = [];
590
-        foreach($reflection->getProperties() as $property) {
590
+        foreach ($reflection->getProperties() as $property) {
591 591
             $doc = $property->getDocComment();
592 592
             preg_match('/@header\ (.*)\n/i', $doc, $headers);
593
-            if(count($headers)) {
593
+            if (count($headers)) {
594 594
                 $header = [
595 595
                     "name" => $headers[1],
596 596
                     "in" => "header",
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
             foreach ($method->getParameters() as $parameter) {
636 636
                 $parameterName = $parameter->getName();
637 637
                 $types = [];
638
-                preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types);
638
+                preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types);
639 639
                 if (count($types) > 1 && count($types[1]) > 0) {
640 640
                     $methodInfo['parameters'][$parameterName] = $types[1][0];
641 641
                 }
@@ -657,21 +657,21 @@  discard block
 block discarded – undo
657 657
                     $modelDto['objects'][$dtoName][$param] = [
658 658
                         'type' => 'array',
659 659
                         'items' => [
660
-                            '$ref' => '#/definitions/' . $info['type'],
660
+                            '$ref' => '#/definitions/'.$info['type'],
661 661
                         ]
662 662
                     ];
663
-                } else {
663
+                }else {
664 664
                     $modelDto['objects'][$dtoName][$param] = [
665 665
                         'type' => 'object',
666
-                        '$ref' => '#/definitions/' . $info['type'],
666
+                        '$ref' => '#/definitions/'.$info['type'],
667 667
                     ];
668 668
                 }
669 669
                 $modelDto['objects'][$info['class']] = $info['properties'];
670 670
                 $paramDto = $this->checkDtoAttributes($info['properties'], $info['properties'], $info['class']);
671
-                if(array_key_exists('objects', $paramDto)) {
671
+                if (array_key_exists('objects', $paramDto)) {
672 672
                     $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']);
673 673
                 }
674
-            } else {
674
+            }else {
675 675
                 $modelDto['objects'][$dtoName][$param] = $info;
676 676
             }
677 677
         }
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/OutputTrait.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                 $this->setStatusCode(Template::STATUS_OK);
122 122
                 break;
123 123
             default:
124
-                $this->setStatusCode('HTTP/1.0 ' .($status ?: 200));
124
+                $this->setStatusCode('HTTP/1.0 '.($status ?: 200));
125 125
                 break;
126 126
         }
127 127
         return $this;
@@ -135,11 +135,11 @@  discard block
 block discarded – undo
135 135
     private function setReponseHeaders($contentType = 'text/html', array $cookies = array())
136 136
     {
137 137
         $powered = Config::getParam('poweredBy', 'PSFS');
138
-        header('X-Powered-By: ' . $powered);
138
+        header('X-Powered-By: '.$powered);
139 139
         ResponseHelper::setStatusHeader($this->getStatusCode());
140 140
         ResponseHelper::setAuthHeaders($this->isPublicZone());
141 141
         ResponseHelper::setCookieHeaders($cookies);
142
-        header('Content-type: ' . $contentType);
142
+        header('Content-type: '.$contentType);
143 143
 
144 144
     }
145 145
 
@@ -152,20 +152,20 @@  discard block
 block discarded – undo
152 152
      */
153 153
     public function output($output = '', $contentType = 'text/html', array $cookies = array())
154 154
     {
155
-        if(!self::isTest()) {
155
+        if (!self::isTest()) {
156 156
             Logger::log('Start output response');
157 157
             ob_start();
158 158
             $this->setReponseHeaders($contentType, $cookies);
159
-            header('Content-length: ' . strlen($output));
160
-            header('CRC: ' . crc32($output));
159
+            header('Content-length: '.strlen($output));
160
+            header('CRC: '.crc32($output));
161 161
 
162 162
             $needCache = Cache::needCache();
163 163
             $cache = Cache::getInstance();
164 164
             list($path, $cacheDataName) = $cache->getRequestCacheHash();
165 165
             if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) {
166 166
                 Logger::log('Saving output response into cache');
167
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output);
168
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON);
167
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output);
168
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON);
169 169
             } elseif (Request::getInstance()->getMethod() !== 'GET') {
170 170
                 $cache->flushCache();
171 171
             }
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
             ob_end_clean();
176 176
             Logger::log('End output response');
177 177
             $this->closeRender();
178
-        } else {
178
+        }else {
179 179
             return $output;
180 180
         }
181 181
     }
@@ -188,11 +188,11 @@  discard block
 block discarded – undo
188 188
         Logger::log('Close template render');
189 189
         $uri = Request::requestUri();
190 190
         Security::getInstance()->setSessionKey('lastRequest', array(
191
-            'url' => Request::getInstance()->getRootUrl() . $uri,
191
+            'url' => Request::getInstance()->getRootUrl().$uri,
192 192
             'ts' => microtime(true),
193 193
         ));
194 194
         Security::getInstance()->updateSession();
195
-        Logger::log('End request: ' . $uri, LOG_INFO);
195
+        Logger::log('End request: '.$uri, LOG_INFO);
196 196
         exit;
197 197
     }
198 198
 
@@ -230,17 +230,17 @@  discard block
 block discarded – undo
230 230
         /////////////////////////////////////////////////////////////
231 231
         // Date in the past sets the value to already have been expired.
232 232
         header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
233
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
233
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
234 234
         header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
235 235
         header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
236 236
         header('Pragma: no-cache');
237 237
         header('Expires: 0');
238 238
         header('Content-Transfer-Encoding: binary');
239
-        header('Content-type: ' . $content);
240
-        header('Content-length: ' . strlen($data));
241
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
239
+        header('Content-type: '.$content);
240
+        header('Content-length: '.strlen($data));
241
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
242 242
         header('Access-Control-Expose-Headers: Filename');
243
-        header('Filename: ' . $filename);
243
+        header('Filename: '.$filename);
244 244
         echo $data;
245 245
         ob_flush();
246 246
         ob_end_clean();
Please login to merge, or discard this patch.
src/base/Service.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     protected $isMultipart = false;
71 71
 
72 72
     private function closeConnection() {
73
-        if(null !== $this->con) {
73
+        if (null !== $this->con) {
74 74
             curl_close($this->con);
75 75
         }
76 76
     }
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
      */
234 234
     public function setIsJson($isJson = true) {
235 235
         $this->isJson = $isJson;
236
-        if($isJson) {
236
+        if ($isJson) {
237 237
             $this->setIsMultipart(false);
238 238
         }
239 239
     }
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
      */
252 252
     public function setIsMultipart($isMultipart = true) {
253 253
         $this->isMultipart = $isMultipart;
254
-        if($isMultipart) {
254
+        if ($isMultipart) {
255 255
             $this->setIsJson(false);
256 256
         }
257 257
     }
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
         $this->url = NULL;
272 272
         $this->params = array();
273 273
         $this->headers = array();
274
-        Logger::log('Context service for ' . static::class . ' cleared!');
274
+        Logger::log('Context service for '.static::class.' cleared!');
275 275
         $this->closeConnection();
276 276
     }
277 277
 
@@ -314,18 +314,18 @@  discard block
 block discarded – undo
314 314
     }
315 315
 
316 316
     protected function applyOptions() {
317
-        if(count($this->options)) {
317
+        if (count($this->options)) {
318 318
             curl_setopt_array($this->con, $this->options);
319 319
         }
320 320
     }
321 321
 
322 322
     protected function applyHeaders() {
323 323
         $headers = [];
324
-        foreach($this->headers as $key => $value) {
325
-            $headers[] = $key . ': ' . $value;
324
+        foreach ($this->headers as $key => $value) {
325
+            $headers[] = $key.': '.$value;
326 326
         }
327 327
         $headers[self::PSFS_TRACK_HEADER] = Logger::getUid();
328
-        if(count($headers)) {
328
+        if (count($headers)) {
329 329
             curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers);
330 330
         }
331 331
     }
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
334 334
      * @return int
335 335
      */
336 336
     private function parseServiceType() {
337
-        if($this->getIsJson()) {
337
+        if ($this->getIsJson()) {
338 338
             return ServiceHelper::TYPE_JSON;
339 339
         }
340
-        if($this->getIsMultipart()) {
340
+        if ($this->getIsMultipart()) {
341 341
             return ServiceHelper::TYPE_MULTIPART;
342 342
         }
343 343
         return ServiceHelper::TYPE_HTTP;
@@ -350,9 +350,9 @@  discard block
 block discarded – undo
350 350
             case Request::VERB_GET:
351 351
             default:
352 352
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_GET);
353
-                if(!empty($this->params)) {
353
+                if (!empty($this->params)) {
354 354
                     $sep = false === strpos($this->getUrl(), '?') ? '?' : '';
355
-                    $this->url = $this->url . $sep . http_build_query($this->params);
355
+                    $this->url = $this->url.$sep.http_build_query($this->params);
356 356
                 }
357 357
                 break;
358 358
             case Request::VERB_POST:
@@ -384,14 +384,14 @@  discard block
 block discarded – undo
384 384
         $this->applyOptions();
385 385
         $this->applyHeaders();
386 386
         $verbose = null;
387
-        if('debug' === Config::getParam('log.level')) {
387
+        if ('debug' === Config::getParam('log.level')) {
388 388
             curl_setopt($this->con, CURLOPT_VERBOSE, true);
389 389
             $verbose = fopen('php://temp', 'wb+');
390 390
             curl_setopt($this->con, CURLOPT_STDERR, $verbose);
391 391
         }
392 392
         $result = curl_exec($this->con);
393 393
         $this->result = $this->isJson ? json_decode($result, true) : $result;
394
-        if('debug' === Config::getParam('log.level')) {
394
+        if ('debug' === Config::getParam('log.level')) {
395 395
             rewind($verbose);
396 396
             $verboseLog = stream_get_contents($verbose);
397 397
             Logger::log($verboseLog, LOG_DEBUG, [
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
             ]);
402 402
             $this->info['verbose'] = $verboseLog;
403 403
         }
404
-        Logger::log($this->url . ' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]);
404
+        Logger::log($this->url.' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]);
405 405
         $this->info = array_merge($this->info, curl_getinfo($this->con));
406 406
     }
407 407
 
Please login to merge, or discard this patch.
src/base/types/helpers/SlackHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
             'attachments' => [
30 30
                 [
31 31
                     "author_name" => $request->getRootUrl(true),
32
-                    "text" => $file . (strlen($line) ? ' [' . $line . ']' : ''),
32
+                    "text" => $file.(strlen($line) ? ' ['.$line.']' : ''),
33 33
                     "color" => Config::getParam('debug', true) ? 'warning' : "danger",
34 34
                     "title" => $message,
35 35
                     'fallback' => 'PSFS Error notifier',
Please login to merge, or discard this patch.
src/base/types/Api.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -81,20 +81,20 @@  discard block
 block discarded – undo
81 81
     public function init()
82 82
     {
83 83
         parent::init();
84
-        Logger::log(static::class . ' init', LOG_DEBUG);
84
+        Logger::log(static::class.' init', LOG_DEBUG);
85 85
         $this->domain = $this->getDomain();
86 86
         $this->hydrateRequestData();
87 87
         $this->hydrateOrders();
88
-        if($this instanceof CustomApi === false) {
88
+        if ($this instanceof CustomApi === false) {
89 89
             $this->createConnection($this->getTableMap());
90 90
         }
91 91
         $this->checkFieldType();
92 92
         $this->setLoaded(true);
93
-        Logger::log(static::class . ' loaded', LOG_DEBUG);
93
+        Logger::log(static::class.' loaded', LOG_DEBUG);
94 94
     }
95 95
 
96 96
     private function checkActions($method) {
97
-        switch($method) {
97
+        switch ($method) {
98 98
             default:
99 99
             case 'modelList': $this->action = self::API_ACTION_LIST; break;
100 100
             case 'get': $this->action = self::API_ACTION_GET; break;
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     protected function hydrateOrders()
112 112
     {
113 113
         if (count($this->query)) {
114
-            Logger::log(static::class . ' gathering query string', LOG_DEBUG);
114
+            Logger::log(static::class.' gathering query string', LOG_DEBUG);
115 115
             foreach ($this->query as $key => $value) {
116 116
                 if ($key === self::API_ORDER_FIELD && is_array($value)) {
117 117
                     foreach ($value as $field => $direction) {
@@ -128,10 +128,10 @@  discard block
 block discarded – undo
128 128
      */
129 129
     protected function extractPagination()
130 130
     {
131
-        Logger::log(static::class . ' extract pagination start', LOG_DEBUG);
131
+        Logger::log(static::class.' extract pagination start', LOG_DEBUG);
132 132
         $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1;
133 133
         $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100;
134
-        Logger::log(static::class . ' extract pagination end', LOG_DEBUG);
134
+        Logger::log(static::class.' extract pagination end', LOG_DEBUG);
135 135
         return array($page, (int)$limit);
136 136
     }
137 137
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
      */
143 143
     private function addOrders(ModelCriteria &$query)
144 144
     {
145
-        Logger::log(static::class . ' extract orders start ', LOG_DEBUG);
145
+        Logger::log(static::class.' extract orders start ', LOG_DEBUG);
146 146
         $orderAdded = FALSE;
147 147
         $tableMap = $this->getTableMap();
148 148
         foreach ($this->order->getOrders() as $field => $direction) {
@@ -150,18 +150,18 @@  discard block
 block discarded – undo
150 150
                 $orderAdded = TRUE;
151 151
                 if ($direction === Order::ASC) {
152 152
                     $query->addAscendingOrderByColumn($column->getPhpName());
153
-                } else {
153
+                }else {
154 154
                     $query->addDescendingOrderByColumn($column->getPhpName());
155 155
                 }
156 156
             }
157 157
         }
158 158
         if (!$orderAdded) {
159 159
             $pks = $this->getPkDbName();
160
-            foreach(array_keys($pks) as $key) {
160
+            foreach (array_keys($pks) as $key) {
161 161
                 $query->addAscendingOrderByColumn($key);
162 162
             }
163 163
         }
164
-        Logger::log(static::class . ' extract orders end', LOG_DEBUG);
164
+        Logger::log(static::class.' extract orders end', LOG_DEBUG);
165 165
     }
166 166
 
167 167
     /**
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
             foreach ($this->query as $field => $value) {
177 177
                 if (self::API_COMBO_FIELD === $field) {
178 178
                     ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
179
-                } elseif(!preg_match('/^__/', $field)) {
179
+                } elseif (!preg_match('/^__/', $field)) {
180 180
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
181 181
                 }
182 182
             }
@@ -197,10 +197,10 @@  discard block
 block discarded – undo
197 197
             list($page, $limit) = $this->extractPagination();
198 198
             if ($limit === -1) {
199 199
                 $this->list = $query->find($this->con);
200
-            } else {
200
+            }else {
201 201
                 $this->list = $query->paginate($page, $limit, $this->con);
202 202
             }
203
-        } catch (\Exception $e) {
203
+        }catch (\Exception $e) {
204 204
             Logger::log($e->getMessage(), LOG_ERR);
205 205
         }
206 206
     }
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
         $code = 200;
220 220
         list($return, $total, $pages) = $this->getList();
221 221
         $message = null;
222
-        if(!$total) {
222
+        if (!$total) {
223 223
             $message = t('No se han encontrado elementos para la búsqueda');
224 224
         }
225 225
 
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
         $pages = 1;
246 246
         $message = null;
247 247
         list($code, $return) = $this->getSingleResult($pk);
248
-        if($code !== 200) {
248
+        if ($code !== 200) {
249 249
             $message = t('No se ha encontrado el elemento solicitado');
250 250
         }
251 251
 
@@ -274,13 +274,13 @@  discard block
 block discarded – undo
274 274
                 $status = 200;
275 275
                 $saved = TRUE;
276 276
                 $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
277
-            } else {
277
+            }else {
278 278
                 $message = t('No se ha podido guardar el modelo seleccionado');
279 279
             }
280
-        } catch (\Exception $e) {
281
-            $message = t('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage();
280
+        }catch (\Exception $e) {
281
+            $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
282 282
             $context = [];
283
-            if(null !== $e->getPrevious()) {
283
+            if (null !== $e->getPrevious()) {
284 284
                 $context[] = $e->getPrevious()->getMessage();
285 285
             }
286 286
             Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -316,18 +316,18 @@  discard block
 block discarded – undo
316 316
                     $updated = TRUE;
317 317
                     $status = 200;
318 318
                     $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
319
-                } else {
319
+                }else {
320 320
                     $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
321 321
                 }
322
-            } catch (\Exception $e) {
322
+            }catch (\Exception $e) {
323 323
                 $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
324 324
                 $context = [];
325
-                if(null !== $e->getPrevious()) {
325
+                if (null !== $e->getPrevious()) {
326 326
                     $context[] = $e->getPrevious()->getMessage();
327 327
                 }
328 328
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
329 329
             }
330
-        } else {
330
+        }else {
331 331
             $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar');
332 332
         }
333 333
 
@@ -355,15 +355,15 @@  discard block
 block discarded – undo
355 355
                 $this->con->beginTransaction();
356 356
                 $this->hydrateModel($pk);
357 357
                 if (NULL !== $this->model) {
358
-                    if(method_exists('clearAllReferences', $this->model)) {
358
+                    if (method_exists('clearAllReferences', $this->model)) {
359 359
                         $this->model->clearAllReferences(true);
360 360
                     }
361 361
                     $this->model->delete($this->con);
362 362
                     $deleted = TRUE;
363 363
                 }
364
-            } catch (\Exception $e) {
364
+            }catch (\Exception $e) {
365 365
                 $context = [];
366
-                if(null !== $e->getPrevious()) {
366
+                if (null !== $e->getPrevious()) {
367 367
                     $context[] = $e->getPrevious()->getMessage();
368 368
                 }
369 369
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
             $this->saveBulk();
393 393
             $saved = true;
394 394
             $status = 200;
395
-        } catch(\Exception $e) {
395
+        }catch (\Exception $e) {
396 396
             Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData());
397 397
             $message = t('Bulk insert rolled back');
398 398
         }
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 
415 415
         /** @var CustomerTableMap $tableMap */
416 416
         $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap());
417
-        foreach($this->list->getData() as $data) {
417
+        foreach ($this->list->getData() as $data) {
418 418
             $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data);
419 419
         }
420 420
         return $return;
@@ -431,23 +431,23 @@  discard block
 block discarded – undo
431 431
         try {
432 432
             $this->paginate();
433 433
             if (null !== $this->list) {
434
-                if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
434
+                if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
435 435
                     $return = $this->extractDataWithFormat();
436
-                } else {
436
+                }else {
437 437
                     $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false);
438 438
                 }
439 439
                 $total = 0;
440 440
                 $pages = 0;
441
-                if($this->list instanceof PropelModelPager) {
441
+                if ($this->list instanceof PropelModelPager) {
442 442
                     $total = $this->list->getNbResults();
443 443
                     $pages = $this->list->getLastPage();
444
-                } elseif($this->list instanceof ArrayCollection) {
444
+                } elseif ($this->list instanceof ArrayCollection) {
445 445
                     $total = count($return);
446 446
                     $pages = 1;
447 447
                 }
448 448
             }
449
-        } catch (\Exception $e) {
450
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
449
+        }catch (\Exception $e) {
450
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
451 451
         }
452 452
 
453 453
         return array($return, $total, $pages);
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
         $return = array();
466 466
         if (NULL === $model || !method_exists($model, 'toArray')) {
467 467
             $code = 404;
468
-        } else {
468
+        }else {
469 469
             $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
470 470
         }
471 471
 
Please login to merge, or discard this patch.
src/base/config/LoginForm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
             ))
38 38
             ->addButton('submit', t("Acceder como {{username}}"))
39 39
             ->addButton("cancel", t("Cancelar"), "button", array(
40
-                "onclick" => "javacript:location.href = \"" . Router::getInstance()->getRoute('') . "\";",
40
+                "onclick" => "javacript:location.href = \"".Router::getInstance()->getRoute('')."\";",
41 41
                 "class" => "btn-link",
42 42
             ));
43 43
     }
Please login to merge, or discard this patch.
src/base/config/ConfigForm.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -83,9 +83,9 @@
 block discarded – undo
83 83
             'class' => 'btn-warning md-default',
84 84
             'icon' => 'fa-plus',
85 85
         ];
86
-        if(Config::getParam('admin.version', 'v1') === 'v1') {
87
-            $add['onclick'] = 'javascript:addNewField(document.getElementById("' . $this->getName() . '"));';
88
-        } else {
86
+        if (Config::getParam('admin.version', 'v1') === 'v1') {
87
+            $add['onclick'] = 'javascript:addNewField(document.getElementById("'.$this->getName().'"));';
88
+        }else {
89 89
             $add['ng-click'] = 'addNewField()';
90 90
         }
91 91
         $this->addButton('submit', t('Guardar configuración'), 'submit', array(
Please login to merge, or discard this patch.