Merge branch '6.13' into 7.2

eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ConsoleCacheWarmupPass.php

@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * File containing the ConsoleCacheWarmupPass class.
+ *
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Cache related compiler pass.
+ *
+ * Ensures class cache warmup is disabled in console mode.
+ */
+class ConsoleCacheWarmupPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        // This pass is CLI only as CLI class cache warmup conflicts with web access, see EZP-29034
+        if (PHP_SAPI !== 'cli' ||
+            !$container->hasDefinition('kernel.class_cache.cache_warmer')) {
+            return;
+        }
+
+        $warmers = array();
+        foreach ($container->findTaggedServiceIds('kernel.cache_warmer') as $id => $attributes) {
+            if ($id === 'kernel.class_cache.cache_warmer') {
+                continue;
+            }
+
+            $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
+            $warmers[$priority][] = new Reference($id);
+        }
+
+        if (empty($warmers)) {
+            return;
+        }
+
+        // sort by priority and flatten
+        krsort($warmers);
+        $warmers = \call_user_func_array('array_merge', $warmers);
+
+        $container->getDefinition('cache_warmer')->replaceArgument(0, $warmers);
+    }
+}

eZ/Bundle/EzPublishCoreBundle/EzPublishCoreBundle.php

@@ -12,6 +12,7 @@
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler\BinaryContentDownloadPass;
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler\ComplexSettingsPass;
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler\ConfigResolverParameterPass;
+use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler\ConsoleCacheWarmupPass;
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler\FieldTypeParameterProviderRegistryPass;
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler\FragmentPass;
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler\NotificationRendererPass;
@@ -84,6 +85,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new ViewProvidersPass());
         $container->addCompilerPass(new PlaceholderProviderPass());
         $container->addCompilerPass(new NotificationRendererPass());
+        $container->addCompilerPass(new ConsoleCacheWarmupPass());
 
         // Storage passes
         $container->addCompilerPass(new ExternalStorageRegistryPass());