Improve (#5)

Author: yoanm

src/App/Helper/ConstraintPayloadDocHelper.php

@@ -28,6 +28,8 @@ public function appendPayloadDoc(TypeDoc $doc, Constraint $constraint)
             return;
         }
 
+        // /!\ Do not override value if payload have nothing defined for a key ! /!\
+
         $doc->setRequired(
             $this->getPayloadDocValue($constraint, self::PAYLOAD_DOCUMENTATION_REQUIRED_KEY) ?? $doc->isRequired()
         );
@@ -36,10 +38,10 @@ public function appendPayloadDoc(TypeDoc $doc, Constraint $constraint)
         );
 
         $doc->setExample(
-            $this->getPayloadDocValue($constraint, self::PAYLOAD_DOCUMENTATION_EXAMPLE_KEY)
+            $this->getPayloadDocValue($constraint, self::PAYLOAD_DOCUMENTATION_EXAMPLE_KEY) ?? $doc->getExample()
         );
         $doc->setDefault(
-            $this->getPayloadDocValue($constraint, self::PAYLOAD_DOCUMENTATION_DEFAULT_KEY)
+            $this->getPayloadDocValue($constraint, self::PAYLOAD_DOCUMENTATION_DEFAULT_KEY) ?? $doc->getDefault()
         );
 
         $description = $this->getPayloadDocValue($constraint, self::PAYLOAD_DOCUMENTATION_DESCRIPTION_KEY);
@@ -91,9 +93,6 @@ protected function getPayloadDocValue(Constraint $constraint, string $documentat
      */
     protected function hasPayloadDocKey(Constraint $constraint, string $documentationKey) : bool
     {
-        return array_key_exists(
-            $documentationKey,
-            $constraint->payload[self::PAYLOAD_DOCUMENTATION_KEY]
-        );
+        return array_key_exists($documentationKey, $constraint->payload[self::PAYLOAD_DOCUMENTATION_KEY]);
     }
 }

src/App/Helper/DocTypeHelper.php

@@ -79,9 +79,9 @@ private function normalizeType(string $type)
             return new ScalarDoc();
         } elseif ('string' === $type) {
             return new StringDoc();
-        } elseif ('bool' === $type || 'boolean' === $type) {
+        } elseif (in_array($type, ['bool', 'boolean'])) {
             return new BooleanDoc();
-        } elseif ('int' === $type || 'integer' === $type) {
+        } elseif (in_array($type, ['int', 'integer'])) {
             return new IntegerDoc();
         } elseif (in_array($type, ['float', 'long', 'double', 'real', 'numeric'])) {
             return new FloatDoc();

tests/Functional/App/Helper/ConstraintPayloadDocHelper/getTypeIfExistTest.php

@@ -3,10 +3,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
-use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Validator\Constraints as Assert;
 use Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\ConstraintPayloadDocHelper;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\TypeDoc;
 
 /**
  * @covers Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\ConstraintPayloadDocHelper

tests/Functional/App/Helper/DocTypeHelperTest.php

@@ -4,17 +4,14 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints as Assert;
 use Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\ConstraintPayloadDocHelper;
 use Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\DocTypeHelper;
 use Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\TypeGuesser;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\ArrayDoc;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\BooleanDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\CollectionDoc;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\FloatDoc;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\IntegerDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\NumberDoc;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\ObjectDoc;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\ScalarDoc;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\StringDoc;

tests/Functional/App/Helper/MinMaxHelper/NumberTest.php

@@ -7,7 +7,6 @@
 use Symfony\Component\Validator\Constraints as Assert;
 use Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\MinMaxHelper;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\NumberDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\StringDoc;
 
 /**
  * @covers Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\MinMaxHelper

tests/Technical/App/Helper/DocTypeHelperTest.php

@@ -4,20 +4,12 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints as Assert;
 use Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\ConstraintPayloadDocHelper;
 use Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\DocTypeHelper;
 use Yoanm\JsonRpcParamsSymfonyConstraintDoc\App\Helper\TypeGuesser;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\ArrayDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\BooleanDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\CollectionDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\FloatDoc;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\IntegerDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\NumberDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\ObjectDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\ScalarDoc;
-use Yoanm\JsonRpcServerDoc\Domain\Model\Type\StringDoc;
 use Yoanm\JsonRpcServerDoc\Domain\Model\Type\TypeDoc;
 
 /**