Merge pull request #13 from sagikazarmark/multiple_typehint

Prevent the same typehint to appear multiple times in the return docblock
janephp · Feb 1, 2016 · 3410a87 · 3410a87
2 parents 2415da4 + 520b052
commit 3410a87
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 2 deletions.
diff --git a/src/Generator/OperationGenerator.php b/src/Generator/OperationGenerator.php
@@ -87,7 +87,10 @@ public function generate($name, Operation $operation, Context $context)
             list($outputType, $ifStatus) = $this->createResponseDenormalizationStatement($status, $response->getSchema(), $context);
 
             if (null !== $outputType) {
-                $outputTypes[] = $outputType;
+                if (!in_array($outputType, $outputTypes)) {
+                    $outputTypes[] = $outputType;
+                }
+
                 $outputStatements[] = $ifStatus;
             }
         }

diff --git a/tests/fixtures/model-in-response/expected/Model/Error.php b/tests/fixtures/model-in-response/expected/Model/Error.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Joli\Jane\OpenApi\Tests\Expected\Model;
+
+class Error
+{
+    /**
+     * @var string
+     */
+    protected $message;
+
+    /**
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @param string $message
+     *
+     * @return self
+     */
+    public function setMessage($message = null)
+    {
+        $this->message = $message;
+
+        return $this;
+    }
+}
diff --git a/tests/fixtures/model-in-response/expected/Normalizer/ErrorNormalizer.php b/tests/fixtures/model-in-response/expected/Normalizer/ErrorNormalizer.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Joli\Jane\OpenApi\Tests\Expected\Normalizer;
+
+use Joli\Jane\Reference\Reference;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\SerializerAwareNormalizer;
+
+class ErrorNormalizer extends SerializerAwareNormalizer implements DenormalizerInterface, NormalizerInterface
+{
+    public function supportsDenormalization($data, $type, $format = null)
+    {
+        if ($type !== 'Joli\\Jane\\OpenApi\\Tests\\Expected\\Model\\Error') {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function supportsNormalization($data, $format = null)
+    {
+        if ($data instanceof \Joli\Jane\OpenApi\Tests\Expected\Model\Error) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function denormalize($data, $class, $format = null, array $context = [])
+    {
+        if (empty($data)) {
+            return null;
+        }
+        if (isset($data->{'$ref'})) {
+            return new Reference($data->{'$ref'}, $context['rootSchema'] ?: null);
+        }
+        $object = new \Joli\Jane\OpenApi\Tests\Expected\Model\Error();
+        if (!isset($context['rootSchema'])) {
+            $context['rootSchema'] = $object;
+        }
+        if (isset($data->{'message'})) {
+            $object->setMessage($data->{'message'});
+        }
+
+        return $object;
+    }
+
+    public function normalize($object, $format = null, array $context = [])
+    {
+        $data = new \stdClass();
+        if (null !== $object->getMessage()) {
+            $data->{'message'} = $object->getMessage();
+        }
+
+        return $data;
+    }
+}
diff --git a/tests/fixtures/model-in-response/expected/Normalizer/NormalizerFactory.php b/tests/fixtures/model-in-response/expected/Normalizer/NormalizerFactory.php
@@ -14,6 +14,7 @@ public static function create()
         $normalizers[] = new NormalizerArray();
         $normalizers[] = new SchemaNormalizer();
         $normalizers[] = new ObjectPropertyNormalizer();
+        $normalizers[] = new ErrorNormalizer();
 
         return $normalizers;
     }

diff --git a/tests/fixtures/model-in-response/expected/Resource/TestResource.php b/tests/fixtures/model-in-response/expected/Resource/TestResource.php
@@ -11,7 +11,7 @@ class TestResource extends Resource
      * @param array  $parameters List of parameters
      * @param string $fetch      Fetch mode (object or response)
      *
-     * @return \Psr\Http\Message\ResponseInterface|\Joli\Jane\OpenApi\Tests\Expected\Model\Schema
+     * @return \Psr\Http\Message\ResponseInterface|\Joli\Jane\OpenApi\Tests\Expected\Model\Schema|\Joli\Jane\OpenApi\Tests\Expected\Model\Error
      */
     public function getTest($parameters = [], $fetch = self::FETCH_OBJECT)
     {
@@ -26,6 +26,12 @@ public function getTest($parameters = [], $fetch = self::FETCH_OBJECT)
             if ('200' == $response->getStatusCode()) {
                 return $this->serializer->deserialize($response->getBody()->getContents(), 'Joli\\Jane\\OpenApi\\Tests\\Expected\\Model\\Schema', 'json');
             }
+            if ('400' == $response->getStatusCode()) {
+                return $this->serializer->deserialize($response->getBody()->getContents(), 'Joli\\Jane\\OpenApi\\Tests\\Expected\\Model\\Error', 'json');
+            }
+            if ('404' == $response->getStatusCode()) {
+                return $this->serializer->deserialize($response->getBody()->getContents(), 'Joli\\Jane\\OpenApi\\Tests\\Expected\\Model\\Error', 'json');
+            }
         }
 
         return $response;

diff --git a/tests/fixtures/model-in-response/swagger.json b/tests/fixtures/model-in-response/swagger.json
@@ -34,6 +34,14 @@
                     "$ref": "#/definitions/Schema"
                 }
             }
+        },
+        "Error": {
+            "type": "object",
+            "properties": {
+                "message": {
+                    "type": "string"
+                }
+            }
         }
     },
     "paths": {
@@ -46,6 +54,18 @@
                         "schema": {
                             "$ref": "#/definitions/Schema"
                         }
+                    },
+                    "400": {
+                        "description": "bad request",
+                        "schema": {
+                            "$ref": "#/definitions/Error"
+                        }
+                    },
+                    "404": {
+                        "description": "not found",
+                        "schema": {
+                            "$ref": "#/definitions/Error"
+                        }
                     }
                 },
                 "tags": [