[RequestMapper]: Added type extractors, remove unused code

Author: fractalzombie

.github/workflows/ci.yml

@@ -61,4 +61,4 @@ jobs:
         run: mkdir -p var/tests
 
       - name: Unit Tests
-        run: ./vendor/bin/phpunit --colors=always --configuration phpunit.xml.dist --log-junit var/tests/.phpunit.output.xml
+        run: ./vendor/bin/phpunit --colors=always --configuration phpunit.xml.dist

.gitignore

@@ -17,6 +17,7 @@
 .phpunit
 .phpunit.result.cache
 /phpunit.xml
+/.phpunit.cache
 bin/phpunit
 ###< symfony/phpunit-bridge ###
 

.scrutinizer.yml

@@ -7,12 +7,10 @@ build:
     coverage:
       tests:
         override:
-          - command: mkdir -p var/tests/coverage && php -n -dzend_extension=xdebug -dxdebug.mode=coverage vendor/bin/phpunit --colors=always --configuration phpunit.xml.dist --log-junit var/tests/.phpunit.output.xml --coverage-clover var/tests/coverage/coverage.xml
-            coverage:
-              file: var/tests/coverage/coverage.xml
-              format: clover
+          - command: composer test
+
   environment:
-    php: 8.1
+    php: 8.1.9
 
 filter:
   excluded_paths:

.travis.yml

@@ -7,7 +7,7 @@
 use FRZB\Component\RequestMapper\Data\ErrorContract;
 use Symfony\Contracts\EventDispatcher\Event;
 
