Merge remote-tracking branch 'origin/MC-30236' into 2.4-develop-pr9

Author: zakdma

setup/src/Magento/Setup/Model/Installer.php

@@ -7,6 +7,8 @@
 namespace Magento\Setup\Model;
 
 use Magento\Backend\Setup\ConfigOptionsList as BackendConfigOptionsList;
+use Magento\Framework\App\Cache\Type\Block as BlockCache;
+use Magento\Framework\App\Cache\Type\Layout as LayoutCache;
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -35,6 +37,7 @@
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\UpgradeSchemaInterface;
+use Magento\PageCache\Model\Cache\Type as PageCache;
 use Magento\Setup\Console\Command\InstallCommand;
 use Magento\Setup\Controller\ResponseTypeInterface;
 use Magento\Setup\Model\ConfigModel as SetupConfigModel;
@@ -336,7 +339,7 @@ public function install($request)
         }
         $script[] = ['Installing database schema:', 'installSchema', [$request]];
         $script[] = ['Installing user configuration...', 'installUserConfig', [$request]];
-        $script[] = ['Enabling caches:', 'enableCaches', []];
+        $script[] = ['Enabling caches:', 'updateCaches', [true]];
         $script[] = ['Installing data...', 'installDataFixtures', [$request]];
         if (!empty($request[InstallCommand::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX])) {
             $script[] = [
@@ -866,6 +869,12 @@ private function convertationOfOldScriptsIsAllowed(array $request)
      */
     public function installDataFixtures(array $request = [])
     {
+        $frontendCaches = [
+            PageCache::TYPE_IDENTIFIER,
+            BlockCache::TYPE_IDENTIFIER,
+            LayoutCache::TYPE_IDENTIFIER,
+        ];
+
         /** @var \Magento\Framework\Registry $registry */
         $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
         //For backward compatibility in install and upgrade scripts with enabled parallelization.
@@ -876,7 +885,11 @@ public function installDataFixtures(array $request = [])
         $setup = $this->dataSetupFactory->create();
         $this->checkFilePermissionsForDbUpgrade();
         $this->log->log('Data install/update:');
+        $this->log->log('Disabling caches:');
+        $this->updateCaches(false, $frontendCaches);
         $this->handleDBSchemaData($setup, 'data', $request);
+        $this->log->log('Enabling caches:');
+        $this->updateCaches(true, $frontendCaches);
 
         $registry->unregister('setup-mode-enabled');
     }
@@ -1248,23 +1261,39 @@ public function uninstall()
     }
 
     /**
-     * Enables caches after installing application
+     * Enable or disable caches for specific types that are available
      *
-     * @return void
+     * If no types are specified then it will enable or disable all available types
+     * Note this is called by install() via callback.
      *
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Called by install() via callback.
+     * @param bool $isEnabled
+     * @param array $types
+     * @return void
      */
-    private function enableCaches()
+    private function updateCaches($isEnabled, $types = [])
     {
         /** @var \Magento\Framework\App\Cache\Manager $cacheManager */
         $cacheManager = $this->objectManagerProvider->get()->create(\Magento\Framework\App\Cache\Manager::class);
-        $types = $cacheManager->getAvailableTypes();
-        $enabledTypes = $cacheManager->setEnabled($types, true);
-        $cacheManager->clean($enabledTypes);
+
+        $availableTypes = $cacheManager->getAvailableTypes();
+        $types = empty($types) ? $availableTypes : array_intersect($availableTypes, $types);
+        $enabledTypes = $cacheManager->setEnabled($types, $isEnabled);
+        if ($isEnabled) {
+            $cacheManager->clean($enabledTypes);
+        }
+
+        // Only get statuses of specific cache types
+        $cacheStatus = array_filter(
+            $cacheManager->getStatus(),
+            function (string $key) use ($types) {
+                return in_array($key, $types);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
 
         $this->log->log('Current status:');
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        $this->log->log(print_r($cacheManager->getStatus(), true));
+        $this->log->log(print_r($cacheStatus, true));
     }
 
     /**

setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

@@ -307,8 +307,9 @@ public function testInstall(array $request, array $logMessages)
             $dataSetup->expects($this->any())->method('getConnection')->willReturn($connection);
             $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
             $cacheManager->expects($this->any())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
-            $cacheManager->expects($this->once())->method('setEnabled')->willReturn(['foo', 'bar']);
-            $cacheManager->expects($this->any())->method('clean');
+            $cacheManager->expects($this->exactly(3))->method('setEnabled')->willReturn(['foo', 'bar']);
+            $cacheManager->expects($this->exactly(3))->method('clean');
+            $cacheManager->expects($this->exactly(3))->method('getStatus')->willReturn(['foo' => 1, 'bar' => 1]);
             $appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
                 ->disableOriginalConstructor()
                 ->disableArgumentCloning()
@@ -382,6 +383,7 @@ public function testInstall(array $request, array $logMessages)
 
         /**
          * @return array
+         * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
          */
         public function installDataProvider()
         {
@@ -410,15 +412,20 @@ public function installDataProvider()
                         ['Installing user configuration...'],
                         ['Enabling caches:'],
                         ['Current status:'],
-                        [''],
+                        [print_r(['foo' => 1, 'bar' => 1], true)],
                         ['Installing data...'],
                         ['Data install/update:'],
+                        ['Disabling caches:'],
+                        ['Current status:'],
+                        [print_r([], true)],
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
                         ['Data post-updates:'],
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
-                        //['Installing admin user...'],
+                        ['Enabling caches:'],
+                        ['Current status:'],
+                        [print_r([], true)],
                         ['Caches clearing:'],
                         ['Cache cleared successfully'],
                         ['Disabling Maintenance Mode:'],
@@ -456,14 +463,20 @@ public function installDataProvider()
                         ['Installing user configuration...'],
                         ['Enabling caches:'],
                         ['Current status:'],
-                        [''],
+                        [print_r(['foo' => 1, 'bar' => 1], true)],
                         ['Installing data...'],
                         ['Data install/update:'],
+                        ['Disabling caches:'],
+                        ['Current status:'],
+                        [print_r([], true)],
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
                         ['Data post-updates:'],
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
+                        ['Enabling caches:'],
+                        ['Current status:'],
+                        [print_r([], true)],
                         ['Installing admin user...'],
                         ['Caches clearing:'],
                         ['Cache cleared successfully'],