B2B-2258: Add caching capability to the storeConfig GraphQl query

Author: joanhe

app/code/Magento/Store/Model/Config/Cache/Tag/Strategy/CompositeTagGenerator.php

@@ -33,10 +33,10 @@ public function __construct(
      */
     public function generateTags(ValueInterface $config): array
     {
-        $tags = [];
+        $tagsArray = [];
         foreach ($this->tagGenerators as $tagGenerator) {
-            $tags = array_merge($tags, $tagGenerator->generateTags($config));
+            $tagsArray[] = $tagGenerator->generateTags($config);
         }
-        return $tags;
+        return array_merge(...$tagsArray);
     }
 }

app/code/Magento/StoreGraphQl/Model/Cache/Tag/Strategy/StoreConfig.php renamed to app/code/Magento/Store/Model/Config/Cache/Tag/Strategy/StoreConfig.php

@@ -5,22 +5,24 @@
  */
 declare(strict_types=1);
 
-namespace Magento\StoreGraphQl\Model\Cache\Tag\Strategy;
+namespace Magento\Store\Model\Config\Cache\Tag\Strategy;
 
 use Magento\Framework\App\Cache\Tag\StrategyInterface;
 use Magento\Framework\App\Config\ValueInterface;
-use Magento\Store\Model\Config\Cache\Tag\Strategy\TagGeneratorInterface;
 
 /**
  * Produce cache tags for store config.
  */
 class StoreConfig implements StrategyInterface
 {
     /**
-     * @var \Magento\Store\Model\Config\Cache\Tag\Strategy\TagGeneratorInterface
+     * @var TagGeneratorInterface
      */
     private $tagGenerator;
 
+    /**
+     * @param TagGeneratorInterface $tagGenerator
+     */
     public function __construct(
         TagGeneratorInterface $tagGenerator
     ) {

app/code/Magento/Store/etc/di.xml

@@ -457,4 +457,20 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\Cache\Tag\Strategy\Factory">
+        <arguments>
+            <argument name="customStrategies" xsi:type="array">
+                <item name="Magento\Framework\App\Config\ValueInterface" xsi:type="object">
+                    Magento\Store\Model\Config\Cache\Tag\Strategy\StoreConfig
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Store\Model\Config\Cache\Tag\Strategy\StoreConfig">
+        <arguments>
+            <argument name="tagGenerator" xsi:type="object">
+                Magento\Store\Model\Config\Cache\Tag\Strategy\CompositeTagGenerator
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/StoreGraphQl/etc/di.xml

@@ -6,22 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\App\Cache\Tag\Strategy\Factory">
-        <arguments>
-            <argument name="customStrategies" xsi:type="array">
-                <item name="Magento\Framework\App\Config\ValueInterface" xsi:type="object">
-                    Magento\StoreGraphQl\Model\Cache\Tag\Strategy\StoreConfig
-                </item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\StoreGraphQl\Model\Cache\Tag\Strategy\StoreConfig">
-        <arguments>
-            <argument name="tagGenerator" xsi:type="object">
-                Magento\Store\Model\Config\Cache\Tag\Strategy\CompositeTagGenerator
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Store\Model\Config\Cache\Tag\Strategy\CompositeTagGenerator">
         <arguments>
             <argument name="tagGenerators" xsi:type="array">