use Accessor as a argument for DateTimeFieldNormalizer

Author: dominikzogg

README.md

@@ -31,7 +31,7 @@ A simple serialization.
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-serialization][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-serialization "~2.1"
+composer require chubbyphp/chubbyphp-serialization "~2.2"
 ```
 
 ## Usage

composer.json

@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "2.2-dev"
         }
     }
 }

doc/Normalizer/DateTimeFieldNormalizer.md

@@ -12,9 +12,7 @@ $model = new Model;
 $context = ...;
 
 $fieldNormalizer = new DateTimeFieldNormalizer(
-    new FieldNormalizer(
-        new PropertyAccessor('at')
-    ),
+    new PropertyAccessor('at'),
     'Y-m-d H:i:s'
 );
 

src/Normalizer/DateTimeFieldNormalizer.php

@@ -4,26 +4,64 @@
 
 namespace Chubbyphp\Serialization\Normalizer;
 
+use Chubbyphp\Serialization\Accessor\AccessorInterface;
+
 final class DateTimeFieldNormalizer implements FieldNormalizerInterface
 {
     /**
      * @var FieldNormalizerInterface
      */
     private $fieldNormalizer;
 
+    /**
+     * @var AccessorInterface
+     */
+    private $accessor;
+
     /**
      * @var string
      */
     private $format;
 
     /**
-     * @param FieldNormalizerInterface $fieldNormalizer
+     * @param AccessorInterface|FieldNormalizerInterface $fieldNormalizer
      * @param string                   $format
      */
-    public function __construct(FieldNormalizerInterface $fieldNormalizer, string $format = 'c')
+    public function __construct($accessor, string $format = 'c')
     {
-        $this->fieldNormalizer = $fieldNormalizer;
+
         $this->format = $format;
+
+        if ($accessor instanceof AccessorInterface) {
+            $this->accessor = $accessor;
+
+            return;
+        }
+
+        if ($accessor instanceof FieldNormalizerInterface) {
+            @trigger_error(
+                sprintf(
+                    'Use "%s" instead of "%s" as __construct argument',
+                    AccessorInterface::class,
+                    FieldNormalizerInterface::class
+                ),
+                E_USER_DEPRECATED
+            );
+
+            $this->fieldNormalizer = $accessor;
+
+            return;
+        }
+
+        throw new \TypeError(
+            sprintf(
+                '%s::__construct() expects parameter 1 to be %s|%s, %s given',
+                self::class,
+                AccessorInterface::class,
+                FieldNormalizerInterface::class,
+                is_object($accessor) ? get_class($accessor) : gettype($accessor)
+            )
+        );
     }
 
     /**
@@ -40,7 +78,7 @@ public function normalizeField(
         NormalizerContextInterface $context,
         NormalizerInterface $normalizer = null
     ) {
-        $value = $this->fieldNormalizer->normalizeField($path, $object, $context, $normalizer);
+        $value = $this->getValue($path, $object, $context, $normalizer);
 
         if (is_string($value)) {
             try {
@@ -55,4 +93,24 @@ public function normalizeField(
 
         return $value->format($this->format);
     }
+
+    /**
+     * @param string $path
+     * @param $object
+     * @param NormalizerContextInterface $context
+     * @param NormalizerInterface|null $normalizer
+     * @return mixed
+     */
+    private function getValue(
+        string $path,
+        $object,
+        NormalizerContextInterface $context,
+        NormalizerInterface $normalizer = null
+    ) {
+        if (null !== $this->accessor) {
+            return $this->accessor->getValue($object);
+        }
+
+        return $this->fieldNormalizer->normalizeField($path, $object, $context, $normalizer);
+    }
 }

tests/Normalizer/DateTimeFieldNormalizerTest.php

@@ -4,6 +4,7 @@
 
 namespace Chubbyphp\Tests\Serialization\Normalizer;
 
+use Chubbyphp\Serialization\Accessor\AccessorInterface;
 use Chubbyphp\Serialization\Normalizer\DateTimeFieldNormalizer;
 use Chubbyphp\Serialization\Normalizer\NormalizerContextInterface;
 use Chubbyphp\Serialization\Normalizer\FieldNormalizerInterface;
@@ -14,7 +15,15 @@
  */
 class DateTimeFieldNormalizerTest extends TestCase
 {
-    public function testNormalizeField()
+    public function testNormalizeFieldWithInvalidConstructArgument()
+    {
+        self::expectException(\TypeError::class);
+        self::expectExceptionMessage('Chubbyphp\Serialization\Normalizer\DateTimeFieldNormalizer::__construct() expects parameter 1 to be Chubbyphp\Serialization\Accessor\AccessorInterface|Chubbyphp\Serialization\Normalizer\FieldNormalizerInterface, DateTime given');
+
+        new DateTimeFieldNormalizer(new \DateTime());
+    }
+    
+    public function testNormalizeFieldWithFieldNormalizer()
     {
         $object = $this->getObject();
         $object->setDate(new \DateTime('2017-01-01 22:00:00+01:00'));
@@ -30,13 +39,30 @@ public function testNormalizeField()
             )
         );
     }
+    
+    public function testNormalizeField()
+    {
+        $object = $this->getObject();
+        $object->setDate(new \DateTime('2017-01-01 22:00:00+01:00'));
+
+        $fieldNormalizer = new DateTimeFieldNormalizer($this->getAccessor());
+
+        self::assertSame(
+            '2017-01-01T22:00:00+01:00',
+            $fieldNormalizer->normalizeField(
+                'date',
+                $object,
+                $this->getNormalizerContext()
+            )
+        );
+    }
 
     public function testNormalizeWithValidDateString()
     {
         $object = $this->getObject();
         $object->setDate('2017-01-01 22:00:00+01:00');
 
-        $fieldNormalizer = new DateTimeFieldNormalizer($this->getFieldNormalizer());
+        $fieldNormalizer = new DateTimeFieldNormalizer($this->getAccessor());
 
         self::assertSame(
             '2017-01-01T22:00:00+01:00',
@@ -53,7 +79,7 @@ public function testNormalizeWithInvalidDateString()
         $object = $this->getObject();
         $object->setDate('2017-01-01 25:00:00');
 
-        $fieldNormalizer = new DateTimeFieldNormalizer($this->getFieldNormalizer());
+        $fieldNormalizer = new DateTimeFieldNormalizer($this->getAccessor());
 
         self::assertSame(
             '2017-01-01 25:00:00',
@@ -69,7 +95,7 @@ public function testNormalizeWithNull()
     {
         $object = $this->getObject();
 
-        $fieldNormalizer = new DateTimeFieldNormalizer($this->getFieldNormalizer());
+        $fieldNormalizer = new DateTimeFieldNormalizer($this->getAccessor());
 
         self::assertNull(
             $fieldNormalizer->normalizeField('date', $object, $this->getNormalizerContext())
@@ -105,6 +131,23 @@ public function setDate($date): self
             }
         };
     }
+    
+    /**
+     * @return AccessorInterface
+     */
+    private function getAccessor(): AccessorInterface
+    {
+        /** @var AccessorInterface|\PHPUnit_Framework_MockObject_MockObject $accessor */
+        $accessor = $this->getMockBuilder(AccessorInterface::class)->getMockForAbstractClass();
+
+        $accessor->expects(self::any())->method('getValue')->willReturnCallback(
+            function ($object) {
+                return $object->getDate();
+            }
+        );
+
+        return $accessor;
+    }
 
     /**
      * @return FieldNormalizerInterface