psfs / core

src/base/types/helpers/RequestHelper.php

Spacing +3 added lines, -3 removed lines

@@ -46,10 +46,10 @@ 
 
                     // TODO include this headers in Template class output method
                     header("Access-Control-Allow-Credentials: true");
-                    header("Access-Control-Allow-Origin: " . Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
+                    header("Access-Control-Allow-Origin: ".Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
                     header("Vary: Origin");
                     header("Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS");
-                    header("Access-Control-Allow-Headers: " . implode(', ', self::getCorsHeaders()));
+                    header("Access-Control-Allow-Headers: ".implode(', ', self::getCorsHeaders()));
                 }
                 if (Request::getInstance()->getMethod() === Request::VERB_OPTIONS) {
                     Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG);
@@ -78,7 +78,7 @@ 
                     if (self::validateIpAddress($ip))
                         return $ip;
                 }
-            } else {
+            }else {
                 if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR']))
                     return $_SERVER['HTTP_X_FORWARDED_FOR'];
             }

src/base/types/helpers/RouterHelper.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
     public static function getClassToCall($action)
     {
         Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action);
-        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\" . $action["class"];
+        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\".$action["class"];
         $class = method_exists($actionClass, "getInstance") ? $actionClass::getInstance() : new $actionClass;
         return $class;
     }
@@ -108,7 +108,7 @@ 
         $expr = preg_quote($expr, '/');
         $expr = str_replace('###', '(.*)', $expr);
         $expr2 = preg_replace('/\(\.\*\)$/', '', $expr);
-        $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path);
+        $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path);
         return $matched;
     }
 
@@ -119,8 +119,8 @@ 
      */
     public static function extractDomainInfo(\ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-        $path = realpath($path) . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+        $path = realpath($path).DIRECTORY_SEPARATOR;
         $tpl_path = "templates";
         $public_path = "public";
         $model_path = "models";
@@ -130,13 +130,13 @@ 
             $model_path = ucfirst($model_path);
         }
         if ($class->hasConstant("TPL")) {
-            $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+            $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
         }
         return [
             'base' => $path,
-            'template' => $path . $tpl_path,
-            'model' => $path . $model_path,
-            'public' => $path . $public_path,
+            'template' => $path.$tpl_path,
+            'model' => $path.$model_path,
+            'public' => $path.$public_path,
         ];
     }
 
@@ -160,12 +160,12 @@ 
             foreach ($parameters as $param) {
                 if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                     $params[$param->getName()] = $param->getDefaultValue();
-                    $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
-                } elseif(!$param->isOptional()) {
+                    $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex);
+                } elseif (!$param->isOptional()) {
                     $requirements[] = $param->getName();
                 }
             }
-        } else {
+        }else {
             $default = $regex;
         }
 
@@ -247,7 +247,7 @@ 
             $default = str_replace('{__DOMAIN__}', $module, $default);
             $httpMethod = self::extractReflectionHttpMethod($docComments);
             $label = self::extractReflectionLabel(str_replace('{__API__}', $api, $docComments));
