Enhance type validation in StrictTypes and InvalidTypesException; improve error handling for array parameters

Author: dconco

src/Utils/Routes/Exception/InvalidTypesException.php

@@ -50,7 +50,7 @@ public static function catchInvalidStrictTypes (array|string $type, ?Closure $me
       {
          foreach ($type as $t)
          {
-            if (!in_array($t, self::$types))
+            if (!in_array($t, self::$types) && !preg_match('/<(.+)>/', (string) $t))
             {
                if (!$message)
                {
@@ -65,7 +65,7 @@ public static function catchInvalidStrictTypes (array|string $type, ?Closure $me
       }
       else
       {
-         if (!in_array($type, self::$types))
+         if (!in_array($type, self::$types) && !preg_match('/<(.+)>/', (string) $type))
          {
             if (!$message)
             {

src/Utils/Routes/StrictTypes.php

@@ -2,6 +2,7 @@
 
 namespace PhpSlides\Core\Utils\Routes;
 
+use PhpSlides\Exception;
 use PhpSlides\Core\Utils\Routes\Exception\InvalidTypesException;
 
 /**
@@ -66,13 +67,14 @@ protected static function matchStrictType (
 			return match ($typeOfNeedle)
 			{
 					'INT' => (int) $needle,
-					'BOOL' => (bool) $needle,
+					'BOOL' => filter_var($needle, FILTER_VALIDATE_BOOLEAN),
 					'FLOAT' => (float) $needle,
 					'ARRAY' => json_decode($needle, true),
 					default => $needle,
 			};
 		}
 
+		InvalidTypesException::catchInvalidStrictTypes($haystack);
 		throw InvalidTypesException::catchInvalidParameterTypes($types, $typeOfNeedle);
 	}
 
@@ -103,10 +105,20 @@ private static function matches (string $needle, string $haystack): bool
 		)
 		{
 			$needle = json_decode($needle, true);
-			$eachArrayTypes = explode(',', $matches[1]);
+			$eachArrayTypes = preg_split('/,(?![^<]*>)/', $matches[1]);
+
+			if (!is_array($needle))
+			{
+				throw new Exception("Invalid request parameter type. {ARRAY} requested, but got {{$typeOfNeedle}}");
+			}
 
 			foreach ($eachArrayTypes as $key => $eachArrayType)
 			{
+				if (!isset($needle[$key]))
+				{
+					throw new Exception("Array index $key not found in the request parameter");
+				}
+
 				$needle2 = is_array($needle[$key])
 				 ? json_encode($needle[$key])
 				 : (string) $needle[$key];
@@ -152,20 +164,13 @@ private static function matches (string $needle, string $haystack): bool
 	 */
 	protected static function typeOfString (string $string): string
 	{
-		$jd = json_decode($string, false);
+		$decoded = json_decode($string, false);
 
 		if (is_numeric($string))
 		{
-			if (strpos($string, '.') !== false)
-			{
-				return 'FLOAT';
-			}
-			else
-			{
-				return 'INT';
-			}
+			return strpos($string, '.') !== false ? 'FLOAT' : 'INT';
 		}
-		elseif (is_bool($string) || $string === 'true' || $string === 'false')
+		elseif (filter_var($string, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null)
 		{
 			return 'BOOL';
 		}
@@ -179,16 +184,14 @@ protected static function typeOfString (string $string): string
 		}
 		elseif (json_last_error() === JSON_ERROR_NONE)
 		{
-			return match (gettype($jd))
+			return match (gettype($decoded))
 			{
 					'object' => 'JSON',
 					'array' => 'ARRAY',
 					default => 'STRING',
 			};
 		}
-		else
-		{
-			return 'STRING';
-		}
+
+		return 'STRING';
 	}
 }

tests/manualTests/Router/RouteTest.php

@@ -17,7 +17,7 @@
  },
 );
 
-Route::map(GET, "$dir/user/{id: int|bool|array<array<int>, string>|alnum}")
+Route::map(GET, "$dir/user/{id: int|bool|array<array<int, string>, string>|alnum}")
  ->action(function (Request $req)
  {
 	 echo '<br>';