align function naming with json schema

Author: dominikzogg

README.md

@@ -35,7 +35,7 @@ Heavily inspired by the well-known TypeScript library [zod](https://github.com/c
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-parsing][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-parsing "^2.4"
+composer require chubbyphp/chubbyphp-parsing "^2.5"
 ```
 
 ## Quick Start
@@ -49,7 +49,7 @@ $p = new Parser();
 $userSchema = $p->object([
     'name' => $p->string()->minLength(1)->maxLength(100),
     'email' => $p->string()->email(),
-    'age' => $p->int()->gte(0)->lte(150),
+    'age' => $p->int()->minimum(0)->maximum(150),
 ]);
 
 // Parse and validate data

composer.json

@@ -50,7 +50,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev"
+            "dev-master": "2.5-dev"
         }
     },
     "scripts": {

doc/ErrorHandling.md

@@ -226,7 +226,7 @@ $p = new Parser();
 $requestSchema = $p->object([
     'name' => $p->string()->trim()->minLength(1)->maxLength(100),
     'email' => $p->string()->trim()->toLowerCase()->email(),
-    'age' => $p->int()->gte(0)->lte(150),
+    'age' => $p->int()->minimum(0)->maximum(150),
 ])->strict();
 
 function handleRequest(array $input): array
@@ -267,8 +267,8 @@ Each schema type uses a consistent error code prefix:
 | Schema | Prefix | Example Codes |
 |--------|--------|---------------|
 | string | `string.` | `string.type`, `string.minLength`, `string.email` |
-| int | `int.` | `int.type`, `int.gt`, `int.positive` |
-| float | `float.` | `float.type`, `float.gte`, `float.negative` |
+| int | `int.` | `int.type`, `int.exclusiveMinimum`, `int.positive` |
+| float | `float.` | `float.type`, `float.minimum`, `float.negative` |
 | bool | `bool.` | `bool.type` |
 | array | `array.` | `array.type`, `array.minLength` |
 | assoc | `assoc.` | `assoc.type`, `assoc.unknownField` |

doc/Schema/AssocSchema.md

@@ -158,7 +158,7 @@ echo $config['database']['host']; // 'localhost'
 $addressSchema = $p->assoc([
     'street' => $p->string(),
     'city' => $p->string(),
-    'zipCode' => $p->string()->regexp('/^\d{5}$/'),
+    'zipCode' => $p->string()->pattern('/^\d{5}$/'),
 ]);
 
 $personSchema = $p->assoc([

doc/Schema/DiscriminatedUnionSchema.md

@@ -63,7 +63,7 @@ $contactSchema = $p->discriminatedUnion([
     ]),
     $p->object([
         '_type' => $p->literal('phone'),
-        'number' => $p->string()->regexp('/^\+\d{10,15}$/'),
+        'number' => $p->string()->pattern('/^\+\d{10,15}$/'),
         'country' => $p->string()->length(2),
     ]),
     $p->object([
@@ -124,9 +124,9 @@ $eventSchema = $p->discriminatedUnion([
 $paymentSchema = $p->discriminatedUnion([
     $p->object([
         'method' => $p->literal('credit_card'),
-        'cardNumber' => $p->string()->regexp('/^\d{16}$/'),
-        'expiry' => $p->string()->regexp('/^\d{2}\/\d{2}$/'),
-        'cvv' => $p->string()->regexp('/^\d{3,4}$/'),
+        'cardNumber' => $p->string()->pattern('/^\d{16}$/'),
+        'expiry' => $p->string()->pattern('/^\d{2}\/\d{2}$/'),
+        'cvv' => $p->string()->pattern('/^\d{3,4}$/'),
     ]),
     $p->object([
         'method' => $p->literal('bank_transfer'),

doc/Schema/FloatSchema.md

@@ -19,10 +19,10 @@ $data = $schema->parse(4.2); // Returns: 4.2
 ### Comparison Constraints
 
 ```php
-$schema->gt(5.0);   // Greater than 5.0
-$schema->gte(5.0);  // Greater than or equal to 5.0
-$schema->lt(10.0);  // Less than 10.0
-$schema->lte(10.0); // Less than or equal to 10.0
+$schema->minimum(5.0);  // Greater than or equal to 5.0
+$schema->exclusiveMinimum(5.0);   // Greater than 5.0
+$schema->exclusiveMaximum(10.0);  // Less than 10.0
+$schema->maximum(10.0); // Less than or equal to 10.0
 ```
 
 ### Sign Constraints
@@ -56,17 +56,18 @@ $priceSchema->parse(-5.0);  // Throws: nonNegative validation error
 ### Percentage
 
 ```php
-$percentageSchema = $p->float()->gte(0.0)->lte(100.0);
+$percentageSchema = $p->float()->minimum(0.0)->maximum(100.0);
 
 $percentageSchema->parse(75.5); // Returns: 75.5
-$percentageSchema->parse(150.0); // Throws: lte validation error
+$percentageSchema->parse(-1.0); // Throws: minimum validation error
+$percentageSchema->parse(150.0); // Throws: maximum validation error
 ```
 
 ### Coordinates
 
 ```php
-$latitudeSchema = $p->float()->gte(-90.0)->lte(90.0);
-$longitudeSchema = $p->float()->gte(-180.0)->lte(180.0);
+$latitudeSchema = $p->float()->minimum(-90.0)->maximum(90.0);
+$longitudeSchema = $p->float()->minimum(-180.0)->maximum(180.0);
 
 $coordinatesSchema = $p->object([
     'lat' => $latitudeSchema,
@@ -81,8 +82,8 @@ $coordinatesSchema->parse(['lat' => 47.1, 'lng' => 8.2]);
 | Code | Description |
 |------|-------------|
 | `float.type` | Value is not a float |
-| `float.gt` | Value is not greater than threshold (used by `gt()` and `positive()`) |
-| `float.gte` | Value is not greater than or equal to threshold (used by `gte()` and `nonNegative()`) |
-| `float.lt` | Value is not less than threshold (used by `lt()` and `negative()`) |
-| `float.lte` | Value is not less than or equal to threshold (used by `lte()` and `nonPositive()`) |
+| `float.minimum` | Value is not greater than or equal to threshold (used by `minimum` and `nonNegative()`) |
+| `float.exclusiveMinimum` | Value is not greater than threshold (used by `exclusiveMinimum()` and `positive()`) |
+| `float.exclusiveMaximum` | Value is not less than threshold (used by `exclusiveMaximum()` and `negative()`) |
+| `float.maximum` | Value is not less than or equal to threshold (used by `maximum()` and `nonPositive()`) |
 | `float.int` | Cannot convert float to int without precision loss (for `toInt()`) |

doc/Schema/IntSchema.md

@@ -19,10 +19,10 @@ $data = $schema->parse(1337); // Returns: 1337
 ### Comparison Constraints
 
 ```php
-$schema->gt(5);   // Greater than 5
-$schema->gte(5);  // Greater than or equal to 5
-$schema->lt(10);  // Less than 10
-$schema->lte(10); // Less than or equal to 10
+$schema->minimum(5);  // Greater than or equal to 5
+$schema->exclusiveMinimum(5);   // Greater than 5
+$schema->exclusiveMaximum(10);  // Less than 10
+$schema->maximum(10); // Less than or equal to 10
 ```
 
 ### Sign Constraints
@@ -57,18 +57,18 @@ $positiveSchema->parse(-1);  // Throws: positive validation error
 ### Range Validation
 
 ```php
-$ageSchema = $p->int()->gte(0)->lte(150);
+$ageSchema = $p->int()->minimum(0)->maximum(150);
 
 $ageSchema->parse(25);  // Returns: 25
-$ageSchema->parse(-1);  // Throws: gte validation error
-$ageSchema->parse(200); // Throws: lte validation error
+$ageSchema->parse(-1);  // Throws: minimum validation error
+$ageSchema->parse(200); // Throws: maximum validation error
 ```
 
 ### Pagination
 
 ```php
 $offsetSchema = $p->int()->nonNegative();
-$limitSchema = $p->int()->positive()->lte(100);
+$limitSchema = $p->int()->positive()->maximum(100);
 
 $paginationSchema = $p->object([
     'offset' => $offsetSchema,
@@ -90,7 +90,7 @@ $date = $timestampSchema->parse(1705744500);
 | Code | Description |
 |------|-------------|
 | `int.type` | Value is not an integer |
-| `int.gt` | Value is not greater than threshold (used by `gt()` and `positive()`) |
-| `int.gte` | Value is not greater than or equal to threshold (used by `gte()` and `nonNegative()`) |
-| `int.lt` | Value is not less than threshold (used by `lt()` and `negative()`) |
-| `int.lte` | Value is not less than or equal to threshold (used by `lte()` and `nonPositive()`) |
+| `int.minimum` | Value is not greater than or equal to threshold (used by `minimum` and `nonNegative()`) |
+| `int.exclusiveMinimum` | Value is not greater than threshold (used by `exclusiveMinimum()` and `positive()`) |
+| `int.exclusiveMaximum` | Value is not less than threshold (used by `exclusiveMaximum()` and `negative()`) |
+| `int.maximum` | Value is not less than or equal to threshold (used by `maximum()` and `nonPositive()`) |

doc/Schema/ObjectSchema.md

@@ -123,7 +123,7 @@ $userSchema = $p->object([
 $createUserSchema = $p->object([
     'name' => $p->string()->trim()->minLength(1)->maxLength(100),
     'email' => $p->string()->trim()->toLowerCase()->email(),
-    'age' => $p->int()->gte(0)->lte(150),
+    'age' => $p->int()->minimum(0)->maximum(150),
 ])->strict();
 ```
 
@@ -133,7 +133,7 @@ $createUserSchema = $p->object([
 $addressSchema = $p->object([
     'street' => $p->string(),
     'city' => $p->string(),
-    'zipCode' => $p->string()->regexp('/^\d{5}$/'),
+    'zipCode' => $p->string()->pattern('/^\d{5}$/'),
 ]);
 
 $personSchema = $p->object([
@@ -182,7 +182,7 @@ $petSchema = $p->object([
 
 $listRequestSchema = $p->object([
     'offset' => $p->int()->nonNegative(),
-    'limit' => $p->int()->positive()->lte(100),
+    'limit' => $p->int()->positive()->maximum(100),
     'sort' => $p->record($p->literal('asc')),
     'items' => $p->array($petSchema),
 ]);

doc/Schema/StringSchema.md

@@ -30,7 +30,7 @@ $schema->maxLength(100); // Maximum 100 characters
 $schema->includes('amp');    // Must contain 'amp'
 $schema->startsWith('exa');  // Must start with 'exa'
 $schema->endsWith('ple');    // Must end with 'ple'
-$schema->regexp('/^[a-z]+$/i'); // Must match regex pattern
+$schema->pattern('/^[a-z]+$/i'); // Must match regex pattern
 ```
 
 ### Format Validations
@@ -110,7 +110,7 @@ $usernameSchema = $p->string()
     ->toLowerCase()
     ->minLength(3)
     ->maxLength(20)
-    ->regexp('/^[a-z0-9_]+$/');
+    ->pattern('/^[a-z0-9_]+$/');
 
 $usernameSchema->parse('  John_Doe123  '); // Returns: 'john_doe123'
 ```
@@ -131,7 +131,7 @@ $usernameSchema->parse('  John_Doe123  '); // Returns: 'john_doe123'
 | `string.ipV4` | Invalid IPv4 format |
 | `string.ipV6` | Invalid IPv6 format |
 | `string.mac` | Invalid mac format |
-| `string.regexp` | String doesn't match regex pattern |
+| `string.pattern` | String doesn't match the pattern |
 | `string.url` | Invalid URL format |
 | `string.uuidV4` | Invalid UUID v4 format |
 | `string.uuidV5` | Invalid UUID v5 format |

doc/Schema/TupleSchema.md

@@ -30,8 +30,8 @@ A tuple schema:
 
 ```php
 $coordinatesSchema = $p->tuple([
-    $p->float()->gte(-90)->lte(90),   // Latitude
-    $p->float()->gte(-180)->lte(180), // Longitude
+    $p->float()->minimum(-90)->maximum(90),   // Latitude
+    $p->float()->minimum(-180)->maximum(180), // Longitude
 ]);
 
 $coordinatesSchema->parse([47.3769, 8.5417]); // Zurich coordinates
@@ -41,9 +41,9 @@ $coordinatesSchema->parse([47.3769, 8.5417]); // Zurich coordinates
 
 ```php
 $rgbSchema = $p->tuple([
-    $p->int()->gte(0)->lte(255), // Red
-    $p->int()->gte(0)->lte(255), // Green
-    $p->int()->gte(0)->lte(255), // Blue
+    $p->int()->minimum(0)->maximum(255), // Red
+    $p->int()->minimum(0)->maximum(255), // Green
+    $p->int()->minimum(0)->maximum(255), // Blue
 ]);
 
 $rgbSchema->parse([255, 128, 0]); // Orange color
@@ -53,10 +53,10 @@ $rgbSchema->parse([255, 128, 0]); // Orange color
 
 ```php
 $rgbaSchema = $p->tuple([
-    $p->int()->gte(0)->lte(255),   // Red
-    $p->int()->gte(0)->lte(255),   // Green
-    $p->int()->gte(0)->lte(255),   // Blue
-    $p->float()->gte(0)->lte(1),   // Alpha
+    $p->int()->minimum(0)->maximum(255),   // Red
+    $p->int()->minimum(0)->maximum(255),   // Green
+    $p->int()->minimum(0)->maximum(255),   // Blue
+    $p->float()->minimum(0)->maximum(1),   // Alpha
 ]);
 
 $rgbaSchema->parse([255, 128, 0, 0.5]); // Semi-transparent orange
@@ -107,9 +107,9 @@ $point3dSchema->parse([1.5, 2.5, 3.5]);
 
 ```php
 $datePartsSchema = $p->tuple([
-    $p->int()->gte(1)->lte(9999), // Year
-    $p->int()->gte(1)->lte(12),   // Month
-    $p->int()->gte(1)->lte(31),   // Day
+    $p->int()->minimum(1)->maximum(9999), // Year
+    $p->int()->minimum(1)->maximum(12),   // Month
+    $p->int()->minimum(1)->maximum(31),   // Day
 ]);
 
 $datePartsSchema->parse([2024, 1, 20]);