Making the resolver universal

Author: rogyar

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SmallImage.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Image.php

@@ -14,12 +14,11 @@
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Returns product's  image. If the image is not set, returns a placeholder
+ * Returns product's image. If the image is not set, returns a placeholder
  */
-class SmallImage implements ResolverInterface
+class Image implements ResolverInterface
 {
     /**
      * @var CatalogImageHelperFactory
@@ -34,16 +33,13 @@ class SmallImage implements ResolverInterface
     /**
      * @param ValueFactory $valueFactory
      * @param CatalogImageHelperFactory $catalogImageHelperFactory
-     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ValueFactory $valueFactory,
-        CatalogImageHelperFactory $catalogImageHelperFactory,
-        StoreManagerInterface $storeManager
+        CatalogImageHelperFactory $catalogImageHelperFactory
     ) {
         $this->valueFactory = $valueFactory;
         $this->catalogImageHelperFactory = $catalogImageHelperFactory;
-        $this->storeManager = $storeManager;
     }
 
     /**
@@ -57,10 +53,7 @@ public function resolve(
         array $args = null
     ): Value {
         if (!isset($value['model'])) {
-            $result = function () {
-                return null;
-            };
-            return $this->valueFactory->create($result);
+            throw new \LogicException(__("Cannot resolve entity model"));
         }
         /** @var Product $product */
         $product = $value['model'];

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -258,7 +258,7 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     meta_keyword: String @doc(description: "A comma-separated list of keywords that are visible only to search engines")
     meta_description: String @doc(description: "A brief overview of the product for search results listings, maximum 255 characters")
     image: String @doc(description: "The relative path to the main image on the product page")
-    small_image: ProductImage @doc(description: "The relative path to the small image, which is used on catalog pages") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\SmallImage")
+    small_image: ProductImage @doc(description: "The relative path to the small image, which is used on catalog pages") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Image")
     thumbnail: String @doc(description: "The relative path to the product's thumbnail image")
     new_from_date: String @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
     new_to_date: String @doc(description: "The end date for new product listings") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")