psfs / core

src/base/types/CustomAuthApi.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public function init()
     {
-        if(!Security::getInstance()->isLogged()) {
+        if (!Security::getInstance()->isLogged()) {
             throw new ApiException(t('Resource not authorized'), 401);
         }
         parent::init();

src/base/types/traits/Api/ConnectionTrait.php

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
     {
         $this->con = Propel::getConnection($tableMap::DATABASE_NAME);
         $this->con->beginTransaction();
-        if(method_exists($this->con, 'useDebug')) {
+        if (method_exists($this->con, 'useDebug')) {
             Logger::log('Enabling debug queries mode', LOG_INFO);
             $this->con->useDebug(Config::getParam('debug'));
         }
@@ -45,12 +45,12 @@ 
      */
     protected function closeTransaction($status)
     {
-        if(null !== $this->con) {
+        if (null !== $this->con) {
             $this->traceDebugQuery();
             if (null !== $this->con && $this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -64,7 +64,7 @@ 
     protected function traceDebugQuery()
     {
         if (Config::getParam('debug')) {
-            Logger::log($this->con->getLastExecutedQuery()?: 'Empty Query', LOG_DEBUG);
+            Logger::log($this->con->getLastExecutedQuery() ?: 'Empty Query', LOG_DEBUG);
         }
     }
 
@@ -72,13 +72,13 @@ 
      * Checks if the connection has a transaction initialized
      */
     protected function checkTransaction() {
-        if(null !== $this->con && !$this->con->inTransaction()) {
+        if (null !== $this->con && !$this->con->inTransaction()) {
             $this->con->beginTransaction();
         }
-        if(null !== $this->con && $this->con->inTransaction()) {
+        if (null !== $this->con && $this->con->inTransaction()) {
             $this->items++;
         }
-        if($this->items >= Config::getParam('api.block.limit', 1000)) {
+        if ($this->items >= Config::getParam('api.block.limit', 1000)) {
             $this->con->commit();
             $this->items = 0;
         }

src/base/types/helpers/ServiceHelper.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     }
 
     public static function parseRawData($type, array $params = []) {
-        switch($type) {
+        switch ($type) {
             default:
             case self::TYPE_HTTP:
                 $parsedParams = http_build_query($params);

src/base/Service.php

Spacing +15 added lines, -15 removed lines

@@ -70,7 +70,7 @@ 
     protected $isMultipart = false;
 
     private function closeConnection() {
-        if(null !== $this->con) {
+        if (null !== $this->con) {
             curl_close($this->con);
         }
     }
@@ -233,7 +233,7 @@ 
      */
     public function setIsJson($isJson = true) {
         $this->isJson = $isJson;
-        if($isJson) {
+        if ($isJson) {
             $this->setIsMultipart(false);
         }
     }
@@ -251,7 +251,7 @@ 
      */
     public function setIsMultipart($isMultipart = true) {
         $this->isMultipart = $isMultipart;
-        if($isMultipart) {
+        if ($isMultipart) {
             $this->setIsJson(false);
         }
     }
@@ -271,7 +271,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();
     }
 
@@ -314,18 +314,18 @@ 
     }
 
     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;
         }
         $headers[self::PSFS_TRACK_HEADER] = Logger::getUid();
-        if(count($headers)) {
+        if (count($headers)) {
             curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers);
         }
     }
@@ -334,10 +334,10 @@ 
      * @return int
      */
     private function parseServiceType() {
-        if($this->getIsJson()) {
+        if ($this->getIsJson()) {
             return ServiceHelper::TYPE_JSON;
         }
-        if($this->getIsMultipart()) {
+        if ($this->getIsMultipart()) {
             return ServiceHelper::TYPE_MULTIPART;
         }
         return ServiceHelper::TYPE_HTTP;
@@ -350,9 +350,9 @@ 
             case Request::VERB_GET:
             default:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_GET);
-                if(!empty($this->params)) {
+                if (!empty($this->params)) {
                     $sep = false !== strpos($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:
@@ -384,14 +384,14 @@ 
         $this->applyOptions();
         $this->applyHeaders();
         $verbose = null;
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             curl_setopt($this->con, CURLOPT_VERBOSE, true);
             $verbose = fopen('php://temp', 'wb+');
             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, is_array($this->result) ? $this->result : [$this->result]);
+        Logger::log($this->url.' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$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;
     }
@@ -260,7 +260,7 @@ 
             $url = $this->getServer('HTTP_ORIGIN');
         }
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(t('Redireccionando...'));
@@ -305,10 +305,10 @@ 
         $url = $this->getServerName();
         $protocol = $hasProtocol ? $this->getProtocol() : '';
         if (!empty($protocol)) {
-            $url = $protocol . $url;
+            $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;
     }

src/base/extension/TemplateFunctions.php

Spacing +7 added lines, -7 removed lines

@@ -39,13 +39,13 @@ 
 
         $filePath = '';
         if (!file_exists($filePath)) {
-            $filePath = BASE_DIR . $string;
+            $filePath = BASE_DIR.$string;
         }
         $filenamePath = AssetsParser::findDomainPath($string, $filePath);
 
         $filePath = self::processAsset($string, $name, $return, $filenamePath);
         $basePath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl());
-        $returnPath = empty($name) ? $basePath . '/' . $filePath : $name;
+        $returnPath = empty($name) ? $basePath.'/'.$filePath : $name;
         return $return ? $returnPath : '';
     }
 
@@ -62,7 +62,7 @@ 
         $router = Router::getInstance();
         try {
             return $router->getRoute($path, $absolute, $params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $router->getRoute('', $absolute, $params);
         }
     }
@@ -205,9 +205,9 @@ 
     {
         $data = file_get_contents($filenamePath);
         if (!empty($name)) {
-            file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
+            file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data);
         }else {
-            file_put_contents($base . $filePath, $data);
+            file_put_contents($base.$filePath, $data);
         }
     }
 
@@ -226,9 +226,9 @@ 
         if (file_exists($filenamePath)) {
             list($base, $htmlBase, $filePath) = AssetsParser::calculateAssetPath($string, $name, $return, $filenamePath);
             //Creamos el directorio si no existe
-            GeneratorHelper::createDir($base . $htmlBase);
+            GeneratorHelper::createDir($base.$htmlBase);
             //Si se ha modificado
-            if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($filenamePath)) {
+            if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($filenamePath)) {
                 if ($htmlBase === 'css') {
                     self::processCssLines($filenamePath);
                 }

Braces +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
         $data = file_get_contents($filenamePath);
         if (!empty($name)) {
             file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
-        }else {
+        } else {
             file_put_contents($base . $filePath, $data);
         }
     }

src/base/types/helpers/RouterHelper.php

Spacing +14 added lines, -14 removed lines

@@ -19,11 +19,11 @@ 
     public static function getClassToCall(array $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'];
         $reflectionClass = new \ReflectionClass($actionClass);
-        if($reflectionClass->hasMethod('getInstance')) {
+        if ($reflectionClass->hasMethod('getInstance')) {
             $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']);
-        } else {
+        }else {
             $class = new $actionClass;
         }
         return $class;
@@ -112,7 +112,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;
     }
 
@@ -123,8 +123,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;
         $templatesPath = 'templates';
         $publicPath = 'public';
         $modelsPath = 'models';
@@ -134,13 +134,13 @@ 
             $modelsPath = ucfirst($modelsPath);
         }
         if ($class->hasConstant('TPL')) {
-            $templatesPath .= DIRECTORY_SEPARATOR . $class->getConstant('TPL');
+            $templatesPath .= DIRECTORY_SEPARATOR.$class->getConstant('TPL');
         }
         return [
             'base' => $path,
-            'template' => $path . $templatesPath,
-            'model' => $path . $modelsPath,
-            'public' => $path . $publicPath,
+            'template' => $path.$templatesPath,
+            'model' => $path.$modelsPath,
+            'public' => $path.$publicPath,
         ];
     }
 
@@ -164,12 +164,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;
         }
 
@@ -251,7 +251,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(),

src/base/types/helpers/RequestHelper.php

Spacing +3 added lines, -3 removed lines

@@ -45,10 +45,10 @@ 
                 if (!headers_sent()) {
                     // 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 @@ 
                         return $ip;
                     }
                 }
-            } else {
+            }else {
                 if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                     return $_SERVER['HTTP_X_FORWARDED_FOR'];
                 }

src/base/types/traits/Api/ApiTrait.php

Spacing +15 added lines, -15 removed lines

@@ -96,15 +96,15 @@ 
     protected function hydrateBulkRequest() {
         $class = new \ReflectionClass($this->getModelNamespace());
         $this->list = [];
-        foreach($this->data as $item) {
-            if(is_array($item)) {
-                if(count($this->list) < Config::getParam('api.block.limit', 1000)) {
+        foreach ($this->data as $item) {
+            if (is_array($item)) {
+                if (count($this->list) < Config::getParam('api.block.limit', 1000)) {
                     /** @var ActiveRecordInterface $model */
                     $model = $class->newInstance();
                     $this->hydrateModelFromRequest($model, $item);
                     $this->list[] = $model;
-                } else {
-                    Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . t('items'));
+                }else {
+                    Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data).t('items'));
                 }
             }
         }
@@ -115,12 +115,12 @@ 
      */
     protected function saveBulk() {
         $tablemap = $this->getTableMap();
-        foreach($this->list as &$model) {
+        foreach ($this->list as &$model) {
             $con = Propel::getWriteConnection($tablemap::DATABASE_NAME);
             try {
                 $model->save($con);
                 $con->commit();
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, $model->toArray());
                 $con->rollBack();
             }
@@ -133,7 +133,7 @@ 
     protected function exportList() {
         $list = [];
         /** @var ActiveRecordInterface $item */
-        foreach($this->list as $item) {
+        foreach ($this->list as $item) {
             $list[] = $item->toArray();
         }
         return $list;
@@ -157,18 +157,18 @@ 
      */
     protected function findPk(ModelCriteria $query, $primaryKey) {
         $pks = explode(Api::API_PK_SEPARATOR, urldecode($primaryKey));
-        if(count($pks) === 1 && !empty($pks[0])) {
+        if (count($pks) === 1 && !empty($pks[0])) {
             $query->filterByPrimaryKey($pks[0]);
-        } else {
+        }else {
             $item = 0;
-            foreach($this->getPkDbName() as $phpName) {
+            foreach ($this->getPkDbName() as $phpName) {
                 try {
                     $query->filterBy($phpName, $pks[$item]);
                     $item++;
-                    if($item >= count($pks)) {
+                    if ($item >= count($pks)) {
                         break;
                     }
-                } catch(\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_DEBUG);
                 }
             }
@@ -198,8 +198,8 @@ 
         try {
             $query = $this->prepareQuery();
             $this->model = $this->findPk($query, $primaryKey);
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
     }