[11.x] Restore exceptions/errors to test assertion failure messages (#…

…51725) * Restore exceptions/errors to test assertion failure messages * Update Testbench * Fix tests on Windows * Update composer.json --------- Co-authored-by: Mior Muhammad Zaki <[email protected]>
laravel · Jun 6, 2024 · 8ce249a · 8ce249a
1 parent 454e9dc
commit 8ce249a
Show file tree

Hide file tree

Showing 7 changed files with 312 additions and 338 deletions.
diff --git a/composer.json b/composer.json
@@ -106,7 +106,7 @@
         "league/flysystem-sftp-v3": "^3.0",
         "mockery/mockery": "^1.6",
         "nyholm/psr7": "^1.2",
-        "orchestra/testbench-core": "^9.0.15",
+        "orchestra/testbench-core": "^9.1.4",
         "pda/pheanstalk": "^5.0",
         "phpstan/phpstan": "^1.4.7",
         "phpunit/phpunit": "^10.5|^11.0",

diff --git a/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php b/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
@@ -63,13 +63,6 @@ trait MakesHttpRequests
      */
     protected $withCredentials = false;
 
-    /**
-     * The latest test response (if any).
-     *
-     * @var \Illuminate\Testing\TestResponse|null
-     */
-    public static $latestResponse;
-
     /**
      * Define additional headers to be sent with the request.
      *
@@ -592,7 +585,7 @@ public function call($method, $uri, $parameters = [], $cookies = [], $files = []
             $response = $this->followRedirects($response);
         }
 
-        return static::$latestResponse = $this->createTestResponse($response, $request);
+        return $this->createTestResponse($response, $request);
     }
 
     /**

diff --git a/src/Illuminate/Foundation/Testing/TestCase.php b/src/Illuminate/Foundation/Testing/TestCase.php
@@ -5,7 +5,6 @@
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Application;
 use PHPUnit\Framework\TestCase as BaseTestCase;
-use Throwable;
 
 abstract class TestCase extends BaseTestCase
 {
@@ -42,8 +41,6 @@ public function createApplication()
      */
     protected function setUp(): void
     {
-        static::$latestResponse = null;
-
         $this->setUpTheTestEnvironment();
     }
 
@@ -57,20 +54,6 @@ protected function refreshApplication()
         $this->app = $this->createApplication();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function transformException(Throwable $error): Throwable
-    {
-        $response = static::$latestResponse ?? null;
-
-        if (! is_null($response)) {
-            $response->transformNotSuccessfulException($error);
-        }
-
-        return $error;
-    }
-
     /**
      * Clean up the testing environment before the next test.
      *
@@ -90,8 +73,6 @@ protected function tearDown(): void
      */
     public static function tearDownAfterClass(): void
     {
-        static::$latestResponse = null;
-
         static::tearDownAfterClassUsingTestCase();
     }
 }