Add options array parameter to ITypeMapper interface

- Add 2nd parameter array \$options = [] to ITypeMapper::normalize()
- Update all type mapper implementations with @inheritdoc
- Make EnumTypeMapper implement ITypeMapper interface
- Pass EndpointParameter via options['endpoint'] in RequestParameterMapping
- Remove enum values from exception message for cleaner output

Author: claude

src/Core/Mapping/Parameter/BooleanTypeMapper.php

@@ -7,7 +7,10 @@
 class BooleanTypeMapper implements ITypeMapper
 {
 
-	public function normalize(mixed $value): ?bool
+	/**
+	 * @inheritDoc
+	 */
+	public function normalize(mixed $value, array $options = []): ?bool
 	{
 		if ($value === 'true' || $value === true) {
 			return true;

src/Core/Mapping/Parameter/DateTimeTypeMapper.php

@@ -9,7 +9,10 @@
 class DateTimeTypeMapper implements ITypeMapper
 {
 
-	public function normalize(mixed $value): ?DateTimeImmutable
+	/**
+	 * @inheritDoc
+	 */
+	public function normalize(mixed $value, array $options = []): ?DateTimeImmutable
 	{
 		try {
 			$value = DateTimeImmutable::createFromFormat(DATE_ATOM, $value);

src/Core/Mapping/Parameter/EnumTypeMapper.php

@@ -3,13 +3,21 @@
 namespace Apitte\Core\Mapping\Parameter;
 
 use Apitte\Core\Exception\Runtime\InvalidArgumentTypeException;
+use Apitte\Core\Schema\EndpointParameter;
 
 class EnumTypeMapper implements ITypeMapper
 {
 
-	public function normalize(mixed $value, ?array $enumValues = null): string
+	/**
+	 * @inheritDoc
+	 */
+	public function normalize(mixed $value, array $options = []): string|int
 	{
-		if (!in_array($value, $enumValues)) {
+		/** @var EndpointParameter|null $endpoint */
+		$endpoint = $options['endpoint'] ?? null;
+		$enumValues = $endpoint?->getEnum() ?? [];
+
+		if ($enumValues === [] || !in_array($value, $enumValues, true)) {
 			throw new InvalidArgumentTypeException(InvalidArgumentTypeException::TYPE_ENUM);
 		}
 

src/Core/Mapping/Parameter/FloatTypeMapper.php

@@ -7,7 +7,10 @@
 class FloatTypeMapper implements ITypeMapper
 {
 
-	public function normalize(mixed $value): ?float
+	/**
+	 * @inheritDoc
+	 */
+	public function normalize(mixed $value, array $options = []): ?float
 	{
 		if (is_string($value)) {
 			$value = str_replace(',', '.', $value); // Accept also comma as decimal separator

src/Core/Mapping/Parameter/ITypeMapper.php

@@ -8,8 +8,9 @@ interface ITypeMapper
 {
 
 	/**
+	 * @param array<string, mixed> $options
 	 * @throws InvalidArgumentTypeException
 	 */
-	public function normalize(mixed $value/*, ?array $enumValues = null*/): mixed;
+	public function normalize(mixed $value, array $options = []): mixed;
 
 }

src/Core/Mapping/Parameter/IntegerTypeMapper.php

@@ -7,7 +7,10 @@
 class IntegerTypeMapper implements ITypeMapper
 {
 
-	public function normalize(mixed $value): int
+	/**
+	 * @inheritDoc
+	 */
+	public function normalize(mixed $value, array $options = []): int
 	{
 		if (is_int($value) || (is_string($value) && preg_match('#^[+-]?[0-9]+\z#', $value) === 1)) {
 			return (int) $value;

src/Core/Mapping/Parameter/StringTypeMapper.php

@@ -7,7 +7,10 @@
 class StringTypeMapper implements ITypeMapper
 {
 
-	public function normalize(mixed $value): ?string
+	/**
+	 * @inheritDoc
+	 */
+	public function normalize(mixed $value, array $options = []): ?string
 	{
 		if (!is_scalar($value)) {
 			throw new InvalidArgumentTypeException('string');

src/Core/Mapping/RequestParameterMapping.php

@@ -22,7 +22,7 @@ class RequestParameterMapping
 		InvalidArgumentTypeException::TYPE_FLOAT => '%s request parameter "%s" should be of type float or integer.',
 		InvalidArgumentTypeException::TYPE_BOOLEAN => '%s request parameter "%s" should be of type boolean. Pass "true" for true or "false" for false.',
 		InvalidArgumentTypeException::TYPE_DATETIME => '%s request parameter "%s" should be of type datetime in format ISO 8601 (Y-m-d\TH:i:sP).',
-		InvalidArgumentTypeException::TYPE_ENUM => '%s request parameter "%s" is not in the allowed values `[%s]`.',
+		InvalidArgumentTypeException::TYPE_ENUM => '%s request parameter "%s" is not in the allowed values.',
 	];
 
 	protected static string $customException = '%s request parameter "%s" should be of type %s.%s';
@@ -211,14 +211,13 @@ protected function normalize(mixed $value, EndpointParameter $parameter, ITypeMa
 		}
 
 		try {
-			return $mapper->normalize($value, $parameter->getEnum());
+			return $mapper->normalize($value, ['endpoint' => $parameter]);
 		} catch (InvalidArgumentTypeException $e) {
 			if (array_key_exists($e->getType(), self::$exceptions)) {
 				throw new ClientErrorException(sprintf(
 					self::$exceptions[$e->getType()],
 					ucfirst($parameter->getIn()),
-					$parameter->getName(),
-					$parameter->getEnum() ? implode(', ', $parameter->getEnum()) : ''
+					$parameter->getName()
 				));
 			} else {
 				throw new ClientErrorException(sprintf(

tests/Fixtures/Mapping/Parameter/MyEmailTypeMapper.php

@@ -8,7 +8,10 @@
 class MyEmailTypeMapper implements ITypeMapper
 {
 
-	public function normalize(mixed $value): string
+	/**
+	 * @inheritDoc
+	 */
+	public function normalize(mixed $value, array $options = []): string
 	{
 		if (is_string($value) && filter_var($value, FILTER_VALIDATE_EMAIL)) {
 			return $value;