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;
     }
@@ -427,7 +427,7 @@ 
      */
     public function getFullUrl()
     {
-        return $this->getSchemeAndHttpHost() . $this->getRequestUri();
+        return $this->getSchemeAndHttpHost().$this->getRequestUri();
     }
 
     /**

src/Ffcms/Core/Helper/HTML/System/NativeGenerator.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
             $purifier = App::$Memory->get('object.purifier.helpers');
         } else {
             $config = \HTMLPurifier_Config::createDefault();
-            $config->set('Cache.SerializerPath', root . '/Private/Cache/HTMLPurifier/');
+            $config->set('Cache.SerializerPath', root.'/Private/Cache/HTMLPurifier/');
             $config->set('AutoFormat.AutoParagraph', false);
 
             // allow use target=_blank for links
@@ -65,9 +65,9 @@ 
         $build = null;
         foreach ($property as $p => $v) {
             if ($v === null || $v === false || $v === true) {
-                $build .= ' ' . self::nohtml($p);
+                $build .= ' '.self::nohtml($p);
             } else {
-                $build .= ' ' . self::nohtml($p) . '="' . self::nohtml($v) . '"';
+                $build .= ' '.self::nohtml($p).'="'.self::nohtml($v).'"';
             }
         }
         return $build;
@@ -82,7 +82,7 @@ 
      */
     public static function buildSingleTag($tagName, array $property = null, $closeSlash = true)
     {
-        return '<' . self::nohtml($tagName) . self::applyProperty($property) . ($closeSlash ? '/>' : '>');
+        return '<'.self::nohtml($tagName).self::applyProperty($property).($closeSlash ? '/>' : '>');
     }
 
     /**
@@ -100,7 +100,7 @@ 
             $value = self::nohtml($value);
         }
         
-        return '<' . $tagName . self::applyProperty($property) . '>' . $value . '</' . $tagName . '>';
+        return '<'.$tagName.self::applyProperty($property).'>'.$value.'</'.$tagName.'>';
     }
 
     /**
@@ -142,13 +142,13 @@ 
                 if (!Str::contains('/', $elementPoint) || count($elementArray) < 2) {
                     $active = $elementPoint === $currentPoint;
                 } else {
-                    $elementPoint = $elementArray[0] . '/' . $elementArray[1];
+                    $elementPoint = $elementArray[0].'/'.$elementArray[1];
                     $active = Str::startsWith($elementPoint, $currentPoint);
                 }
                 break;
             case 'id':
                 $elementArray = explode('/', $elementPoint);
-                $elementPoint = $elementArray[0] . '/' . $elementArray[1];
+                $elementPoint = $elementArray[0].'/'.$elementArray[1];
                 if ($elementArray[2] === null) { // looks like id is not defined in element
                     if (Str::contains('?', $currentPoint)) {
                         $currentPoint = Str::firstIn($currentPoint, '?');
@@ -157,7 +157,7 @@ 
                     $currentToId = implode('/', array_slice($currentArray, 0, 3));
                     $active = $elementPoint === $currentToId;
                 } else {
-                    $elementPoint .= '/' . $elementArray[2];
+                    $elementPoint .= '/'.$elementArray[2];
                     $active = Str::startsWith($elementPoint, $currentPoint);
                 }
                 break;
@@ -212,7 +212,7 @@ 
      */
     public static function convertLink($uri)
     {
-        $link = App::$Alias->baseUrl . '/';
+        $link = App::$Alias->baseUrl.'/';
         if (Obj::isArray($uri)) {
             $link .= Url::buildPathway($uri);
         } elseif (Str::startsWith('http', $uri)) {
@@ -232,7 +232,7 @@ 
      */
     public static function encode($uri)
     {
-        return implode('/', array_map(function($v){
+        return implode('/', array_map(function($v) {
             return urlencode($v);
         }, explode('/', $uri)));
     }