phpffcms / ffcms-core

src/Ffcms/Core/Helper/Url.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
     public static function to($controller_action, $id = null, $add = null, array $params = null, $encode = true)
     {
         $pathway = self::buildPathway([$controller_action, $id, $add, $params], $encode);
-        return App::$Alias->baseUrl . '/' . $pathway;
+        return App::$Alias->baseUrl.'/'.$pathway;
     }
 
     /**
@@ -60,7 +60,7 @@ 
                 $controller = Str::lastIn($controller, '\\', true);
             }
 
-            $response = $controller . '/' . $action;
+            $response = $controller.'/'.$action;
         }
 
         // check if controller and action is defined
@@ -70,17 +70,17 @@ 
 
         // id is defined?
         if (isset($to[1]) && !Str::likeEmpty($to[1])) {
-            $response .= '/' . self::safeUri($to[1], $encode);
+            $response .= '/'.self::safeUri($to[1], $encode);
         }
 
         // add param is defined?
         if (isset($to[2]) && !Str::likeEmpty($to[2])) {
-            $response .= '/' . self::safeUri($to[2], $encode);
+            $response .= '/'.self::safeUri($to[2], $encode);
         }
 
         // try to find static alias
-        if (isset($routing['Alias'][env_name]) && Arr::in('/' . $response, $routing['Alias'][env_name])) {
-            $pathAlias = array_search('/' . $response, $routing['Alias'][env_name]);
+        if (isset($routing['Alias'][env_name]) && Arr::in('/'.$response, $routing['Alias'][env_name])) {
+            $pathAlias = array_search('/'.$response, $routing['Alias'][env_name]);
             if ($pathAlias !== false) {
                 $response = Str::lowerCase(trim($pathAlias, '/'));
             }
@@ -96,7 +96,7 @@ 
             }
             $queryString = http_build_query($to[3]);
             if (Str::length($queryString) > 0) {
-                $response .= '?' . http_build_query($to[3]);
+                $response .= '?'.http_build_query($to[3]);
             }
             if ($anchor !== false) {
                 $response .= $anchor;
@@ -118,7 +118,7 @@ 
     public static function buildPathwayFromRequest()
     {
         return self::buildPathway([
-            Str::lowerCase(App::$Request->getController()) . '/' . Str::lowerCase(App::$Request->getAction()),
+            Str::lowerCase(App::$Request->getController()).'/'.Str::lowerCase(App::$Request->getAction()),
             App::$Request->getID(),
             App::$Request->getAdd(),
             App::$Request->query->all()
@@ -140,9 +140,9 @@ 
             $to = [$to];
         }
         // call Url::to(args)
-        $callbackTo = call_user_func_array([__NAMESPACE__ . '\Url', 'to'], $to);
+        $callbackTo = call_user_func_array([__NAMESPACE__.'\Url', 'to'], $to);
 
-        return '<a href="' . $callbackTo . '"' . $compile_property . '>' . $name . '</a>';
+        return '<a href="'.$callbackTo.'"'.$compile_property.'>'.$name.'</a>';
     }
 
     /**
@@ -155,19 +155,19 @@ 
     {
         /** @var array $configs */
         $configs = \App::$Properties->getAll('default');
-        $httpHost = $configs['baseProto'] . '://' . $configs['baseDomain'];
+        $httpHost = $configs['baseProto'].'://'.$configs['baseDomain'];
         if ($configs['basePath'] !== '/') {
-            $httpHost .= $configs['basePath'] . '/';
+            $httpHost .= $configs['basePath'].'/';
         }
 
         // check if is this is URI not URL
         if (!Str::startsWith($httpHost, $uri)) {
             // check if lang is defined in URI or define it
             if ($lang !== null && $configs['multiLanguage'] && !Str::startsWith($lang, $uri)) {
-                $uri = $lang . '/' . ltrim($uri, '/');
+                $uri = $lang.'/'.ltrim($uri, '/');
             }
             // add basic httpHost data
-            $uri = rtrim($httpHost, '/') . '/' . ltrim($uri, '/');
+            $uri = rtrim($httpHost, '/').'/'.ltrim($uri, '/');
         }
 
         return $uri;

src/Ffcms/Core/Alias.php

Spacing +9 added lines, -9 removed lines

@@ -92,7 +92,7 @@ 
             $this->baseDomain = App::$Properties->get('baseDomain');
         }
         // build script url
-        $this->scriptUrl = App::$Request->getScheme() . '://' . $this->baseDomain;
+        $this->scriptUrl = App::$Request->getScheme().'://'.$this->baseDomain;
         if (App::$Properties->get('basePath') !== '/') {
             $this->scriptUrl .= rtrim(App::$Properties->get('basePath'), '/');
         }
@@ -104,22 +104,22 @@ 
 
         $this->baseUrlNoLang = $this->baseUrl;
         if (App::$Request->languageInPath() && App::$Request->getLanguage() !== null) {
-            $this->baseUrl .= '/' . App::$Request->getLanguage();
+            $this->baseUrl .= '/'.App::$Request->getLanguage();
         }
 
         // build vendor libs alias
-        $this->vendorNamedLibrary['js']['jquery'] = $this->scriptUrl . '/vendor/bower/jquery/dist/jquery.min.js';
-        $this->vendorNamedLibrary['css']['bootstrap'] = $this->scriptUrl . '/vendor/bower/bootstrap/dist/css/bootstrap.min.css';
-        $this->vendorNamedLibrary['js']['bootstrap'] = $this->scriptUrl . '/vendor/bower/bootstrap/dist/js/bootstrap.min.js';
-        $this->vendorNamedLibrary['css']['fa'] = $this->scriptUrl . '/vendor/bower/components-font-awesome/css/font-awesome.min.css';
-        $this->vendorNamedLibrary['js']['jquery-ui'] = $this->scriptUrl . '/vendor/bower/jquery-ui/jquery-ui.min.js';
-        $this->vendorNamedLibrary['css']['jquery-ui'] = $this->scriptUrl . '/vendor/bower/jquery-ui/themes/base/jquery-ui.min.css';
+        $this->vendorNamedLibrary['js']['jquery'] = $this->scriptUrl.'/vendor/bower/jquery/dist/jquery.min.js';
+        $this->vendorNamedLibrary['css']['bootstrap'] = $this->scriptUrl.'/vendor/bower/bootstrap/dist/css/bootstrap.min.css';
+        $this->vendorNamedLibrary['js']['bootstrap'] = $this->scriptUrl.'/vendor/bower/bootstrap/dist/js/bootstrap.min.js';
+        $this->vendorNamedLibrary['css']['fa'] = $this->scriptUrl.'/vendor/bower/components-font-awesome/css/font-awesome.min.css';
+        $this->vendorNamedLibrary['js']['jquery-ui'] = $this->scriptUrl.'/vendor/bower/jquery-ui/jquery-ui.min.js';
+        $this->vendorNamedLibrary['css']['jquery-ui'] = $this->scriptUrl.'/vendor/bower/jquery-ui/themes/base/jquery-ui.min.css';
 
         $themeAll = App::$Properties->get('theme');
         if (!isset($themeAll[env_name]) || Str::length($themeAll[env_name]) < 1) {
             $themeAll[env_name] = 'default';
         }
-        $this->currentViewUrl = $this->scriptUrl . '/Apps/View/' . env_name . '/' . $themeAll[env_name];
+        $this->currentViewUrl = $this->scriptUrl.'/Apps/View/'.env_name.'/'.$themeAll[env_name];
     }
 
     /**