Merge pull request #562 from magento-performance/ACPT-1551

ACPT-1551: Modularity of ReloadProcessor::reloadApplicationState

Author: andimov

app/code/Magento/Config/App/Config/ReloadConfig.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Config\App\Config;
+
+use Magento\Config\App\Config\Type\System;
+use Magento\Framework\App\State\ReloadProcessorInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Config module specific reset state
+ */
+class ReloadConfig implements ReloadProcessorInterface
+{
+    public function __construct(private readonly System $system)
+    {}
+
+    /**
+     * Tells the system state to reload itself.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @return void
+     */
+    public function reloadState(): void
+    {
+        $this->system->get();
+    }
+}

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

@@ -390,4 +390,11 @@
     <type name="Magento\Framework\App\Cache\TypeList">
         <plugin name="warm_config_cache" type="Magento\Config\Plugin\Framework\App\Cache\TypeList\WarmConfigCache"/>
     </type>
+    <type name="Magento\Framework\App\State\ReloadProcessorComposite">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="Magento_Config::config" xsi:type="object">Magento\Config\App\Config\ReloadConfig</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Store/Model/Config/ReloadDeploymentConfig.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Store\Model\Config;
+
+use Magento\Framework\App\State\ReloadProcessorInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\App\Config\Type\Scopes;
+use Magento\Store\Model\GroupRepository;
+use Magento\Store\Model\StoreRepository;
+use Magento\Store\Model\WebsiteRepository;
+
+/**
+ * Store module specific reset state part
+ */
+class ReloadDeploymentConfig implements ReloadProcessorInterface
+{
+
+    public function __construct(
+        private readonly StoreRepository $storeRepository,
+        private readonly WebsiteRepository $websiteRepository,
+        private readonly GroupRepository $groupRepository,
+        private readonly Scopes $scopes
+    )
+    {}
+
+    /**
+     * Tells the system state to reload itself.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @return void
+     */
+    public function reloadState(): void
+    {
+        // Note: Magento\Store\Model\StoreManager::reinitStores can't be called because it flushes the caches which
+        // we don't want to do because that is already taken care of.  Instead, we call the same clean methods that
+        // it calls, but we skip cleaning the cache.
+
+        $this->storeRepository->clean();
+        $this->websiteRepository->clean();
+        $this->groupRepository->clean();
+
+        $this->scopes->clean();
+        $this->scopes->get();
+    }
+}

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

@@ -467,4 +467,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\State\ReloadProcessorComposite">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="Magento_ApplicationServer::process" xsi:type="object">Magento\Store\Model\Config\ReloadDeploymentConfig</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Translation/App/Config/ReloadConfig.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Translation\App\Config;
+
+use Magento\Framework\App\State\ReloadProcessorInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Translation\App\Config\Type\Translation;
+
+/**
+ * Translation module specific reset state part
+ */
+class ReloadConfig implements ReloadProcessorInterface
+{
+    /**
+     * @param Translation $translation
+     */
+    public function __construct(private readonly Translation $translation)
+    {}
+
+    /**
+     * Tells the system state to reload itself.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @return void
+     */
+    public function reloadState(): void
+    {
+        $this->translation->clean();
+    }
+}

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

@@ -149,4 +149,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\State\ReloadProcessorComposite">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="Magento_Translate::config" xsi:type="object">Magento\Translation\App\Config\ReloadConfig</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/etc/di.xml

@@ -2004,4 +2004,12 @@
     </type>
     <preference for="Magento\Framework\Filter\Input\PurifierInterface" type="Magento\Framework\Filter\Input\Purifier"/>
     <preference for="Magento\Framework\App\PageCache\IdentifierInterface" type="Magento\Framework\App\PageCache\Identifier"/>
+    <preference for="Magento\Framework\App\State\ReloadProcessorInterface" type="Magento\Framework\App\State\ReloadProcessorComposite" />
+    <type name="Magento\Framework\App\State\ReloadProcessorComposite">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="config" xsi:type="object">Magento\Framework\App\State\ReloadProcessor</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

lib/internal/Magento/Framework/App/State/ReloadProcessor.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Framework\App\State;
+
+use Magento\Framework\App\Config\ScopeCodeResolver;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Framework specific reset state
+ */
+class ReloadProcessor implements ReloadProcessorInterface
+{
+
+    public function __construct(
+        private readonly DeploymentConfig $deploymentConfig,
+        private readonly ScopeCodeResolver $scopeCodeResolver
+    )
+    {}
+
+    /**
+     * Tells the system state to reload itself.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @return void
+     */
+    public function reloadState(): void
+    {
+        $this->deploymentConfig->resetData();
+        $this->scopeCodeResolver->clean();
+    }
+}

lib/internal/Magento/Framework/App/State/ReloadProcessorComposite.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Framework\App\State;
+
+use \Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Composite of reload processors
+ */
+class ReloadProcessorComposite implements ReloadProcessorInterface
+{
+    /**
+     * @param ReloadProcessorInterface[] $processors
+     */
+    public function __construct(private array $processors)
+    {}
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reloadState(): void
+    {
+        ksort($this->processors);
+        /** @var ReloadProcessorInterface $processor */
+        foreach ($this->processors as $processor) {
+            $processor->reloadState();
+        }
+    }
+}

lib/internal/Magento/Framework/App/State/ReloadProcessorInterface.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Framework\App\State;
+
+use \Magento\Framework\ObjectManagerInterface;
+
+/**
+ *
+ */
+interface ReloadProcessorInterface
+{
+    /**
+     * Tells the system state to reload itself.
+     *
+     * @return void
+     */
+    public function reloadState(): void;
+}