Fix exceptions issues

Author: Mokhtar Tlili

src/DependencyInjection/Configuration.php

@@ -40,7 +40,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                             }
                             return false;
                         })
-                        ->thenInvalid(sprintf('Only the formats %s are supported. Got %s.', implode(', ', Input::INPUT_SUPPORTED_FORMATS), '%s'))
+                        ->thenInvalid(sprintf('Only the formats [%s] are supported. Got %s.', implode(', ', Input::INPUT_SUPPORTED_FORMATS), '%s'))
                     ->end()
                 ->end()
                 ->booleanNode('skip_validation')

src/EventListener/ExceptionListener.php

@@ -9,7 +9,6 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
-use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
 use Symfony\Component\Serializer\SerializerInterface;
 
 class ExceptionListener

src/EventListener/ReadInputListener.php

@@ -5,6 +5,7 @@
 namespace Sfmok\RequestInput\EventListener;
 
 use Sfmok\RequestInput\Attribute\Input;
+use Sfmok\RequestInput\Exception\UnexpectedFormatException;
 use Sfmok\RequestInput\Metadata\InputMetadataFactoryInterface;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
 
@@ -22,6 +23,14 @@ public function onKernelController(ControllerEvent $event): void
             return;
         }
 
+        if (!\in_array($inputMetadata->getFormat(), Input::INPUT_SUPPORTED_FORMATS)) {
+            throw new UnexpectedFormatException(sprintf(
+                'Only the formats [%s] are supported. Got %s.',
+                implode(', ', Input::INPUT_SUPPORTED_FORMATS),
+                $inputMetadata->getFormat()
+            ));
+        }
+
         $event->getRequest()->attributes->set('_input', $inputMetadata);
     }
 }

src/Exception/UnexpectedFormatException.php

@@ -6,6 +6,6 @@
 
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
-class UnexpectedFormatException extends BadRequestHttpException implements ExceptionInterface
+class UnexpectedFormatException extends BadRequestHttpException
 {
 }

src/Factory/InputFactory.php

@@ -32,9 +32,9 @@ public function createFromRequest(Request $request, string $type, string $format
     {
         if (!\in_array($format, Input::INPUT_SUPPORTED_FORMATS)) {
             throw new UnexpectedFormatException(sprintf(
-                'Only the formats %s are supported. Got %s.',
-                $format,
-                implode(', ', Input::INPUT_SUPPORTED_FORMATS)
+                'Only the formats [%s] are supported. Got %s.',
+                implode(', ', Input::INPUT_SUPPORTED_FORMATS),
+                $format
             ));
         }
 

tests/DependencyInjection/ConfigurationTest.php

@@ -50,8 +50,8 @@ public function invalidFormatsProvider(): iterable
      */
     public function testInvalidFormatsConfig(array $formats): void
     {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessageMatches('/Only the formats .+ are supported. Got .+./');
+        self::expectException(InvalidConfigurationException::class);
+        self::expectExceptionMessageMatches('/Only the formats .+ are supported. Got .+./');
 
         $this->processor->processConfiguration($this->configuration, [
             'request_input' => [

tests/EventListener/ReadInputListenerTest.php

@@ -9,6 +9,7 @@
 use Prophecy\Prophecy\ObjectProphecy;
 use Sfmok\RequestInput\Attribute\Input;
 use Sfmok\RequestInput\EventListener\ReadInputListener;
+use Sfmok\RequestInput\Exception\UnexpectedFormatException;
 use Sfmok\RequestInput\Metadata\InputMetadataFactory;
 use Sfmok\RequestInput\Tests\Fixtures\Controller\TestController;
 use Symfony\Component\HttpFoundation\Request;
@@ -47,6 +48,17 @@ public function testOnKernelControllerWithoutInput(): void
         self::assertFalse($request->attributes->has('_input'));
     }
 
+    public function testOnKernelControllerWithUnsupportedFormat(): void
+    {
+        self::expectException(UnexpectedFormatException::class);
+        self::expectExceptionMessageMatches('/Only the formats .+ are supported. Got .+./');
+
+        $request = new Request();
+        $event = $this->getControllerEvent($request, 'testWithInputUnsupportedFormat');
+        $listener = new ReadInputListener(new InputMetadataFactory());
+        $listener->onKernelController($event);
+    }
+
     private function getControllerEvent(Request $request, string $method): ControllerEvent
     {
         return new ControllerEvent(

tests/Fixtures/Controller/TestController.php

@@ -21,4 +21,9 @@ public function testWithInput(): void
     public function testWithoutInput(): void
     {
     }
+
+    #[Input(format: 'unsupported')]
+    public function testWithInputUnsupportedFormat(): void
+    {
+    }
 }