Merge pull request #22 from veewee/janvernieuwe-serializer-improvements

Janvernieuwe serializer improvements

Author: veewee

psalm.xml

@@ -9,9 +9,10 @@
     <projectFiles>
         <directory name="src" />
         <directory name="examples" />
+        <directory name="static-analysis" />
         <ignoreFiles>
-            <directory name="vendor" />
             <directory name="tests" />
+            <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
     <stubs>

src/Transport/Serializer/SerializerTransport.php

@@ -6,7 +6,6 @@
 
 use Phpro\HttpTools\Request\Request;
 use Phpro\HttpTools\Request\RequestInterface;
-use Phpro\HttpTools\Serializer\SerializerException;
 use Phpro\HttpTools\Serializer\SerializerInterface;
 use Phpro\HttpTools\Transport\TransportInterface;
 
@@ -57,20 +56,19 @@ public function withOutputType(string $output): self
 
     public function __invoke(RequestInterface $request)
     {
-        if (!$this->outputType) {
-            throw SerializerException::noDeserializeTypeSpecified();
+        $response = ($this->transport)(
+            new Request(
+                $request->method(),
+                $request->uri(),
+                $request->uriParameters(),
+                null === $request->body() ? '' : $this->serializer->serialize($request->body())
+            )
+        );
+
+        if (null === $this->outputType) {
+            return;
         }
 
-        return $this->serializer->deserialize(
-            ($this->transport)(
-                new Request(
-                    $request->method(),
-                    $request->uri(),
-                    $request->uriParameters(),
-                    $this->serializer->serialize($request->body())
-                )
-            ),
-            $this->outputType
-        );
+        return $this->serializer->deserialize($response, $this->outputType);
     }
 }

static-analysis/Transport/Serializer/serializer-transport.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Phpro\HttpTools\StaticAnalysis\Transport\Serializer;
+
+use Phpro\HttpTools\Request\Request;
+use Phpro\HttpTools\Serializer\SerializerInterface;
+use Phpro\HttpTools\Transport\Serializer\SerializerTransport;
+use Phpro\HttpTools\Transport\TransportInterface;
+
+final class Foo
+{
+}
+
+/**
+ * @param SerializerTransport<Foo, null> $x
+ *
+ * @return null
+ */
+function testEmptySerializer(SerializerTransport $x)
+{
+    return $x(new Request('GET', '/', [], new Foo()));
+}
+
+/**
+ * @param SerializerTransport<Foo, Foo> $x
+ */
+function testTargetSerializer(SerializerTransport $x): Foo
+{
+    return $x(new Request('GET', '/', [], new Foo()));
+}
+
+/**
+ * @param TransportInterface<string, string> $transport
+ */
+function test(SerializerInterface $serializer, TransportInterface $transport): void
+{
+    /** @var SerializerTransport<Foo, null> $serializerTransport */
+    $serializerTransport = new SerializerTransport($serializer, $transport);
+
+    testEmptySerializer($serializerTransport);
+
+    testTargetSerializer($serializerTransport->withOutputType(Foo::class));
+}

tests/Unit/Transport/Serializer/SerializerTransportTest.php

@@ -6,7 +6,6 @@
 
 use Http\Message\RequestMatcher\CallbackRequestMatcher;
 use Http\Mock\Client;
-use Phpro\HttpTools\Serializer\SerializerException;
 use Phpro\HttpTools\Serializer\SymfonySerializer;
 use Phpro\HttpTools\Test\UseHttpToolsFactories;
 use Phpro\HttpTools\Test\UseMockClient;
@@ -68,13 +67,42 @@ public function it_can_serialize_request_and_deserialize_response_body_and_trans
     }
 
     /** @test */
-    public function it_can_not_serialize_requests_if_the_output_value_is_not_known(): void
+    public function it_can_handle_requests_without_request_object(): void
     {
         $valueObject = new SomeValueObject('Hello', 'World');
+        $jsonData = Json\encode($data = ['x' => 'Hello', 'y' => 'World']);
+        $request = $this->createToolsRequest('GET', '/', []);
+
+        $this->client->on(
+            new CallbackRequestMatcher(
+                fn (RequestInterface $httpRequest): bool => '' === (string) $httpRequest->getBody()
+            ),
+            $this->createResponse()->withBody($this->createStream($jsonData))
+        );
+
+        $transport = $this->transport->withOutputType(SomeValueObject::class);
+        $result = $transport($request);
+
+        self::assertEquals($valueObject, $result);
+    }
+
+    /** @test */
+    public function it_can_handle_requests_without_response_type(): void
+    {
+        $valueObject = new SomeValueObject('Hello', 'World');
+        $jsonData = Json\encode($data = ['x' => 'Hello', 'y' => 'World']);
         $request = $this->createToolsRequest('GET', '/', [], $valueObject);
 
-        $this->expectException(SerializerException::class);
-        $this->expectExceptionMessage(SerializerException::noDeserializeTypeSpecified()->getMessage());
-        ($this->transport)($request);
+        $this->client->on(
+            new CallbackRequestMatcher(
+                fn (RequestInterface $httpRequest): bool => (string) $httpRequest->getBody() === $jsonData
+            ),
+            $this->createResponse()->withBody($this->createStream($jsonData))
+        );
+
+        $transport = $this->transport;
+        $result = $transport($request);
+
+        self::assertEquals(null, $result);
     }
 }