phpffcms / ffcms-core

src/Network/Request/MultiLanguageFeatures.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 
         // 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;
             }
@@ -80,11 +80,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
-        $redirectUrl = $this->getSchemeAndHttpHost() . $this->basePath . '/' . $userLang . $this->getPathInfo() . $queryString;
+        $redirectUrl = $this->getSchemeAndHttpHost().$this->basePath.'/'.$userLang.$this->getPathInfo().$queryString;
         $response = new RedirectResponse($redirectUrl);
         $response->send();
         exit();

src/Network/Request.php

Spacing +5 added lines, -5 removed lines

@@ -58,11 +58,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
@@ -95,7 +95,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;
     }
@@ -129,7 +129,7 @@ 
      */
     public function getFullUrl(): string
     {
-        return $this->getSchemeAndHttpHost() . $this->getRequestUri();
+        return $this->getSchemeAndHttpHost().$this->getRequestUri();
     }
 
     /**
@@ -156,7 +156,7 @@ 
         $url = $this->getSchemeAndHttpHost();
         $sub = null;
         if ($this->getInterfaceSlug() && Str::length($this->getInterfaceSlug()) > 0) {
-            $sub = $this->getInterfaceSlug() . '/';
+            $sub = $this->getInterfaceSlug().'/';
         }
 
         if ($this->languageInPath()) {