Merge pull request #39 from shopware/fix-symfony-resolver-interface

fix: adds checks for argument resolving
shopware · Aug 28, 2023 · 5a1d2c7 · 5a1d2c7
2 parents e29a526 + bac03a6
commit 5a1d2c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/ArgumentValueResolver/ContextArgumentResolver.php b/src/ArgumentValueResolver/ContextArgumentResolver.php
@@ -68,9 +68,7 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
      */
     public function resolve(Request $request, ArgumentMetadata $argument): iterable
     {
-        /** @var class-string|null $type */
-        $type = $argument->getType();
-        if ($type === null) {
+        if(!$this->supports($request, $argument)) {
             return;
         }
 
@@ -81,6 +79,9 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
             $request->attributes->set(AppRequest::PSR_REQUEST_ATTRIBUTE, $psrRequest);
         }
 
+        /** @var class-string $type */
+        $type = $argument->getType();
+
         if ($type === RequestInterface::class) {
             yield $psrRequest;
             return;

diff --git a/tests/ArgumentValueResolver/ContextArgumentResolverTest.php b/tests/ArgumentValueResolver/ContextArgumentResolverTest.php
@@ -289,7 +289,7 @@ public function testSigningActions(string $action, bool $requiresSigning): void
         }
     }
 
-    public function testNoMatchingTypeThrows(): void
+    public function testIgnoresUnknownArgumentTypes(): void
     {
         $request = $this->getRequest();
 
@@ -299,10 +299,7 @@ public function testNoMatchingTypeThrows(): void
             $this->getPsrHttpFactory()
         );
 
-        static::expectException(\RuntimeException::class);
-        static::expectExceptionMessage('Unsupported type stdClass');
-
-        \iterator_to_array($resolver->resolve($request, new ArgumentMetadata('test', \stdClass::class, false, false, null)));
+        static::assertEmpty(\iterator_to_array($resolver->resolve($request, new ArgumentMetadata('test', \stdClass::class, false, false, null))));
     }
 
     public function getRequest(): Request