symfony
diff --git a/‎src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
Lines changed: 11 additions & 22 deletions b/‎src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
Lines changed: 11 additions & 22 deletions
@@ -12,43 +12,40 @@
 namespace Symfony\Component\Serializer\Normalizer;
 
 use Symfony\Component\PropertyAccess\PropertyAccess;
-use Symfony\Component\PropertyAccess\PropertyAccessor;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Serializer\SerializerAwareInterface;
-use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Serializer\SerializerAwareTrait;
 
 final class UnwrappingDenormalizer implements DenormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface
 {
-    const UNWRAP_PATH = 'unwrap_path';
+    use SerializerAwareTrait;
 
-    /**
-     * @var SerializerInterface|DenormalizerInterface
-     */
-    private $serializer;
+    const UNWRAP_PATH = 'unwrap_path';
 
     /**
      * @var PropertyAccess
      */
-    private $propertyAccess;
+    private $propertyAccessor;
 
-    public function __construct(PropertyAccessor $propertyAccess)
+    public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
-        $this->propertyAccess = $propertyAccess;
+        $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $class, $format = null, array $context = [])
+    public function denormalize($data, $class, string $format = null, array $context = [])
     {
         $propertyPath = $context[self::UNWRAP_PATH];
         $context['unwrapped'] = true;
 
         if ($propertyPath) {
-            if (!$this->propertyAccess->isReadable($data, $propertyPath)) {
+            if (!$this->propertyAccessor->isReadable($data, $propertyPath)) {
                 return null;
             }
 
-            $data = $this->propertyAccess->getValue($data, $propertyPath);
+            $data = $this->propertyAccessor->getValue($data, $propertyPath);
         }
 
         return $this->serializer->denormalize($data, $class, $format, $context);
@@ -57,19 +54,11 @@ public function denormalize($data, $class, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null, array $context = [])
+    public function supportsDenormalization($data, $type, string $format = null, array $context = [])
     {
         return \array_key_exists(self::UNWRAP_PATH, $context) && !isset($context['unwrapped']);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setSerializer(SerializerInterface $serializer)
-    {
-        $this->serializer = $serializer;
-    }
-
     /**
      * {@inheritdoc}
      */