fix merge

xabbuh · xabbuh · commit 836a93bb80c2 · 2024-06-22T10:46:19.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -192,7 +192,7 @@ protected function isAllowedAttribute($classOrObject, string $attribute, ?string
 
         if ($context['_read_attributes'] ?? true) {
             if (!isset(self::$isReadableCache[$class.$attribute])) {
-                self::$isReadableCache[$class.$attribute] = (\is_object($classOrObject) && $this->propertyAccessor->isReadable($classOrObject, $attribute)) || $this->hasAttributeAccessorMethod($class, $attribute);
+                self::$isReadableCache[$class.$attribute] = (\is_object($classOrObject) && $this->propertyAccessor->isReadable($classOrObject, $attribute)) || $this->propertyInfoExtractor->isReadable($class, $attribute) || $this->hasAttributeAccessorMethod($class, $attribute);
             }
 
             return self::$isReadableCache[$class.$attribute];

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ protected function isAllowedAttribute($classOrObject, string $attribute, ?string`
`192`	`192`
`193`	`193`	`if ($context['_read_attributes'] ?? true) {`
`194`	`194`	`if (!isset(self::$isReadableCache[$class.$attribute])) {`
`195`		`- self::$isReadableCache[$class.$attribute] = (\is_object($classOrObject) && $this->propertyAccessor->isReadable($classOrObject, $attribute)) \|\| $this->hasAttributeAccessorMethod($class, $attribute);`
	`195`	`+ self::$isReadableCache[$class.$attribute] = (\is_object($classOrObject) && $this->propertyAccessor->isReadable($classOrObject, $attribute)) \|\| $this->propertyInfoExtractor->isReadable($class, $attribute) \|\| $this->hasAttributeAccessorMethod($class, $attribute);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`return self::$isReadableCache[$class.$attribute];`