update minimum/exclusiveMinimum and maximum/exclusiveMaximum

Author: dominikzogg

src/JsonSchemaCodeGenerator.php

@@ -425,20 +425,24 @@ private function applyNumericConstraints(string $code, array $schema, bool $isIn
     {
         if (isset($schema['minimum']) && (\is_int($schema['minimum']) || \is_float($schema['minimum']))) {
             $val = $isInt ? (int) $schema['minimum'] : (float) $schema['minimum'];
-            $code .= '->minimum('.$this->exportValue($val).')';
-        }
-
-        if (isset($schema['maximum']) && (\is_int($schema['maximum']) || \is_float($schema['maximum']))) {
-            $val = $isInt ? (int) $schema['maximum'] : (float) $schema['maximum'];
-            $code .= '->maximum('.$this->exportValue($val).')';
-        }
-
-        if (isset($schema['exclusiveMinimum']) && (\is_int($schema['exclusiveMinimum']) || \is_float($schema['exclusiveMinimum']))) {
+            if (isset($schema['exclusiveMinimum']) && true === $schema['exclusiveMinimum']) {
+                $code .= '->exclusiveMinimum('.$this->exportValue($val).')';
+            } else {
+                $code .= '->minimum('.$this->exportValue($val).')';
+            }
+        } elseif (isset($schema['exclusiveMinimum']) && (\is_int($schema['exclusiveMinimum']) || \is_float($schema['exclusiveMinimum']))) {
             $val = $isInt ? (int) $schema['exclusiveMinimum'] : (float) $schema['exclusiveMinimum'];
             $code .= '->exclusiveMinimum('.$this->exportValue($val).')';
         }
 
-        if (isset($schema['exclusiveMaximum']) && (\is_int($schema['exclusiveMaximum']) || \is_float($schema['exclusiveMaximum']))) {
+        if (isset($schema['maximum']) && (\is_int($schema['maximum']) || \is_float($schema['maximum']))) {
+            $val = $isInt ? (int) $schema['maximum'] : (float) $schema['maximum'];
+            if (isset($schema['exclusiveMaximum']) && true === $schema['exclusiveMaximum']) {
+                $code .= '->exclusiveMaximum('.$this->exportValue($val).')';
+            } else {
+                $code .= '->maximum('.$this->exportValue($val).')';
+            }
+        } elseif (isset($schema['exclusiveMaximum']) && (\is_int($schema['exclusiveMaximum']) || \is_float($schema['exclusiveMaximum']))) {
             $val = $isInt ? (int) $schema['exclusiveMaximum'] : (float) $schema['exclusiveMaximum'];
             $code .= '->exclusiveMaximum('.$this->exportValue($val).')';
         }

tests/Unit/JsonSchemaCodeGeneratorTest.php

@@ -170,6 +170,38 @@ public function testIntegerWithAllConstraints(): void
         self::assertSame('$p->int()->minimum(1)->maximum(99)', $code);
     }
 
+    public function testIntegerWithMinimumAndExclusiveMinimumTrue(): void
+    {
+        $generator = new JsonSchemaCodeGenerator();
+        $code = $generator->generate(['type' => 'integer', 'minimum' => 0, 'exclusiveMinimum' => true]);
+
+        self::assertSame('$p->int()->exclusiveMinimum(0)', $code);
+    }
+
+    public function testIntegerWithMinimumAndExclusiveMinimumFalse(): void
+    {
+        $generator = new JsonSchemaCodeGenerator();
+        $code = $generator->generate(['type' => 'integer', 'minimum' => 0, 'exclusiveMinimum' => false]);
+
+        self::assertSame('$p->int()->minimum(0)', $code);
+    }
+
+    public function testIntegerWithMaximumAndExclusiveMaximumTrue(): void
+    {
+        $generator = new JsonSchemaCodeGenerator();
+        $code = $generator->generate(['type' => 'integer', 'maximum' => 100, 'exclusiveMaximum' => true]);
+
+        self::assertSame('$p->int()->exclusiveMaximum(100)', $code);
+    }
+
+    public function testIntegerWithMaximumAndExclusiveMaximumFalse(): void
+    {
+        $generator = new JsonSchemaCodeGenerator();
+        $code = $generator->generate(['type' => 'integer', 'maximum' => 100, 'exclusiveMaximum' => false]);
+
+        self::assertSame('$p->int()->maximum(100)', $code);
+    }
+
     public function testNumber(): void
     {
         $generator = new JsonSchemaCodeGenerator();
@@ -210,6 +242,38 @@ public function testNumberWithExclusiveMaximum(): void
         self::assertSame('$p->float()->exclusiveMaximum(100.0)', $code);
     }
 
+    public function testNumberWithMinimumAndExclusiveMinimumTrue(): void
+    {
+        $generator = new JsonSchemaCodeGenerator();
+        $code = $generator->generate(['type' => 'number', 'minimum' => 0.5, 'exclusiveMinimum' => true]);
+
+        self::assertSame('$p->float()->exclusiveMinimum(0.5)', $code);
+    }
+
+    public function testNumberWithMinimumAndExclusiveMinimumFalse(): void
+    {
+        $generator = new JsonSchemaCodeGenerator();
+        $code = $generator->generate(['type' => 'number', 'minimum' => 0.5, 'exclusiveMinimum' => false]);
+
+        self::assertSame('$p->float()->minimum(0.5)', $code);
+    }
+
+    public function testNumberWithMaximumAndExclusiveMaximumTrue(): void
+    {
+        $generator = new JsonSchemaCodeGenerator();
+        $code = $generator->generate(['type' => 'number', 'maximum' => 99.9, 'exclusiveMaximum' => true]);
+
+        self::assertSame('$p->float()->exclusiveMaximum(99.9)', $code);
+    }
+
+    public function testNumberWithMaximumAndExclusiveMaximumFalse(): void
+    {
+        $generator = new JsonSchemaCodeGenerator();
+        $code = $generator->generate(['type' => 'number', 'maximum' => 99.9, 'exclusiveMaximum' => false]);
+
+        self::assertSame('$p->float()->maximum(99.9)', $code);
+    }
+
     public function testBoolean(): void
     {
         $generator = new JsonSchemaCodeGenerator();