[jsonhal] Correct normalization of output class

Author: teohhanhui

features/hal/input_output.feature

@@ -0,0 +1,62 @@
+Feature: HAL DTO input and output
+  In order to use a hypermedia API
+  As a client software developer
+  I need to be able to use DTOs on my resources as Input or Output objects.
+
+  Background:
+    Given I add "Accept" header equal to "application/hal+json"
+
+  @createSchema
+  Scenario: Get an item with a custom output
+    Given there is a DummyDtoCustom
+    When I send a "GET" request to "/dummy_dto_custom_output/1"
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/hal+json; charset=utf-8"
+    And the JSON should be a superset of:
+    """
+    {
+      "_links": {
+        "self": {
+          "href": "/dummy_dto_customs/1"
+        }
+      },
+      "foo": "test",
+      "bar": 1
+    }
+    """
+
+  @createSchema
+  Scenario: Get a collection with a custom output
+    Given there are 2 DummyDtoCustom
+    When I send a "GET" request to "/dummy_dto_custom_output"
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/hal+json; charset=utf-8"
+    And the JSON should be a superset of:
+    """
+    {
+      "_embedded": {
+        "item": [
+          {
+            "_links": {
+              "self": {
+                "href": "/dummy_dto_customs/1"
+              }
+            },
+            "foo": "test",
+            "bar": 1
+          },
+          {
+            "_links": {
+              "self": {
+                "href": "/dummy_dto_customs/2"
+              }
+            },
+            "foo": "test",
+            "bar": 2
+          }
+        ]
+      }
+    }
+    """

src/Hal/Serializer/ItemNormalizer.php

@@ -48,14 +48,40 @@ public function supportsNormalization($data, $format = null, array $context = []
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        if ($this->handleNonResource || null !== $outputClass = $this->getOutputClass($this->getObjectClass($object), $context)) {
+        if (!$this->handleNonResource && null !== $outputClass = $this->getOutputClass($this->getObjectClass($object), $context)) {
             return parent::normalize($object, $format, $context);
         }
 
         if (!isset($context['cache_key'])) {
             $context['cache_key'] = $this->getHalCacheKey($format, $context);
         }
 
+        if ($this->handleNonResource) {
+            if (isset($context['api_resource'])) {
+                $originalResource = $context['api_resource'];
+                unset($context['api_resource']);
+            }
+
+            $rawData = parent::normalize($object, $format, $context);
+            if (!\is_array($rawData)) {
+                return $rawData;
+            }
+
+            if (!isset($originalResource)) {
+                return $rawData;
+            }
+
+            $metadataData = [
+                '_links' => [
+                    'self' => [
+                        'href' => $this->iriConverter->getIriFromItem($originalResource),
+                    ],
+                ],
+            ];
+
+            return $metadataData + $rawData;
+        }
+
         $resourceClass = $this->resourceClassResolver->getResourceClass($object, $context['resource_class'] ?? null, true);
         $context = $this->initContext($resourceClass, $context);
         $context['iri'] = $this->iriConverter->getIriFromItem($object);
@@ -66,12 +92,18 @@ public function normalize($object, $format = null, array $context = [])
             return $rawData;
         }
 
-        $data = ['_links' => ['self' => ['href' => $context['iri']]]];
+        $metadataData = [
+            '_links' => [
+                'self' => [
+                    'href' => $context['iri'],
+                ],
+            ],
+        ];
         $components = $this->getComponents($object, $format, $context);
-        $data = $this->populateRelation($data, $object, $format, $context, $components, 'links');
-        $data = $this->populateRelation($data, $object, $format, $context, $components, 'embedded');
+        $metadataData = $this->populateRelation($metadataData, $object, $format, $context, $components, 'links');
+        $metadataData = $this->populateRelation($metadataData, $object, $format, $context, $components, 'embedded');
 
-        return $data + $rawData;
+        return $metadataData + $rawData;
     }
 
     /**