Merge pull request #40 from DoclerLabs/fix-float-for-maximum-minimum

vsouz4 · web-flow · commit acfcc0ae0f48 · 2021-05-27T06:51:55.000-03:00
fix float for maximum and minimum constraints
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [5.6.1] - 2021-05-25
+### Fixed
+- Minimum and Maximum constraints work for floats
+
 ## [5.6.0] - 2021-05-10
 ### Added
 - Api Client Generator version to README generation
diff --git a/src/Entity/Constraint/MaximumConstraint.php b/src/Entity/Constraint/MaximumConstraint.php
@@ -5,23 +5,23 @@
 namespace DoclerLabs\ApiClientGenerator\Entity\Constraint;
 
 use DoclerLabs\ApiClientGenerator\Ast\Builder\CodeBuilder;
+use DoclerLabs\ApiClientGenerator\Entity\FieldType;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Variable;
 
 class MaximumConstraint implements ConstraintInterface
 {
-    private ?int  $maximum          = null;
+    private ?float $maximum = null;
+
     private ?bool $exclusiveMaximum = null;
 
-    public function __construct(?int $maximum, ?bool $exclusiveMaximum)
+    private FieldType $fieldType;
+
+    public function __construct(?float $maximum, ?bool $exclusiveMaximum, FieldType $fieldType)
     {
         $this->maximum          = $maximum;
         $this->exclusiveMaximum = $exclusiveMaximum;
-    }
-
-    public function getMaximum(): ?int
-    {
-        return $this->maximum;
+        $this->fieldType        = $fieldType;
     }
 
     public function isExclusiveMaximum(): ?bool
@@ -39,7 +39,7 @@ public function getIfCondition(Variable $variable, CodeBuilder $builder): Expr
         return $builder->compare(
             $variable,
             $this->exclusiveMaximum === true ? '>=' : '>',
-            $builder->val($this->maximum)
+            $builder->val($this->fieldType->isInteger() ? (int)$this->maximum : $this->maximum)
         );
     }
 
@@ -48,7 +48,7 @@ public function getExceptionMessage(): string
         return sprintf(
             'Cannot be greater than %s%s.',
             $this->exclusiveMaximum === true ? 'or equal to ' : '',
-            $this->maximum
+            $this->fieldType->isInteger() ? (int)$this->maximum : $this->maximum
         );
     }
 }
diff --git a/src/Entity/Constraint/MinimumConstraint.php b/src/Entity/Constraint/MinimumConstraint.php
@@ -5,18 +5,23 @@
 namespace DoclerLabs\ApiClientGenerator\Entity\Constraint;
 
 use DoclerLabs\ApiClientGenerator\Ast\Builder\CodeBuilder;
+use DoclerLabs\ApiClientGenerator\Entity\FieldType;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Variable;
 
 class MinimumConstraint implements ConstraintInterface
 {
-    private ?int  $minimum          = null;
+    private ?float $minimum = null;
+
     private ?bool $exclusiveMinimum = null;
 
-    public function __construct(?int $minimum, ?bool $exclusiveMinimum)
+    private FieldType $fieldType;
+
+    public function __construct(?float $minimum, ?bool $exclusiveMinimum, FieldType $fieldType)
     {
         $this->minimum          = $minimum;
         $this->exclusiveMinimum = $exclusiveMinimum;
+        $this->fieldType        = $fieldType;
     }
 
     public function exists(): bool
@@ -29,7 +34,7 @@ public function getIfCondition(Variable $variable, CodeBuilder $builder): Expr
         return $builder->compare(
             $variable,
             $this->exclusiveMinimum === true ? '<=' : '<',
-            $builder->val($this->minimum)
+            $builder->val($this->fieldType->isInteger() ? (int)$this->minimum : $this->minimum)
         );
     }
 
@@ -38,7 +43,7 @@ public function getExceptionMessage(): string
         return sprintf(
             'Cannot be less than %s%s.',
             $this->exclusiveMinimum === true ? 'or equal to ' : '',
-            $this->minimum
+            $this->fieldType->isInteger() ? (int)$this->minimum : $this->minimum
         );
     }
 }
diff --git a/src/Input/Factory/FieldFactory.php b/src/Input/Factory/FieldFactory.php
@@ -94,12 +94,13 @@ public function create(
                 $objectProperties = $this->mapProperties($operationName, $schema, $referenceName);
             }
 