-            $route = $httpMethod . "#|#" . $regex;
+            $route = $httpMethod."#|#".$regex;
             $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route);
             $info = [
                 'method' => $method->getName(),

Braces +3 added lines, -1 removed lines

@@ -59,8 +59,10 @@
         $_route = explode("/", $url['path']);
         $_pattern = explode("/", $pattern);
         $get = array();
-        if (!empty($_pattern)) foreach ($_pattern as $index => $component) {
+        if (!empty($_pattern)) {
+            foreach ($_pattern as $index => $component) {
             $_get = array();
+        }
             preg_match_all('/^\{(.*)\}$/i', $component, $_get);
             if (!empty($_get[1]) && isset($_route[$index])) {
                 $get[array_pop($_get[1])] = $_route[$index];

src/base/Service.php

Spacing +22 added lines, -22 removed lines

@@ -68,7 +68,7 @@ 
     protected $isMultipart = false;
 
     private function closeConnection() {
-        if(null !== $this->con) {
+        if (null !== $this->con) {
             curl_close($this->con);
         }
     }
@@ -231,7 +231,7 @@ 
      */
     public function setIsJson($isJson = true) {
         $this->isJson = $isJson;
-        if($isJson) {
+        if ($isJson) {
             $this->setIsMultipart(false);
         }
     }
@@ -248,7 +248,7 @@ 
      */
     public function setIsMultipart($isMultipart = true) {
         $this->isMultipart = $isMultipart;
-        if($isMultipart) {
+        if ($isMultipart) {
             $this->setIsJson(false);
         }
     }
@@ -268,7 +268,7 @@ 
         $this->url = NULL;
         $this->params = array();
         $this->headers = array();
-        Logger::log('Context service for ' . static::class . ' cleared!');
+        Logger::log('Context service for '.static::class.' cleared!');
         $this->closeConnection();
     }
 
@@ -311,17 +311,17 @@ 
     }
 
     protected function applyOptions() {
-        if(count($this->options)) {
+        if (count($this->options)) {
             curl_setopt_array($this->con, $this->options);
         }
     }
 
     protected function applyHeaders() {
         $headers = [];
-        foreach($this->headers as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+        foreach ($this->headers as $key => $value) {
+            $headers[] = $key.': '.$value;
         }
-        if(count($headers)) {
+        if (count($headers)) {
             curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers);
         }
     }
@@ -332,18 +332,18 @@ 
             case Request::VERB_GET:
             default:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_GET);
-                if(!empty($this->params)) {
+                if (!empty($this->params)) {
                     $sep = !preg_match('/\?/', $this->getUrl()) ? '?' : '';
-                    $this->url = $this->url . $sep . http_build_query($this->params);
+                    $this->url = $this->url.$sep.http_build_query($this->params);
                 }
                 break;
             case Request::VERB_POST:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_POST);
-                if($this->getIsJson()) {
+                if ($this->getIsJson()) {
                     $this->addOption(CURLOPT_POSTFIELDS, json_encode($this->params));
-                } elseif($this->getIsMultipart()) {
+                } elseif ($this->getIsMultipart()) {
                     $this->addOption(CURLOPT_POSTFIELDS, $this->params);
-                } else {
+                }else {
                     $this->addOption(CURLOPT_POSTFIELDS, http_build_query($this->params));
                 }
                 break;
@@ -353,21 +353,21 @@ 
             case Request::VERB_PUT:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_PUT);
 
-                if($this->getIsJson()) {
+                if ($this->getIsJson()) {
                     $this->addOption(CURLOPT_POSTFIELDS, json_encode($this->params));
-                } elseif($this->getIsMultipart()) {
+                } elseif ($this->getIsMultipart()) {
                     $this->addOption(CURLOPT_POSTFIELDS, $this->params);
-                } else {
+                }else {
                     $this->addOption(CURLOPT_POSTFIELDS, http_build_query($this->params));
                 }
                 break;
             case Request::VERB_PATCH:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_PATCH);
-                if($this->getIsJson()) {
+                if ($this->getIsJson()) {
                     $this->addOption(CURLOPT_POSTFIELDS, json_encode($this->params));
-                } elseif($this->getIsMultipart()) {
+                } elseif ($this->getIsMultipart()) {
                     $this->addOption(CURLOPT_POSTFIELDS, $this->params);
-                } else {
+                }else {
                     $this->addOption(CURLOPT_POSTFIELDS, http_build_query($this->params));
                 }
                 break;
@@ -384,14 +384,14 @@ 
         $this->setDefaults();
         $this->applyOptions();
         $this->applyHeaders();
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             curl_setopt($this->con, CURLOPT_VERBOSE, true);
             $verbose = fopen('php://temp', 'w+');
             curl_setopt($this->con, CURLOPT_STDERR, $verbose);
         }
         $result = curl_exec($this->con);
         $this->result = $this->isJson ? json_decode($result, true) : $result;
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             rewind($verbose);
             $verboseLog = stream_get_contents($verbose);
             Logger::log($verboseLog, LOG_DEBUG, [
@@ -401,7 +401,7 @@ 
             ]);
             $this->info['verbose'] = $verboseLog;
         }
-        Logger::log($this->url . ' response: ', LOG_DEBUG, $this->result);
+        Logger::log($this->url.' response: ', LOG_DEBUG, $this->result);
         $this->info = array_merge($this->info, curl_getinfo($this->con));
     }
 

src/base/Request.php

Spacing +8 added lines, -8 removed lines

@@ -145,7 +145,7 @@ 
      */
     public static function header($name, $default = null)
     {
-        return self::getInstance()->getHeader($name,  $default);
+        return self::getInstance()->getHeader($name, $default);
     }
 
     /**
@@ -158,10 +158,10 @@ 
         $header = null;
         if ($this->hasHeader($name)) {
             $header = $this->header[$name];
-        } else if(array_key_exists('h_' . strtolower($name), $this->query)) {
-            $header = $this->query['h_' . strtolower($name)];
-        } else if(array_key_exists('HTTP_' . strtoupper(str_replace('-', '_', $name)), $this->server)) {
-            $header = $this->server['HTTP_' . strtoupper(str_replace('-', '_', $name))];
+        }else if (array_key_exists('h_'.strtolower($name), $this->query)) {
+            $header = $this->query['h_'.strtolower($name)];
+        }else if (array_key_exists('HTTP_'.strtoupper(str_replace('-', '_', $name)), $this->server)) {
+            $header = $this->server['HTTP_'.strtoupper(str_replace('-', '_', $name))];
         }
         return $header ?: $default;
     }
@@ -258,7 +258,7 @@ 
     {
         if (null === $url) $url = $this->getServer('HTTP_ORIGIN');
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(_('Redireccionando...'));
@@ -302,9 +302,9 @@ 
     {
         $url = $this->getServerName();
         $protocol = $protocol ? $this->getProtocol() : '';
-        if (!empty($protocol)) $url = $protocol . $url;
+        if (!empty($protocol)) $url = $protocol.$url;
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443], true)) {
-            $url .= ':' . $this->getServer('SERVER_PORT');
+            $url .= ':'.$this->getServer('SERVER_PORT');
         }
         return $url;
     }

Braces +6 added lines, -2 removed lines

@@ -256,7 +256,9 @@ 
      */
     public function redirect($url = null)
     {
-        if (null === $url) $url = $this->getServer('HTTP_ORIGIN');
+        if (null === $url) {
+            $url = $this->getServer('HTTP_ORIGIN');
+        }
         ob_start();
         header('Location: ' . $url);
         ob_end_clean();
@@ -302,7 +304,9 @@ 
     {
         $url = $this->getServerName();
         $protocol = $protocol ? $this->getProtocol() : '';
-        if (!empty($protocol)) $url = $protocol . $url;
+        if (!empty($protocol)) {
+            $url = $protocol . $url;
+        }
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443], true)) {
             $url .= ':' . $this->getServer('SERVER_PORT');
         }