Merge pull request #20 from DoclerLabs/fix-date-time-query-serialization

fix: `DateTimeInterface` serialization in `QuerySerializer`

Author: pelyib

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.2.1] - 2020-11-24
+### Fixed
+- `DateTimeInterface` serialization in `QuerySerializer`
+
 ## [3.2.0] - 2020-11-10
 ### Added
  - Query parameters which implement `JsonSerializable` will be converted accordingly.

src/Output/Copy/Serializer/QuerySerializer.php

@@ -2,6 +2,7 @@
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Serializer;
 
+use DateTimeInterface;
 use DoclerLabs\ApiClientGenerator\Output\Copy\Request\RequestInterface;
 use DoclerLabs\ApiClientGenerator\Output\Copy\Schema\SerializableInterface;
 use JsonSerializable;
@@ -15,6 +16,8 @@ public function serializeRequest(RequestInterface $request): string
         foreach ($request->getRawQueryParameters() as $name => $value) {
             if ($value === null) {
                 continue;
+            } elseif ($value instanceof DateTimeInterface) {
+                $value = $value->format(DateTimeInterface::RFC3339);
             } elseif ($value instanceof SerializableInterface) {
                 $value = $value->toArray();
             } elseif ($value instanceof JsonSerializable) {

test/suite/unit/Output/Copy/Serializer/QuerySerializerTest.php

@@ -0,0 +1,124 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Copy\Serializer;
+
+use DateTimeImmutable;
+use DateTimeInterface;
+use DateTimeZone;
+use DoclerLabs\ApiClientGenerator\Output\Copy\Request\RequestInterface;
+use DoclerLabs\ApiClientGenerator\Output\Copy\Schema\SerializableInterface;
+use DoclerLabs\ApiClientGenerator\Output\Copy\Serializer\QuerySerializer;
+use JsonSerializable;
+use PHPUnit\Framework\TestCase;
+
+class QuerySerializerTest extends TestCase
+{
+    private QuerySerializer $sut;
+
+    protected function setUp(): void
+    {
+        $this->sut = new QuerySerializer();
+    }
+
+    /**
+     * @dataProvider dataProvider
+     */
+    public function testSerialization(array $rawQueryParameters, array $expected): void
+    {
+        $request = $this->createMock(RequestInterface::class);
+        $request->expects(self::once())
+            ->method('getRawQueryParameters')
+            ->willReturn($rawQueryParameters);
+
+        parse_str($this->sut->serializeRequest($request), $actual);
+        self::assertSame(
+            $expected,
+            $actual
+        );
+    }
+
+    public function dataProvider(): array
+    {
+        $serializable = $this->createMock(SerializableInterface::class);
+        $serializable->expects(self::once())
+            ->method('toArray')
+            ->willReturn($serialized = ['foo' => 'bar']);
+
+        $jsonSerializable = $this->createMock(JsonSerializable::class);
+        $jsonSerializable->expects(self::once())
+            ->method('jsonSerialize')
+            ->willReturn($jsonSerialized = ['bar' => 'foo']);
+
+        return [
+            'DateTime'                   => [
+                [
+                    'dateTime' => $dateTime = new DateTimeImmutable(
+                        '2020-11-24 01:02:03',
+                        new DateTimeZone('Europe/Luxembourg')
+                    ),
+                ],
+                [
+                    'dateTime' => $dateTime->format(DateTimeInterface::RFC3339),
+                ],
+            ],
+            'Nullable'                   => [
+                [
+                    'nullable' => null,
+                ],
+                [],
+            ],
+            'Integer'                    => [
+                [
+                    'integer' => $integer = 11,
+                ],
+                [
+                    'integer' => (string)$integer,
+                ],
+            ],
+            'String'                     => [
+                [
+                    'string' => $string = 'simple string',
+                ],
+                [
+                    'string' => $string,
+                ],
+            ],
+            'Float'                      => [
+                [
+                    'float' => $float = 42.13,
+                ],
+                [
+                    'float' => (string)$float,
+                ],
+            ],
+            'Boolean'                    => [
+                [
+                    'booleanTrue'  => $booleanTrue = true,
+                    'booleanFalse' => $booleanFalse = false,
+                ],
+                [
+                    'booleanTrue'  => (string)(int)$booleanTrue,
+                    'booleanFalse' => (string)(int)$booleanFalse,
+                ],
+            ],
+            'Serializable interface'     => [
+                [
+                    'serializable' => $serializable,
+                ],
+                [
+                    'serializable' => $serialized,
+                ],
+            ],
+            'JsonSerializable interface' => [
+                [
+                    'jsonSerializable' => $jsonSerializable,
+                ],
+                [
+                    'jsonSerializable' => $jsonSerialized,
+                ],
+            ],
+        ];
+    }
+}