-final class ListenerExceptionEvent extends Event
+class ListenerExceptionEvent extends Event
 {
     public function __construct(
         private readonly Event $event,

Attribute/ParamConverter.php

@@ -13,7 +13,7 @@
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as EventDispatcher;
 
 #[AsEventListener(event: KernelEvents::EXCEPTION, method: 'onKernelException', priority: 20)]
-final class ExceptionListener
+class ExceptionListener
 {
     private const ALLOWED_CONTENT_TYPE = 'application/json';
 

CHANGELOG.md

@@ -16,7 +16,7 @@
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as EventDispatcher;
 
 #[AsEventListener(event: KernelEvents::REQUEST, method: 'onKernelRequest', priority: 20)]
-final class JsonRequestListener
+class JsonRequestListener
 {
     private const ALLOWED_CONTENT_TYPES = ['application/json'];
 

Event/ListenerExceptionEvent.php

@@ -10,7 +10,7 @@
 use Symfony\Component\HttpKernel\KernelEvents;
 
 #[AsEventListener(event: KernelEvents::REQUEST, method: 'onKernelRequest', priority: 10)]
-final class MergeRequestListener
+class MergeRequestListener
 {
     private const ROUTE_PARAMS_KEY = '_route_params';
 

EventListener/ExceptionListener.php

@@ -7,17 +7,17 @@
 use FRZB\Component\RequestMapper\Attribute\RequestBody;
 use FRZB\Component\RequestMapper\Data\HasHeaders;
 use FRZB\Component\RequestMapper\Helper\HeaderHelper;
-use FRZB\Component\RequestMapper\Helper\ParamConverterHelper;
-use FRZB\Component\RequestMapper\RequestMapper\RequestMapperInterface as Converter;
+use FRZB\Component\RequestMapper\Helper\RequestBodyHelper;
+use FRZB\Component\RequestMapper\RequestMapper\RequestMapperInterface as RequestMapper;
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 #[AsEventListener(event: KernelEvents::CONTROLLER, method: 'onKernelController', priority: -255)]
-final class RequestMapperListener
+class RequestMapperListener
 {
     public function __construct(
-        private readonly Converter $converter,
+        private readonly RequestMapper $mapper,
     ) {
     }
 
@@ -30,14 +30,14 @@ public function onKernelController(ControllerEvent $event): void
 
         foreach ($method->getParameters() as $parameter) {
             $parameterType = (string) $parameter->getType();
-            $attribute = ParamConverterHelper::getAttribute($parameter, $attributes);
-            $isNativeRequest = is_a($request, $parameterType) || is_subclass_of($request, $parameterType);
+            $attribute = RequestBodyHelper::getAttribute($parameter, $attributes);
+            $isNativeRequest = $request instanceof $parameterType;
 
             if (!$attribute || $isNativeRequest) {
                 continue;
             }
 
-            $object = $this->converter->convert($request, $attribute);
+            $object = $this->mapper->map($request, $attribute);
 
             if ($object instanceof HasHeaders) {
                 $object->setHeaders(HeaderHelper::getHeaders($request));
@@ -48,10 +48,10 @@ public function onKernelController(ControllerEvent $event): void
     }
 
     /** @throws \ReflectionException */
-    private function getReflectionMethod(mixed $controller): \ReflectionMethod|\ReflectionFunction
+    private function getReflectionMethod(array|object|callable $controller): \ReflectionMethod|\ReflectionFunction
     {
         return match (true) {
-            \is_array($controller) => new \ReflectionMethod(/** @scrutinizer ignore-type */ ...$controller),
+            \is_array($controller) => new \ReflectionMethod(...$controller),
             \is_object($controller) && \is_callable($controller) => new \ReflectionMethod($controller, '__invoke'),
             default => new \ReflectionFunction($controller),
         };
@@ -60,7 +60,7 @@ private function getReflectionMethod(mixed $controller): \ReflectionMethod|\Refl
     /** @return array<RequestBody> */
     private function getAttributes(\ReflectionMethod|\ReflectionFunction $method): array
     {
-        return ParamConverterHelper::fromReflectionAttributes(
+        return RequestBodyHelper::fromReflectionAttributes(
             ...$method->getAttributes(RequestBody::class, \ReflectionAttribute::IS_INSTANCEOF)
         );
     }

EventListener/JsonRequestListener.php

@@ -10,12 +10,12 @@
 #[Immutable]
 final class ExceptionMapperLocatorException extends \DomainException
 {
-    private const NO_MAPPER_FOUND_MESSAGE = 'No mapper found for exception "%s"';
+    private const NOT_FOUND_MESSAGE = 'No mapper found for exception "%s"';
 
     #[Pure(true)]
-    public static function noMapperFound(\Throwable $previous, bool $wrapCallable = true): callable|self
+    public static function notFound(\Throwable $previous, bool $wrapCallable = true): callable|self
     {
-        $message = sprintf(self::NO_MAPPER_FOUND_MESSAGE, $previous::class);
+        $message = sprintf(self::NOT_FOUND_MESSAGE, $previous::class);
         $exception = new self($message, previous: $previous);
 
         return $wrapCallable ? static fn () => throw $exception : $exception;

EventListener/MergeRequestListener.php

@@ -9,13 +9,13 @@
 #[Immutable]
 final class PropertyMapperLocatorException extends \LogicException
 {
-    private const DEFAULT_NO_MAPPER_FOUND_MESSAGE = 'Mapper not found for %s::%s';
+    private const NOT_FOUND_MESSAGE = 'Mapper not found for %s::%s';
 
-    public static function throwMapperNotFound(\ReflectionProperty $property, bool $wrapCallable = true, ?\Throwable $previous = null): callable|self
+    public static function notFound(\ReflectionProperty $property, bool $wrapCallable = true, ?\Throwable $previous = null): callable|self
     {
         $className = $property->getDeclaringClass()->getName();
         $propertyName = $property->getName();
-        $message = sprintf(self::DEFAULT_NO_MAPPER_FOUND_MESSAGE, $className, $propertyName);
+        $message = sprintf(self::NOT_FOUND_MESSAGE, $className, $propertyName);
         $exception = new self($message, previous: $previous);
 
         return $wrapCallable ? static fn () => throw $exception : throw $exception;

EventListener/RequestMapperListener.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FRZB\Component\RequestMapper\Exception;
+
+class TypeExtractorLocatorException extends \LogicException
+{
+    private const NOT_FOUND_MESSAGE = 'Type extractor not found for "%s:%s"';
+
+    public static function notFound(\ReflectionProperty|\ReflectionParameter $target, bool $wrapCallable = true, ?\Throwable $previous = null): callable|self
+    {
+        $message = sprintf(self::NOT_FOUND_MESSAGE, $target->getDeclaringClass()->getName(), $target->getName());
+        $exception = new self($message, previous: $previous);
+
+        return $wrapCallable ? static fn () => throw $exception : $exception;
+    }
+}

Exception/ExceptionMapperLocatorException.php

@@ -25,7 +25,7 @@ public function get(\Throwable $exception): ExceptionMapper
     {
         return $this->mappers
             ->get($exception::class)
-            ->getOrThrow(ExceptionMapperLocatorException::noMapperFound($exception))
+            ->getOrThrow(ExceptionMapperLocatorException::notFound($exception))
         ;
     }
 }

Exception/PropertyMapperLocatorException.php

@@ -9,16 +9,22 @@
 use FRZB\Component\RequestMapper\Helper\ClassHelper;
 use FRZB\Component\RequestMapper\Helper\ConstraintsHelper;
 use FRZB\Component\RequestMapper\Helper\PropertyHelper;
+use FRZB\Component\RequestMapper\TypeExtractor\TypeExtractorLocatorInterface as TypeExtractorLocator;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\Constraints\Collection;
 
 #[AsService]
 class ConstraintExtractor
 {
-    public function extract(string $className, array $parameters = []): ?Collection
+    public function __construct(
+        private readonly TypeExtractorLocator $extractorLocator,
+    ) {
+    }
+
+    public function extract(string $className, array $payload = []): ?Collection
     {
         try {
-            return ConstraintsHelper::createCollection($this->extractConstraints($className, $parameters));
+            return ConstraintsHelper::createCollection($this->extractConstraints($className, $payload));
         } catch (\ReflectionException) {
             return null;
         }
@@ -38,10 +44,9 @@ public function extractConstraints(string $className, array $parameters = []): a
             $propertyName = PropertyHelper::getName($property);
             $propertyValue = $parameters[$propertyName] ?? [];
             $propertyTypeName = PropertyHelper::getTypeName($property);
-            $arrayTypeName = ConstraintsHelper::getArrayTypeAttribute($property)?->typeName;
 
             $constraints[$propertyName] = match (true) {
-                ConstraintsHelper::hasArrayTypeAttribute($property) => ArrayList::collect($propertyValue)->map(fn () => new All($this->extract($arrayTypeName, $propertyValue)))->toArray(),
+                $this->extractorLocator->has($property) => ArrayList::collect($propertyValue)->map(fn () => new All($this->extract($this->extractorLocator->get($property)->extract($property), $propertyValue)))->toArray(),
                 ClassHelper::isNotBuiltinAndExists($propertyTypeName) => $this->extract($propertyTypeName, $propertyValue),
                 default => ConstraintsHelper::fromProperty($property),
             };

Exception/TypeExtractorLocatorException.php

@@ -13,12 +13,12 @@
 class DiscriminatorMapExtractor
 {
     /** @throws ClassExtractorException */
-    public function extract(string $className, array $parameters): string
+    public function extract(string $className, array $payload): string
     {
         if ($discriminatorMap = ClassHelper::getAttribute($className, DiscriminatorMap::class)) {
             $property = $discriminatorMap->getTypeProperty();
             $mapping = $discriminatorMap->getMapping();
-            $parameter = $parameters[$property] ?? throw ClassExtractorException::fromDiscriminatorMapWhenParameterIsNull($discriminatorMap);
+            $parameter = $payload[$property] ?? throw ClassExtractorException::fromDiscriminatorMapWhenParameterIsNull($discriminatorMap);
             $className = $mapping[$parameter] ?? throw ClassExtractorException::fromDiscriminatorMapWhenParameterInvalid($discriminatorMap);
         }
 

ExceptionMapper/ExceptionMapperLocator.php

@@ -17,9 +17,9 @@ public function __construct(
     ) {
     }
 
-    public function extract(string $class, array $parameters): array
+    public function extract(string $className, array $payload): array
     {
-        return [...$parameters, ...$this->mapProperties($this->classMapper->map($class, $parameters), $parameters)];
+        return [...$payload, ...$this->mapProperties($this->classMapper->map($className, $payload), $payload)];
     }
 
     private function mapProperties(array $properties, array $parameters): array
@@ -33,7 +33,6 @@ private function mapProperties(array $properties, array $parameters): array
                 \is_array($propertyType) => array_map(fn (array $parameters) => $this->extract(current($propertyType), $parameters), $propertyValue ?? []),
                 ClassHelper::isNotBuiltinAndExists($propertyType) => $this->extract($propertyType, $propertyValue ?? []),
                 ClassHelper::isEnum($propertyType) => $this->mapEnum($propertyType, $propertyValue) ?? $propertyValue,
-                !ClassHelper::isNotBuiltinAndExists($propertyType) => $propertyValue,
                 default => $propertyValue,
             };
         }
@@ -45,8 +44,8 @@ private function mapProperties(array $properties, array $parameters): array
     private function mapEnum(string $enumClassName, mixed $value = null): ?\BackedEnum
     {
         return match (true) {
-            is_subclass_of($enumClassName, \IntBackedEnum::class) && \is_int($value) && !empty($value) => $enumClassName::tryFrom($value),
-            is_subclass_of($enumClassName, \StringBackedEnum::class) && \is_string($value) && !empty($value) => $enumClassName::tryFrom($value),
+            is_subclass_of($enumClassName, \IntBackedEnum::class) && \is_int($value) => $enumClassName::tryFrom($value),
+            is_subclass_of($enumClassName, \StringBackedEnum::class) && \is_string($value) => $enumClassName::tryFrom($value),
             default => null,
         };
     }

Extractor/ConstraintExtractor.php

@@ -4,8 +4,6 @@
 
 namespace FRZB\Component\RequestMapper\Helper;
 
-use FRZB\Component\PhpDocReader\Reader\ReaderInterface as PhpDocReader;
-use FRZB\Component\RequestMapper\Attribute\ArrayType;
 use JetBrains\PhpStorm\Immutable;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\Collection;
@@ -28,19 +26,4 @@ public static function fromProperty(\ReflectionProperty $rProperty): array
     {
         return AttributeHelper::getAttributes($rProperty, Constraint::class);
     }
-
-    public static function getArrayTypeAttribute(\ReflectionProperty $rProperty): ?ArrayType
-    {
-        return AttributeHelper::getAttribute($rProperty, ArrayType::class);
-    }
-
-    public static function hasArrayTypeAttribute(\ReflectionProperty $rProperty): bool
-    {
-        return 'array' === PropertyHelper::getTypeName($rProperty) && null !== AttributeHelper::getAttribute($rProperty, ArrayType::class);
-    }
-
-    public static function hasArrayDocBlock(\ReflectionProperty $rProperty, PhpDocReader $reader): bool
-    {
-        return 'array' === PropertyHelper::getTypeName($rProperty) && null !== $reader->getPropertyClass($rProperty);
-    }
 }