Merge branch '2.2'

Author: dunglas

src/Bridge/Symfony/Routing/CachedRouteNameResolver.php

@@ -39,7 +39,8 @@ public function __construct(CacheItemPoolInterface $cacheItemPool, RouteNameReso
      */
     public function getRouteName(string $resourceClass, $operationType /**, array $context = []**/): string
     {
-        $cacheKey = self::CACHE_KEY_PREFIX.md5(serialize([$resourceClass, $operationType]));
+        $context = \func_num_args() > 2 ? func_get_arg(2) : [];
+        $cacheKey = self::CACHE_KEY_PREFIX.md5(serialize([$resourceClass, $operationType, $context['subresource_resources'] ?? null]));
 
         try {
             $cacheItem = $this->cacheItemPool->getItem($cacheKey);

src/EventListener/ReadListener.php

@@ -70,8 +70,8 @@ public function onKernelRequest(GetResponseEvent $event)
         $context = null === $filters ? [] : ['filters' => $filters];
         if ($this->serializerContextBuilder) {
             // Builtin data providers are able to use the serialization context to automatically add join clauses
-            $context['normalization_context'] = $this->serializerContextBuilder->createFromRequest($request, true, $attributes);
-            $request->attributes->set('_api_normalization_context', $context['normalization_context']);
+            $context += $normalizationContext = $this->serializerContextBuilder->createFromRequest($request, true, $attributes);
+            $request->attributes->set('_api_normalization_context', $normalizationContext);
         }
 
         $data = [];