Merge branch '10.x'

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php

@@ -53,4 +53,14 @@ public static function skipWhen(Closure $callback)
     {
         static::$skipCallbacks[] = $callback;
     }
+
+    /**
+     * Flush the middleware's global state.
+     *
+     * @return void
+     */
+    public static function flushState()
+    {
+        static::$skipCallbacks = [];
+    }
 }

src/Illuminate/Foundation/Http/Middleware/TrimStrings.php

@@ -91,4 +91,14 @@ public static function skipWhen(Closure $callback)
     {
         static::$skipCallbacks[] = $callback;
     }
+
+    /**
+     * Flush the middleware's global state.
+     *
+     * @return void
+     */
+    public static function flushState()
+    {
+        static::$skipCallbacks = [];
+    }
 }

src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php

@@ -297,7 +297,7 @@ public function disableCookieEncryption()
     }
 
     /**
-     * Set the referer header and previous URL session value in order to simulate a previous request.
+     * Set the referer header and previous URL session value from a given URL in order to simulate a previous request.
      *
      * @param  string  $url
      * @return $this
@@ -309,6 +309,18 @@ public function from(string $url)
         return $this->withHeader('referer', $url);
     }
 
+    /**
+     * Set the referer header and previous URL session value from a given route in order to simulate a previous request.
+     *
+     * @param  string  $name
+     * @param  mixed  $parameters
+     * @return $this
+     */
+    public function fromRoute(string $name, $parameters = [])
+    {
+        return $this->from($this->app['url']->route($name, $parameters));
+    }
+
     /**
      * Set the Precognition header to "true".
      *

src/Illuminate/Foundation/Testing/TestCase.php

@@ -6,6 +6,8 @@
 use Illuminate\Console\Application as Artisan;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Bootstrap\HandleExceptions;
+use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
+use Illuminate\Foundation\Http\Middleware\TrimStrings;
 use Illuminate\Queue\Queue;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Facade;
@@ -234,9 +236,11 @@ protected function tearDown(): void
         Component::flushCache();
         Component::forgetComponentsResolver();
         Component::forgetFactory();
-        Queue::createPayloadUsing(null);
+        ConvertEmptyStringsToNull::flushState();
         HandleExceptions::forgetApp();
+        Queue::createPayloadUsing(null);
         Sleep::fake(false);
+        TrimStrings::flushState();
 
         if ($this->callbackException) {
             throw $this->callbackException;

tests/Foundation/Testing/Concerns/MakesHttpRequestsTest.php

@@ -18,6 +18,18 @@ public function testFromSetsHeaderAndSession()
         $this->assertSame('previous/url', $this->app['session']->previousUrl());
     }
 
+    public function testFromRouteSetsHeaderAndSession()
+    {
+        $router = $this->app->make(Registrar::class);
+
+        $router->get('previous/url', fn () => 'ok')->name('previous-url');
+
+        $this->fromRoute('previous-url');
+
+        $this->assertSame('http://localhost/previous/url', $this->defaultHeaders['referer']);
+        $this->assertSame('http://localhost/previous/url', $this->app['session']->previousUrl());
+    }
+
     public function testWithTokenSetsAuthorizationHeader()
     {
         $this->withToken('foobar');