Optimize Router::fullBaseUrl().

With this change setting App.fullBaseUrl after Router::fullBaseUrl() is called will have no effect.
cakephp · Sep 23, 2019 · 534fa6d · 534fa6d
1 parent f6d6522
commit 534fa6d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -557,15 +557,18 @@ public static function routeExists($url = null, bool $full = false): bool
      */
     public static function fullBaseUrl(?string $base = null): string
     {
+        if ($base === null && static::$_fullBaseUrl !== null) {
+            return static::$_fullBaseUrl;
+        }
+
         if ($base !== null) {
             static::$_fullBaseUrl = $base;
             Configure::write('App.fullBaseUrl', $base);
-        }
-        if (!static::$_fullBaseUrl) {
+        } else {
             static::$_fullBaseUrl = Configure::read('App.fullBaseUrl');
         }
 
-        return (string)static::$_fullBaseUrl;
+        return static::$_fullBaseUrl;
     }
 
     /**

diff --git a/tests/TestCase/Routing/RouterTest.php b/tests/TestCase/Routing/RouterTest.php
@@ -40,8 +40,7 @@ public function setUp(): void
     {
         parent::setUp();
         Configure::write('Routing', ['admin' => null, 'prefixes' => []]);
-        Router::fullBaseUrl('');
-        Configure::write('App.fullBaseUrl', 'http://localhost');
+        Router::reload();
     }
 
     /**
@@ -53,7 +52,6 @@ public function tearDown(): void
     {
         parent::tearDown();
         $this->clearPlugins();
-        Router::reload();
         Router::defaultRouteClass('Cake\Routing\Route\Route');
     }