ENGCOM-8453: Item resolvers should be optional #30823

magento-engcom-team · magento-engcom-team · commit 59e3f71e5644 · 2021-04-08T06:11:15.000-05:00
- Merge Pull Request #30823 from thomas-kl1/magento2:patch-2 - Merged commits: 1. 8ed5082 2. 8a569ee
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
@@ -16,7 +16,7 @@
 class ItemResolverComposite implements ItemResolverInterface
 {
     /** @var string[] */
-    private $itemResolvers = [];
+    private $itemResolvers;
 
     /** @var ItemResolverInterface[] */
     private $itemResolversInstances = [];
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
@@ -1319,6 +1319,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite">
+        <arguments>
+            <argument name="itemResolvers" xsi:type="array"/>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Api\ProductRepositoryInterface">
         <plugin name="remove_images_from_gallery_after_removing_product"
                 type="Magento\Catalog\Plugin\RemoveImagesFromGalleryAfterRemovingProduct"/>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`class ItemResolverComposite implements ItemResolverInterface`
`17`	`17`	`{`
`18`	`18`	`/** @var string[] */`
`19`		`- private $itemResolvers = [];`
	`19`	`+ private $itemResolvers;`
`20`	`20`
`21`	`21`	`/** @var ItemResolverInterface[] */`
`22`	`22`	`private $itemResolversInstances = [];`