fix: Union types in controller throws exception (#88)

Author: silasjoisten

src/ValueResolver/ContentTypeValueResolver.php

@@ -36,7 +36,16 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
             return [];
         }
 
-        if ($argument->getType() !== $request->attributes->get('_storyblok_content_type')) {
+        if (null === $argument->getType()) {
+            return [];
+        }
+
+        $types = \array_filter(
+            \explode('|', $argument->getType()),
+            static fn (string $type) => $request->attributes->get('_storyblok_content_type') === $type,
+        );
+
+        if (\count($types) === 0) {
             return [];
         }
 

tests/Unit/ValueResolver/ContentTypeValueResolverTest.php

@@ -17,6 +17,7 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Storyblok\Bundle\ContentType\ContentTypeStorage;
+use Storyblok\Bundle\Tests\Double\ContentType\AnotherContentType;
 use Storyblok\Bundle\Tests\Double\ContentType\SampleContentType;
 use Storyblok\Bundle\Tests\Util\FakerTrait;
 use Storyblok\Bundle\ValueResolver\ContentTypeValueResolver;
@@ -74,4 +75,21 @@ public function resolveStorageIsEmpty(): void
 
         self::assertEmpty($resolver->resolve($request, new ArgumentMetadata($faker->word(), SampleContentType::class, false, false, null)));
     }
+
+    #[Test]
+    public function resolveWithUnionType(): void
+    {
+        $faker = self::faker();
+        $storage = new ContentTypeStorage();
+        $storage->setContentType($expected = new SampleContentType([]));
+
+        $resolver = new ContentTypeValueResolver($storage);
+
+        $request = new Request();
+        $request->attributes->set('_storyblok_content_type', $expected::class);
+
+        $unionType = SampleContentType::class.'|'.AnotherContentType::class;
+
+        self::assertSame([$expected], $resolver->resolve($request, new ArgumentMetadata($faker->word(), $unionType, false, false, null)));
+    }
 }