Update tests and make the exception message more clear on PHP 7.2

symfony · Sep 19, 2020 · 45a3bf2 · 45a3bf2
1 parent 899ef81
commit 45a3bf2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1588,7 +1588,7 @@ public function toArray(): array
         }
 
         if (\PHP_VERSION_ID < 70300 && \JSON_ERROR_NONE !== json_last_error()) {
-            throw new JsonException(json_last_error_msg(), json_last_error());
+            throw new JsonException('Could not decode request body: ' . json_last_error_msg(), json_last_error());
         }
 
         if (!\is_array($content)) {

diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1263,7 +1263,7 @@ public function testToArrayNonJson()
     {
         $req = new Request([], [], [], [], [], [], 'foobar');
         $this->expectException(JsonException::class);
-        $this->expectExceptionMessage('Could not decode request body.');
+        $this->expectExceptionMessageMatches('|Could not decode request body.+|');
         $req->toArray();
     }