phpffcms / ffcms-core

src/Ffcms/Core/Network/Request.php

Spacing +10 added lines, -10 removed lines

@@ -60,11 +60,11 @@ 
 
         $basePath = trim(App::$Properties->get('basePath'), '/');
         if ($basePath !== null && Str::length($basePath) > 0) {
-            $basePath = '/' . $basePath;
+            $basePath = '/'.$basePath;
         }
 
         if (!defined('env_no_uri') || env_no_uri === false) {
-            $basePath .= '/' . strtolower(env_name);
+            $basePath .= '/'.strtolower(env_name);
         }
 
         // we never try to use path's without friendly url's
@@ -90,7 +90,7 @@ 
             } else {
                 // try to find language in pathway
                 foreach (App::$Properties->get('languages') as $lang) {
-                    if (Str::startsWith('/' . $lang, $this->getPathInfo())) {
+                    if (Str::startsWith('/'.$lang, $this->getPathInfo())) {
                         $this->language = $lang;
                         $this->languageInPath = true;
                     }
@@ -117,11 +117,11 @@ 
                     // parse query string
                     $queryString = null;
                     if (count($this->query->all()) > 0) {
-                        $queryString = '?' . http_build_query($this->query->all());
+                        $queryString = '?'.http_build_query($this->query->all());
                     }
 
                     // build response with redirect to language-based path
-                    $response = new Redirect($this->getSchemeAndHttpHost() . $this->basePath . '/' . $userLang . $this->getPathInfo() . $queryString);
+                    $response = new Redirect($this->getSchemeAndHttpHost().$this->basePath.'/'.$userLang.$this->getPathInfo().$queryString);
                     $response->send();
                     exit();
                 }
@@ -180,7 +180,7 @@ 
         if (array_key_exists($pathway, $routing['Redirect'])) {
             $target = $this->getSchemeAndHttpHost(); // . $this->getBasePath() . '/' . rtrim($routing['Redirect'][$pathway], '/');
             if ($this->getBasePath() !== null && !Str::likeEmpty($this->getBasePath())) {
-                $target .= '/' . $this->getBasePath();
+                $target .= '/'.$this->getBasePath();
             }
             $target .= rtrim($routing['Redirect'][$pathway], '/');
             $redirect = new Redirect($target);
@@ -206,9 +206,9 @@ 
             // find "new path" as binding uri slug
             $binding = array_search($pathway, $map, true);
             // build url to redirection
-            $url = $this->getSchemeAndHttpHost() . $this->getBasePath() . '/';
+            $url = $this->getSchemeAndHttpHost().$this->getBasePath().'/';
             if (App::$Properties->get('multiLanguage')) {
-                $url .= $this->language . '/';
+                $url .= $this->language.'/';
             }
             $url .= ltrim($binding, '/');
 
@@ -302,7 +302,7 @@ 
     {
         $route = $this->languageInPath ? Str::sub(parent::getPathInfo(), Str::length($this->language) + 1) : parent::getPathInfo();
         if (!Str::startsWith('/', $route))
-            $route = '/' . $route;
+            $route = '/'.$route;
         return $route;
     }
 
@@ -466,7 +466,7 @@ 
      */
     public function getFullUrl(): string
     {
-        return $this->getSchemeAndHttpHost() . $this->getRequestUri();
+        return $this->getSchemeAndHttpHost().$this->getRequestUri();
     }
 
     /**

Braces +6 added lines, -4 removed lines

@@ -301,8 +301,9 @@ 
     public function getPathInfo()
     {
         $route = $this->languageInPath ? Str::sub(parent::getPathInfo(), Str::length($this->language) + 1) : parent::getPathInfo();
-        if (!Str::startsWith('/', $route))
-            $route = '/' . $route;
+        if (!Str::startsWith('/', $route)) {
+                    $route = '/' . $route;
+        }
         return $route;
     }
 
@@ -445,8 +446,9 @@ 
     public function getPathWithoutControllerAction(): ?string
     {
         $path = trim($this->getPathInfo(), '/');
-        if ($this->aliasPathTarget !== null)
-            $path = trim($this->aliasPathTarget, '/');
+        if ($this->aliasPathTarget !== null) {
+                    $path = trim($this->aliasPathTarget, '/');
+        }
 
         $pathArray = explode('/', $path);
         if ($pathArray[0] === Str::lowerCase($this->getController())) {