PUR2-2381: Fixes for compatibility with symfony7, php8 (#17)

* PUR2-2381: Fixes for compatibility with symfony7, php8

* PUR2-2381: Fixes for compatibility with symfony7, php8

* PUR2-2381: Fixes for compatibility with symfony7, php8

* PUR2-2381: Fixes for compatibility with symfony7, php8

* PUR2-2381: Fixes for compatibility with symfony7, php8

* PUR2-2381: Fixes for compatibility with symfony7, php8

Author: arturkurbidaev-auto1

.github/workflows/symfony.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ 'ubuntu-latest' ]
-        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
         phpunit-versions: [ 'latest' ]
     steps:
       - name: Setup PHP

ArgumentResolver/ServiceRequestResolver.php

@@ -16,7 +16,7 @@
 use Auto1\ServiceAPIHandlerBundle\EventListener\ServiceResponseListener;
 use Auto1\ServiceAPIRequest\ServiceRequestInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
@@ -26,7 +26,7 @@
 /**
  * Class ArgumentResolver
  */
-class ServiceRequestResolver implements ArgumentValueResolverInterface
+class ServiceRequestResolver implements ValueResolverInterface
 {
     use LoggerAwareTrait;
     /**
@@ -61,19 +61,15 @@ public function __construct(
         $this->serviceResponseListener = $serviceResponseListener;
     }
 
-    /**
-      * {@inheritdoc}
-     */
-    public function supports(Request $request, ArgumentMetadata $argument): bool
-    {
-        return is_subclass_of($argument->getType(), ServiceRequestInterface::class, true);
-    }
-
     /**
       * {@inheritdoc}
      */
     public function resolve(Request $request, ArgumentMetadata $argument): iterable
     {
+        if (!$this->supports($argument)) {
+            return [];
+        }
+
         $endpoint = $this->endpointRegistry->getEndpoint(
             (new \ReflectionClass($argument->getType()))->newInstanceWithoutConstructor()
         );
@@ -115,4 +111,9 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
             throw new BadRequestHttpException('Request deserialization error');
         }
     }
+
+    private function supports(ArgumentMetadata $argument): bool
+    {
+        return is_subclass_of($argument->getType(), ServiceRequestInterface::class, true);
+    }
 }

EventListener/ServiceResponseListener.php

@@ -48,7 +48,7 @@ public function __construct(SerializerInterface $serializer)
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             KernelEvents::VIEW => 'onKernelView',

Routing/EndpointLoader.php

@@ -43,7 +43,7 @@ public function __construct(EndpointRegistryInterface $endpointRegistry, array $
     /**
      * {@inheritdoc}
      */
-    public function load($resource, $type = null)
+    public function load($resource, $type = null): object
     {
         $routes = new RouteCollection();
 
@@ -73,7 +73,7 @@ public function load($resource, $type = null)
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, $type = null)
+    public function supports($resource, $type = null): bool
     {
         return 'endpoint_handler' === $type;
     }

Tests/ArgumentResolver/ServiceRequestResolverTest.php

@@ -180,17 +180,6 @@ public function testResolve(): void
         $this->assertInstanceOf(RequestStub::class, $generator->current());
     }
 
-    /**
-     * @dataProvider getDataForTestSupports
-     * @param ArgumentMetadata $argumentMetadata
-     * @param bool             $expectedResult
-     * @return void
-     */
-    public function testSupports(ArgumentMetadata $argumentMetadata, bool $expectedResult): void
-    {
-        $this->assertSame($expectedResult, $this->serviceRequestResolver->supports(new Request(), $argumentMetadata));
-    }
-
     public static function getDataForTestSupports(): \Generator
     {
         yield 'supported' => [self::createMetadata(), true];

composer.json

@@ -10,22 +10,22 @@
     }
   ],
   "require": {
-    "php": "^7.4|^8.0",
+    "php": "^8.1",
     "auto1-oss/service-api-request": "^1.0",
     "auto1-oss/service-api-components-bundle": "^1.0",
-    "symfony/serializer" : "~5.0|~6.0|~7.0",
-    "symfony/monolog-bridge": "~5.0|~6.0|~7.0",
-    "symfony/dependency-injection": "~5.0|~6.0|~7.0",
-    "symfony/config": "~5.0|~6.0|~7.0",
-    "symfony/http-kernel": "~5.0|~6.0|~7.0",
-    "symfony/http-foundation": "~5.0|~6.0|~7.0",
-    "symfony/property-info": "~5.0|~6.0|~7.0",
-    "symfony/yaml": "~5.0|~6.0|~7.0",
+    "symfony/serializer" : "~6.4|~7.0",
+    "symfony/monolog-bridge": "~6.4|~7.0",
+    "symfony/dependency-injection": "~6.4|~7.0",
+    "symfony/config": "~6.4|~7.0",
+    "symfony/http-kernel": "~6.4|~7.0",
+    "symfony/http-foundation": "~6.4|~7.0",
+    "symfony/property-info": "~6.4|~7.0",
+    "symfony/yaml": "~6.4|~7.0",
     "monolog/monolog": "~1.22|^2.9|^3.0",
-    "symfony/routing": "~5.0|~6.0|~7.0"
+    "symfony/routing": "~6.4|~7.0"
   },
   "require-dev": {
-    "symfony/console": "~5.0|~6.0|~7.0",
+    "symfony/console": "~6.4|~7.0",
     "phpunit/phpunit": "^7.5|^8.0|^9.6",
     "phpspec/prophecy": "^1.7.2"
   },