Allow the ProductImagesResolver to have both variant and product as input

Author: loevgaard

src/Resolver/CachedProductImagesResolver.php

@@ -4,6 +4,7 @@
 
 namespace Setono\SyliusSEOPlugin\Resolver;
 
+use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 
 final class CachedProductImagesResolver implements ProductImagesResolverInterface
@@ -15,10 +16,10 @@ public function __construct(private readonly ProductImagesResolverInterface $dec
     {
     }
 
-    public function resolve(ProductVariantInterface $productVariant): array
+    public function resolve(ProductInterface|ProductVariantInterface $product): array
     {
         if (null === $this->images) {
-            $this->images = $this->decorated->resolve($productVariant);
+            $this->images = $this->decorated->resolve($product);
         }
 
         return $this->images;

src/Resolver/ProductImagesResolver.php

@@ -8,20 +8,29 @@
 use Sylius\Component\Core\Model\ImageInterface;
 use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
+use Sylius\Component\Product\Resolver\ProductVariantResolverInterface;
 
 final class ProductImagesResolver implements ProductImagesResolverInterface
 {
     public function __construct(
+        private readonly ProductVariantResolverInterface $productVariantResolver,
         private readonly CacheManager $cacheManager,
         private readonly string $filter = 'sylius_original',
     ) {
     }
 
-    public function resolve(ProductVariantInterface $productVariant): array
+    public function resolve(ProductInterface|ProductVariantInterface $product): array
     {
+        if ($product instanceof ProductInterface) {
+            $product = $this->productVariantResolver->getVariant($product);
+            if (!$product instanceof ProductVariantInterface) {
+                return [];
+            }
+        }
+
         $images = [];
 
-        foreach (self::getImages($productVariant) as $image) {
+        foreach (self::getImages($product) as $image) {
             $path = $image->getPath();
             if (null === $path) {
                 continue;

src/Resolver/ProductImagesResolverInterface.php

@@ -4,6 +4,7 @@
 
 namespace Setono\SyliusSEOPlugin\Resolver;
 
+use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 
 interface ProductImagesResolverInterface
@@ -13,5 +14,5 @@ interface ProductImagesResolverInterface
      *
      * @return list<string>
      */
-    public function resolve(ProductVariantInterface $productVariant): array;
+    public function resolve(ProductInterface|ProductVariantInterface $product): array;
 }

src/Resources/config/services/resolver.xml

@@ -6,6 +6,7 @@
                  alias="Setono\SyliusSEOPlugin\Resolver\ProductImagesResolver"/>
 
         <service id="Setono\SyliusSEOPlugin\Resolver\ProductImagesResolver">
+            <argument type="service" id="sylius.product_variant_resolver.default"/>
             <argument type="service" id="liip_imagine.cache.manager"/>
         </service>