Fix usage of config before its resolved

laravel · Apr 1, 2024 · 8e0eb64 · 8e0eb64
1 parent 978ee88
commit 8e0eb64
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/Illuminate/Http/Middleware/TrustHosts.php b/src/Illuminate/Http/Middleware/TrustHosts.php
@@ -21,6 +21,13 @@ class TrustHosts
      */
     protected static $alwaysTrust;
 
+    /**
+     * Whether to trust subdomains of the application url.
+     *
+     * @var bool|null
+     */
+    protected static $subdomains;
+
     /**
      * Create a new middleware instance.
      *
@@ -39,9 +46,17 @@ public function __construct(Application $app)
      */
     public function hosts()
     {
-        return is_array(static::$alwaysTrust)
-            ? static::$alwaysTrust
-            : [$this->allSubdomainsOfApplicationUrl()];
+        if (is_array(static::$alwaysTrust)) {
+            $hosts = static::$alwaysTrust;
+
+            if (static::$subdomains) {
+                $hosts[] = $this->allSubdomainsOfApplicationUrl();
+            }
+
+            return $hosts;
+        }
+
+        return [$this->allSubdomainsOfApplicationUrl()];
     }
 
     /**
@@ -69,13 +84,8 @@ public function handle(Request $request, $next)
      */
     public static function at(array $hosts, bool $subdomains = true)
     {
-        if ($subdomains) {
-            if ($host = parse_url(config('app.url'), PHP_URL_HOST)) {
-                $hosts[] = '^(.+\.)?'.preg_quote($host).'$';
-            }
-        }
-
         static::$alwaysTrust = $hosts;
+        static::$subdomains = $subdomains;
     }
 
     /**
@@ -109,5 +119,6 @@ protected function allSubdomainsOfApplicationUrl()
     public static function flushState()
     {
         static::$alwaysTrust = null;
+        static::$subdomains = null;
     }
 }
diff --git a/tests/Foundation/Configuration/MiddlewareTest.php b/tests/Foundation/Configuration/MiddlewareTest.php
@@ -219,9 +219,6 @@ protected function allSubdomainsOfApplicationUrl()
         $configuration->trustHosts();
         $this->assertEquals(['^(.+\.)?laravel\.test$'], $middleware->hosts());
 
-        app()['config'] = Mockery::mock(Repository::class);
-        app()['config']->shouldReceive('get')->with('app.url', null)->times(3)->andReturn('http://laravel.test');
-
         $configuration->trustHosts(at: ['my.test']);
         $this->assertEquals(['my.test', '^(.+\.)?laravel\.test$'], $middleware->hosts());