Improve test, ensure transformer is always called if output class is set no matter how the same class/object is returned

Author: silverbackdan

features/jsonld/input_output.feature

@@ -97,7 +97,7 @@ Feature: JSON-LD DTO input and output
       "@id": "/dummy_dto_output_same_classes/1",
       "@type": "DummyDtoOutputSameClass",
       "lorem": "test",
-      "ipsum": "1",
+      "ipsum": "modified",
       "id": 1
     }
     """

src/JsonLd/Serializer/ItemNormalizer.php

@@ -67,7 +67,6 @@ public function normalize($object, $format = null, array $context = [])
     {
         $objectClass = $this->getObjectClass($object);
         $outputClass = $this->getOutputClass($objectClass, $context);
-
         if (null !== $outputClass && !isset($context[self::IS_TRANSFORMED_TO_SAME_CLASS_CONTEXT_KEY])) {
             return parent::normalize($object, $format, $context);
         }

tests/Fixtures/TestBundle/DataTransformer/OutputDtoFallbackSameClassTransformer.php renamed to tests/Fixtures/TestBundle/DataTransformer/OutputDtoSameClassTransformer.php

@@ -16,20 +16,21 @@
 use ApiPlatform\Core\DataTransformer\DataTransformerInterface;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Dto\OutputDtoDummy;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyDtoOutputFallbackToSameClass;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyDtoOutputSameClass;
 
 /**
  * OutputDtoUnmodifiedDataTransformer.
  *
  * @author Daniel West <[email protected]>
  */
-final class OutputDtoFallbackSameClassTransformer implements DataTransformerInterface
+final class OutputDtoSameClassTransformer implements DataTransformerInterface
 {
     /**
      * {@inheritdoc}
      */
     public function transform($object, string $to, array $context = [])
     {
-        if (!$object instanceof DummyDtoOutputFallbackToSameClass) {
+        if (!$object instanceof DummyDtoOutputFallbackToSameClass && !$object instanceof DummyDtoOutputSameClass) {
             throw new \InvalidArgumentException();
         }
         $object->ipsum = 'modified';
@@ -42,6 +43,7 @@ public function transform($object, string $to, array $context = [])
      */
     public function supportsTransformation($data, string $to, array $context = []): bool
     {
-        return $data instanceof DummyDtoOutputFallbackToSameClass && OutputDtoDummy::class === $to;
+        return ($data instanceof DummyDtoOutputFallbackToSameClass && OutputDtoDummy::class === $to) ||
+            ($data instanceof DummyDtoOutputSameClass && DummyDtoOutputSameClass::class === $to);
     }
 }

tests/Fixtures/app/config/config_common.yml

@@ -227,7 +227,7 @@ services:
             -  { name: 'api_platform.data_transformer' }
 
     app.data_transformer.custom_output_dto_fallback_same_class:
-        class: 'ApiPlatform\Core\Tests\Fixtures\TestBundle\DataTransformer\OutputDtoFallbackSameClassTransformer'
+        class: 'ApiPlatform\Core\Tests\Fixtures\TestBundle\DataTransformer\OutputDtoSameClassTransformer'
         public: false
         tags:
             - { name: 'api_platform.data_transformer' }