Revert protected class resolver, use private in child class

joelwurtz · joelwurtz · commit c384f419ac87 · 2019-03-26T23:55:26.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -49,13 +49,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
      * @var callable|null
      */
     private $maxDepthHandler;
-
-    /**
-     * @var callable|null
-     *
-     * @internal
-     */
-    protected $objectClassResolver;
+    private $objectClassResolver;
 
     /**
      * @var ClassDiscriminatorResolverInterface|null
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -32,6 +32,8 @@ class ObjectNormalizer extends AbstractObjectNormalizer
 
     private $discriminatorCache = [];
 
+    private $objectClassResolver;
+
     public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = [])
     {
         if (!\class_exists(PropertyAccess::class)) {
@@ -41,6 +43,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);
 
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
+        $this->objectClassResolver = $objectClassResolver;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ class ObjectNormalizer extends AbstractObjectNormalizer`
`32`	`32`
`33`	`33`	`private $discriminatorCache = [];`
`34`	`34`
	`35`	`+ private $objectClassResolver;`
	`36`	`+`
`35`	`37`	`public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = [])`
`36`	`38`	`{`
`37`	`39`	`if (!\class_exists(PropertyAccess::class)) {`
`@@ -41,6 +43,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory`
`41`	`43`	`parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);`
`42`	`44`
`43`	`45`	`$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();`
	`46`	`+ $this->objectClassResolver = $objectClassResolver;`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`/**`