-            $field = new Field(
+            $fieldType = new FieldType($type);
+            $field     = new Field(
                 $fieldName,
-                new FieldType($type),
+                $fieldType,
                 new ConstraintCollection(
-                    new MinimumConstraint($schema->minimum, $schema->exclusiveMinimum),
-                    new MaximumConstraint($schema->maximum, $schema->exclusiveMaximum),
+                    new MinimumConstraint($schema->minimum, $schema->exclusiveMinimum, $fieldType),
+                    new MaximumConstraint($schema->maximum, $schema->exclusiveMaximum, $fieldType),
                     new MinLengthConstraint($schema->minLength),
                     new MaxLengthConstraint($schema->maxLength),
                     new PatternConstraint($schema->pattern),
diff --git a/test/suite/functional/Generator/Schema/ItemPhp70.php b/test/suite/functional/Generator/Schema/ItemPhp70.php
@@ -315,10 +315,10 @@ public function setOptionalIntegerBetweenExcluded(int $optionalIntegerBetweenExc
      */
     public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenIncluded): self
     {
-        if ($optionalNumberBetweenIncluded < 0) {
+        if ($optionalNumberBetweenIncluded < 0.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than 0.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
         }
-        if ($optionalNumberBetweenIncluded > 5) {
+        if ($optionalNumberBetweenIncluded > 5.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than 5.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
         }
         $this->optionalNumberBetweenIncluded = $optionalNumberBetweenIncluded;
@@ -331,10 +331,10 @@ public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenInc
      */
     public function setOptionalNumberBetweenExcluded(float $optionalNumberBetweenExcluded): self
     {
-        if ($optionalNumberBetweenExcluded <= 0) {
+        if ($optionalNumberBetweenExcluded <= 0.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than or equal to 0.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
         }
-        if ($optionalNumberBetweenExcluded >= 5) {
+        if ($optionalNumberBetweenExcluded >= 5.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than or equal to 5.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
         }
         $this->optionalNumberBetweenExcluded = $optionalNumberBetweenExcluded;
diff --git a/test/suite/functional/Generator/Schema/ItemPhp72.php b/test/suite/functional/Generator/Schema/ItemPhp72.php
@@ -308,10 +308,10 @@ public function setOptionalIntegerBetweenExcluded(int $optionalIntegerBetweenExc
      */
     public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenIncluded): self
     {
-        if ($optionalNumberBetweenIncluded < 0) {
+        if ($optionalNumberBetweenIncluded < 0.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than 0.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
         }
-        if ($optionalNumberBetweenIncluded > 5) {
+        if ($optionalNumberBetweenIncluded > 5.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than 5.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
         }
         $this->optionalNumberBetweenIncluded = $optionalNumberBetweenIncluded;
@@ -324,10 +324,10 @@ public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenInc
      */
     public function setOptionalNumberBetweenExcluded(float $optionalNumberBetweenExcluded): self
     {
-        if ($optionalNumberBetweenExcluded <= 0) {
+        if ($optionalNumberBetweenExcluded <= 0.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than or equal to 0.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
         }
-        if ($optionalNumberBetweenExcluded >= 5) {
+        if ($optionalNumberBetweenExcluded >= 5.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than or equal to 5.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
         }
         $this->optionalNumberBetweenExcluded = $optionalNumberBetweenExcluded;
diff --git a/test/suite/functional/Generator/Schema/ItemPhp74.php b/test/suite/functional/Generator/Schema/ItemPhp74.php
@@ -280,10 +280,10 @@ public function setOptionalIntegerBetweenExcluded(int $optionalIntegerBetweenExc
      */
     public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenIncluded): self
     {
-        if ($optionalNumberBetweenIncluded < 0) {
+        if ($optionalNumberBetweenIncluded < 0.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than 0.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
         }
-        if ($optionalNumberBetweenIncluded > 5) {
+        if ($optionalNumberBetweenIncluded > 5.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than 5.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
         }
         $this->optionalNumberBetweenIncluded = $optionalNumberBetweenIncluded;
@@ -296,10 +296,10 @@ public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenInc
      */
     public function setOptionalNumberBetweenExcluded(float $optionalNumberBetweenExcluded): self
     {
-        if ($optionalNumberBetweenExcluded <= 0) {
+        if ($optionalNumberBetweenExcluded <= 0.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than or equal to 0.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
         }
-        if ($optionalNumberBetweenExcluded >= 5) {
+        if ($optionalNumberBetweenExcluded >= 5.0) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than or equal to 5.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
         }
         $this->optionalNumberBetweenExcluded = $optionalNumberBetweenExcluded;

Original file line number	Diff line number	Diff line change
`@@ -315,10 +315,10 @@ public function setOptionalIntegerBetweenExcluded(int $optionalIntegerBetweenExc`
`315`	`315`	`*/`
`316`	`316`	`public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenIncluded): self`
`317`	`317`	`{`
`318`		`- if ($optionalNumberBetweenIncluded < 0) {`
	`318`	`+ if ($optionalNumberBetweenIncluded < 0.0) {`
`319`	`319`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than 0.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
`320`	`320`	`}`
`321`		`- if ($optionalNumberBetweenIncluded > 5) {`
	`321`	`+ if ($optionalNumberBetweenIncluded > 5.0) {`
`322`	`322`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than 5.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
`323`	`323`	`}`
`324`	`324`	`$this->optionalNumberBetweenIncluded = $optionalNumberBetweenIncluded;`
`@@ -331,10 +331,10 @@ public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenInc`
`331`	`331`	`*/`
`332`	`332`	`public function setOptionalNumberBetweenExcluded(float $optionalNumberBetweenExcluded): self`
`333`	`333`	`{`
`334`		`- if ($optionalNumberBetweenExcluded <= 0) {`
	`334`	`+ if ($optionalNumberBetweenExcluded <= 0.0) {`
`335`	`335`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than or equal to 0.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
`336`	`336`	`}`
`337`		`- if ($optionalNumberBetweenExcluded >= 5) {`
	`337`	`+ if ($optionalNumberBetweenExcluded >= 5.0) {`
`338`	`338`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than or equal to 5.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
`339`	`339`	`}`
`340`	`340`	`$this->optionalNumberBetweenExcluded = $optionalNumberBetweenExcluded;`
Original file line number	Diff line number	Diff line change
`@@ -308,10 +308,10 @@ public function setOptionalIntegerBetweenExcluded(int $optionalIntegerBetweenExc`
`308`	`308`	`*/`
`309`	`309`	`public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenIncluded): self`
`310`	`310`	`{`
`311`		`- if ($optionalNumberBetweenIncluded < 0) {`
	`311`	`+ if ($optionalNumberBetweenIncluded < 0.0) {`
`312`	`312`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than 0.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
`313`	`313`	`}`
`314`		`- if ($optionalNumberBetweenIncluded > 5) {`
	`314`	`+ if ($optionalNumberBetweenIncluded > 5.0) {`
`315`	`315`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than 5.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
`316`	`316`	`}`
`317`	`317`	`$this->optionalNumberBetweenIncluded = $optionalNumberBetweenIncluded;`
`@@ -324,10 +324,10 @@ public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenInc`
`324`	`324`	`*/`
`325`	`325`	`public function setOptionalNumberBetweenExcluded(float $optionalNumberBetweenExcluded): self`
`326`	`326`	`{`
`327`		`- if ($optionalNumberBetweenExcluded <= 0) {`
	`327`	`+ if ($optionalNumberBetweenExcluded <= 0.0) {`
`328`	`328`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than or equal to 0.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
`329`	`329`	`}`
`330`		`- if ($optionalNumberBetweenExcluded >= 5) {`
	`330`	`+ if ($optionalNumberBetweenExcluded >= 5.0) {`
`331`	`331`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than or equal to 5.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
`332`	`332`	`}`
`333`	`333`	`$this->optionalNumberBetweenExcluded = $optionalNumberBetweenExcluded;`
Original file line number	Diff line number	Diff line change
`@@ -280,10 +280,10 @@ public function setOptionalIntegerBetweenExcluded(int $optionalIntegerBetweenExc`
`280`	`280`	`*/`
`281`	`281`	`public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenIncluded): self`
`282`	`282`	`{`
`283`		`- if ($optionalNumberBetweenIncluded < 0) {`
	`283`	`+ if ($optionalNumberBetweenIncluded < 0.0) {`
`284`	`284`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than 0.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
`285`	`285`	`}`
`286`		`- if ($optionalNumberBetweenIncluded > 5) {`
	`286`	`+ if ($optionalNumberBetweenIncluded > 5.0) {`
`287`	`287`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than 5.', 'optionalNumberBetweenIncluded', $optionalNumberBetweenIncluded));
`288`	`288`	`}`
`289`	`289`	`$this->optionalNumberBetweenIncluded = $optionalNumberBetweenIncluded;`
`@@ -296,10 +296,10 @@ public function setOptionalNumberBetweenIncluded(float $optionalNumberBetweenInc`
`296`	`296`	`*/`
`297`	`297`	`public function setOptionalNumberBetweenExcluded(float $optionalNumberBetweenExcluded): self`
`298`	`298`	`{`
`299`		`- if ($optionalNumberBetweenExcluded <= 0) {`
	`299`	`+ if ($optionalNumberBetweenExcluded <= 0.0) {`
`300`	`300`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be less than or equal to 0.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
`301`	`301`	`}`
`302`		`- if ($optionalNumberBetweenExcluded >= 5) {`
	`302`	`+ if ($optionalNumberBetweenExcluded >= 5.0) {`
`303`	`303`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Cannot be greater than or equal to 5.', 'optionalNumberBetweenExcluded', $optionalNumberBetweenExcluded));
`304`	`304`	`}`
`305`	`305`	`$this->optionalNumberBetweenExcluded = $optionalNumberBetweenExcluded;`