PB-27: Resolve & improve GraphQL error with Products widget

- Move plugin to CatalogGraphQl

Author: davemacaulay

app/code/Magento/CmsGraphQl/Plugin/DesignLoader.php renamed to app/code/Magento/CatalogGraphQl/Plugin/DesignLoader.php

@@ -5,33 +5,36 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CmsGraphQl\Plugin;
+namespace Magento\CatalogGraphQl\Plugin;
 
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\View\DesignLoader as ViewDesignLoader;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Catalog\Block\Product\ImageFactory;
 
 /**
  * Load necessary design files for GraphQL
  */
 class DesignLoader
 {
     /**
-     * @var \Magento\Framework\View\DesignLoader
+     * @var DesignLoader
      */
-    protected $designLoader;
+    private $designLoader;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface
+     * @var ManagerInterface
      */
-    protected $messageManager;
+    private $messageManager;
 
     /**
-     * @param \Magento\Framework\View\DesignLoader $designLoader
-     * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param ViewDesignLoader $designLoader
+     * @param ManagerInterface $messageManager
      */
     public function __construct(
-        \Magento\Framework\View\DesignLoader $designLoader,
-        \Magento\Framework\Message\ManagerInterface $messageManager
+        ViewDesignLoader $designLoader,
+        ManagerInterface $messageManager
     ) {
         $this->designLoader = $designLoader;
         $this->messageManager = $messageManager;
@@ -40,15 +43,15 @@ public function __construct(
     /**
      * Before create load the design files
      *
-     * @param \Magento\Catalog\Block\Product\ImageFactory $subject
+     * @param ImageFactory $subject
      * @param Product $product
      * @param string $imageId
      * @param array|null $attributes
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeCreate(
-        \Magento\Catalog\Block\Product\ImageFactory $subject,
+        ImageFactory $subject,
         Product $product,
         string $imageId,
         array $attributes = null
@@ -65,4 +68,4 @@ public function beforeCreate(
             }
         }
     }
-}
+}

app/code/Magento/CatalogGraphQl/etc/graphql/di.xml

@@ -137,4 +137,8 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\Catalog\Block\Product\ImageFactory">
+        <plugin name="designLoader" type="Magento\CatalogGraphQl\Plugin\DesignLoader" />
+    </type>
 </config>

app/code/Magento/CmsGraphQl/etc/graphql/di.xml

@@ -18,7 +18,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Catalog\Block\Product\ImageFactory">
-        <plugin name="designLoader" type="Magento\CmsGraphQl\Plugin\DesignLoader" />
-    </type>
 </config>