Merge pull request #1894 from bendavies/normalizer-cache-keys

fix normalizer cache key generation

Author: dunglas

src/Hal/Serializer/ItemNormalizer.php

@@ -43,7 +43,10 @@ public function supportsNormalization($data, $format = null)
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        $context['cache_key'] = $this->getHalCacheKey($format, $context);
+        if (!isset($context['cache_key'])) {
+            $context['cache_key'] = $this->getHalCacheKey($format, $context);
+        }
+
         $resourceClass = $this->resourceClassResolver->getResourceClass($object, $context['resource_class'] ?? null, true);
         $context = $this->initContext($resourceClass, $context);
         $context['iri'] = $this->iriConverter->getIriFromItem($object);
@@ -99,8 +102,10 @@ protected function getAttributes($object, $format = null, array $context)
      */
     private function getComponents($object, string $format = null, array $context)
     {
-        if (false !== $context['cache_key'] && isset($this->componentsCache[$context['cache_key']])) {
-            return $this->componentsCache[$context['cache_key']];
+        $cacheKey = \get_class($object).'-'.$context['cache_key'];
+
+        if (isset($this->componentsCache[$cacheKey])) {
+            return $this->componentsCache[$cacheKey];
         }
 
         $attributes = parent::getAttributes($object, $format, $context);
@@ -142,7 +147,7 @@ private function getComponents($object, string $format = null, array $context)
         }
 
         if (false !== $context['cache_key']) {
-            $this->componentsCache[$context['cache_key']] = $components;
+            $this->componentsCache[$cacheKey] = $components;
         }
 
         return $components;

src/JsonApi/Serializer/ItemNormalizer.php

@@ -60,7 +60,9 @@ public function supportsNormalization($data, $format = null)
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        $context['cache_key'] = $this->getJsonApiCacheKey($format, $context);
+        if (!isset($context['cache_key'])) {
+            $context['cache_key'] = $this->getJsonApiCacheKey($format, $context);
+        }
 
         // Get and populate attributes data
         $objectAttributesData = parent::normalize($object, $format, $context);
@@ -221,8 +223,10 @@ protected function isAllowedAttribute($classOrObject, $attribute, $format = null
      */
     private function getComponents($object, string $format = null, array $context)
     {
-        if (isset($this->componentsCache[$context['cache_key']])) {
-            return $this->componentsCache[$context['cache_key']];
+        $cacheKey = \get_class($object).'-'.$context['cache_key'];
+
+        if (isset($this->componentsCache[$cacheKey])) {
+            return $this->componentsCache[$cacheKey];
         }
 
         $attributes = parent::getAttributes($object, $format, $context);
@@ -267,7 +271,11 @@ private function getComponents($object, string $format = null, array $context)
             $components['relationships'][] = $relation;
         }
 
-        return $this->componentsCache[$context['cache_key']] = $components;
+        if (false !== $context['cache_key']) {
+            $this->componentsCache[$cacheKey] = $components;
+        }
+
+        return $components;
     }
 
     /**