Merge branch '6.3' into 6.4

* 6.3:
  [FrameworkBundle] Fixed parsing new JSON output of debug:config not possible
  [DependencyInjection] Skip errored definitions deep-referenced as runtime exceptions
  [AssetMapper] Allow DirectoryResource for cache
  [PhpUnitBridge] Require PHPUnit 9.6 by default
  [WebProfilerBundle] Fix the accessibility of some background color
  [HttpKernel] Nullable and default value arguments in RequestPayloadValueResolver
  [WebProfilerBundle] right blocks: fix display
  [Messenger] Preserve existing Doctrine schema
  [Serializer] Refactor tests to not extends ObjectNormalizer
  [HttpFoundation] Make Request::getPayload() return an empty InputBag if request body is empty
  [HttpClient] Explicitly exclude CURLOPT_POSTREDIR
  [FrameworkBundle] Fix setting decorated services during tests

Author: nicolas-grekas

Request.php

@@ -1513,7 +1513,25 @@ public function getContent(bool $asResource = false)
      */
     public function getPayload(): InputBag
     {
-        return $this->request->count() ? clone $this->request : new InputBag($this->toArray());
+        if ($this->request->count()) {
+            return clone $this->request;
+        }
+
+        if ('' === $content = $this->getContent()) {
+            return new InputBag([]);
+        }
+
+        try {
+            $content = json_decode($content, true, 512, \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
+            throw new JsonException('Could not decode request body.', $e->getCode(), $e);
+        }
+
+        if (!\is_array($content)) {
+            throw new JsonException(sprintf('JSON content was expected to decode to an array, "%s" returned.', get_debug_type($content)));
+        }
+
+        return new InputBag($content);
     }
 
     /**

Session/Storage/Handler/SessionHandlerFactory.php

@@ -15,7 +15,6 @@
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Tools\DsnParser;
-use Doctrine\ORM\ORMSetup;
 use Relay\Relay;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 
@@ -73,7 +72,7 @@ public static function createHandler(object|string $connection, array $options =
                 }
                 $connection[3] = '-';
                 $params = class_exists(DsnParser::class) ? (new DsnParser())->parse($connection) : ['url' => $connection];
-                $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+                $config = new Configuration();
                 if (class_exists(DefaultSchemaManagerFactory::class)) {
                     $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
                 }

Tests/RequestTest.php

@@ -1309,6 +1309,9 @@ public function testGetPayload()
 
         $req = new Request([], ['foo' => 'bar'], [], [], [], [], json_encode(['baz' => 'qux']));
         $this->assertSame(['foo' => 'bar'], $req->getPayload()->all());
+
+        $req = new Request([], [], [], [], [], [], '');
+        $this->assertSame([], $req->getPayload()->all());
     }
 
     /**