add support for non-negative-int and non-positive-int in phpDoc

Author: JanTvrdik

src/Compiler/MapperFactory/DefaultMapperCompilerFactory.php

@@ -50,6 +50,10 @@
 use ShipMonk\InputMapper\Compiler\Mapper\Wrapper\ValidatedMapperCompiler;
 use ShipMonk\InputMapper\Compiler\Type\PhpDocTypeUtils;
 use ShipMonk\InputMapper\Compiler\Validator\Int\AssertIntRange;
+use ShipMonk\InputMapper\Compiler\Validator\Int\AssertNegativeInt;
+use ShipMonk\InputMapper\Compiler\Validator\Int\AssertNonNegativeInt;
+use ShipMonk\InputMapper\Compiler\Validator\Int\AssertNonPositiveInt;
+use ShipMonk\InputMapper\Compiler\Validator\Int\AssertPositiveInt;
 use ShipMonk\InputMapper\Compiler\Validator\ValidatorCompiler;
 use ShipMonk\InputMapper\Runtime\Optional;
 use function class_exists;
@@ -116,8 +120,10 @@ public function create(TypeNode $type, array $options = []): MapperCompiler
 
                 default => match ($type->name) {
                     'list' => new MapList(new MapMixed()),
-                    'negative-int' => new ValidatedMapperCompiler(new MapInt(), [new AssertIntRange(lt: 0)]),
-                    'positive-int' => new ValidatedMapperCompiler(new MapInt(), [new AssertIntRange(gt: 0)]),
+                    'negative-int' => new ValidatedMapperCompiler(new MapInt(), [new AssertNegativeInt()]),
+                    'non-negative-int' => new ValidatedMapperCompiler(new MapInt(), [new AssertNonNegativeInt()]),
+                    'non-positive-int' => new ValidatedMapperCompiler(new MapInt(), [new AssertNonPositiveInt()]),
+                    'positive-int' => new ValidatedMapperCompiler(new MapInt(), [new AssertPositiveInt()]),
                     default => throw CannotCreateMapperCompilerException::fromType($type),
                 },
             };

tests/Compiler/MapperFactory/Data/BrandInput.php

@@ -8,8 +8,12 @@
 class BrandInput
 {
 
+    /**
+     * @param int<1900, 2100> $foundedIn
+     */
     public function __construct(
         public readonly string $name,
+        public readonly int $foundedIn,
     )
     {
     }

tests/Compiler/MapperFactory/DefaultMapperCompilerFactoryTest.php

@@ -32,6 +32,9 @@
 use ShipMonk\InputMapper\Compiler\Mapper\Wrapper\ValidatedMapperCompiler;
 use ShipMonk\InputMapper\Compiler\MapperFactory\DefaultMapperCompilerFactory;
 use ShipMonk\InputMapper\Compiler\Validator\Int\AssertIntRange;
+use ShipMonk\InputMapper\Compiler\Validator\Int\AssertNegativeInt;
+use ShipMonk\InputMapper\Compiler\Validator\Int\AssertNonNegativeInt;
+use ShipMonk\InputMapper\Compiler\Validator\Int\AssertNonPositiveInt;
 use ShipMonk\InputMapper\Compiler\Validator\Int\AssertPositiveInt;
 use ShipMonk\InputMapper\Compiler\Validator\String\AssertStringLength;
 use ShipMonk\InputMapper\Compiler\Validator\String\AssertUrl;
@@ -106,7 +109,13 @@ public static function provideCreateOkData(): iterable
             [],
             new MapObject(
                 BrandInput::class,
-                ['name' => new MapString()],
+                [
+                    'name' => new MapString(),
+                    'foundedIn' => new ValidatedMapperCompiler(
+                        new MapInt(),
+                        [new AssertIntRange(gte: 1_900, lte: 2_100)],
+                    ),
+                ],
                 allowExtraKeys: true,
             ),
         ];
@@ -240,6 +249,38 @@ public static function provideCreateOkData(): iterable
             ]),
         ];
 
+        yield 'positive-int' => [
+            'positive-int',
+            [],
+            new ValidatedMapperCompiler(new MapInt(), [
+                new AssertPositiveInt(),
+            ]),
+        ];
+
+        yield 'negative-int' => [
+            'negative-int',
+            [],
+            new ValidatedMapperCompiler(new MapInt(), [
+                new AssertNegativeInt(),
+            ]),
+        ];
+
+        yield 'non-positive-int' => [
+            'non-positive-int',
+            [],
+            new ValidatedMapperCompiler(new MapInt(), [
+                new AssertNonPositiveInt(),
+            ]),
+        ];
+
+        yield 'non-negative-int' => [
+            'non-negative-int',
+            [],
+            new ValidatedMapperCompiler(new MapInt(), [
+                new AssertNonNegativeInt(),
+            ]),
+        ];
+
         yield '?list<string>' => [
             '?list<string>',
             [],