Add INT range validation in StrictTypes; update route parameter mapping in RouteTest

Author: dconco

src/Utils/Routes/StrictTypes.php

@@ -66,11 +66,11 @@ protected static function matchStrictType (
 		{
 			return match ($typeOfNeedle)
 			{
-					'INT' => (int) $needle,
-					'BOOL' => filter_var($needle, FILTER_VALIDATE_BOOLEAN),
-					'FLOAT' => (float) $needle,
-					'ARRAY' => json_decode($needle, true),
-					default => $needle,
+				  'INT' => (int) $needle,
+				  'BOOL' => filter_var($needle, FILTER_VALIDATE_BOOLEAN),
+				  'FLOAT' => (float) $needle,
+				  'ARRAY' => json_decode($needle, true),
+				  default => $needle,
 			};
 		}
 
@@ -140,6 +140,23 @@ private static function matches (string $needle, string $haystack): bool
 			return true;
 		}
 
+		/**
+		 * MATCH INT<MIN, MAX>
+		 */
+		if (preg_match('/INT<(\d+)(?:,\s*(\d+))?>/', $haystack, $matches) && $typeOfNeedle === 'INT')
+		{
+			$min = (int) $matches[1];
+			$max = (int) $matches[2] ?? null;
+			$needle = (int) $needle;
+
+			if ((!$max && $min < $needle) || $max && ($needle < $min || $needle > $max))
+			{
+				$requested = !$max ? "INT min ($min)" : "INT min ($min), max($max)";
+				throw new Exception("Invalid request parameter type. {{$requested}} requested, but got {{$needle}}");
+			}
+			return true;
+		}
+
 		InvalidTypesException::catchInvalidStrictTypes($haystack);
 		return false;
 	}
@@ -186,9 +203,9 @@ protected static function typeOfString (string $string): string
 		{
 			return match (gettype($decoded))
 			{
-					'object' => 'JSON',
-					'array' => 'ARRAY',
-					default => 'STRING',
+				  'object' => 'JSON',
+				  'array' => 'ARRAY',
+				  default => 'STRING',
 			};
 		}
 

tests/manualTests/Router/RouteTest.php

@@ -17,11 +17,11 @@
  },
 );
 
-Route::map(GET, "$dir/user/{id: int|bool|array<array<int, string>, string>|alnum}")
+Route::map(GET, "$dir/user/{id: int<6>|bool|array<array<int, string>, string>|alnum}")
  ->action(function (Request $req)
  {
 	 echo '<br>';
-	 return $req->urlParam();
+	 return $req->urlParam('id');
  })
  ->route('/posts/{id: int}', function (Request $req, Closure $accept)
  {