Merge branch '7.3' into 7.4

* 7.3:
  fix merge
  do not use PHPUnit mock objects without configured expectations
  fix low deps test with Console component < 6.4
  [FrameworkBundle] Check for console package before register `CommandDataCollector`
  do not use PHPUnit mock objects without configured expectations
  [FrameworkBundle] Ensure a fresh container is used after cache warmup in KernelTestCase
  do not use PHPUnit mock objects without configured expectations
  do not use PHPUnit mock objects without configured expectations
  [Finder] Fix `Finder::append()` breaking generic typing contract

Author: xabbuh

DependencyInjection/FrameworkExtension.php

@@ -1082,7 +1082,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('console_profiler_listener');
         }
 
-        if (!class_exists(CommandDataCollector::class)) {
+        if (!$this->hasConsole() || !class_exists(CommandDataCollector::class)) {
             $container->removeDefinition('.data_collector.command');
         }
     }

Test/KernelTestCase.php

@@ -76,6 +76,18 @@ protected static function bootKernel(array $options = []): KernelInterface
         static::$kernel = $kernel;
         static::$booted = true;
 
+        // If the cache warmer is registered, it means that the cache has been
+        // warmed up, so the current container is not fresh anymore. Let's
+        // reboot a fresh one.
+        if (self::getContainer()->initialized('cache_warmer')) {
+            static::ensureKernelShutdown();
+
+            $kernel = static::createKernel($options);
+            $kernel->boot();
+            static::$kernel = $kernel;
+            static::$booted = true;
+        }
+
         return static::$kernel;
     }
 

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -301,6 +301,7 @@ public function testEnabledProfiler()
 
         $this->assertTrue($container->hasDefinition('profiler'), '->registerProfilerConfiguration() loads profiling.xml');
         $this->assertTrue($container->hasDefinition('data_collector.config'), '->registerProfilerConfiguration() loads collectors.xml');
+        $this->assertTrue($container->hasDefinition('.data_collector.command'));
     }
 
     public function testDisabledProfiler()
@@ -311,6 +312,26 @@ public function testDisabledProfiler()
         $this->assertFalse($container->hasDefinition('data_collector.config'), '->registerProfilerConfiguration() does not load collectors.xml');
     }
 
+    public function testProfilerWithoutConsole()
+    {
+        $extension = new class extends FrameworkExtension {
+            protected function hasConsole(): bool
+            {
+                return false;
+            }
+
+            public function getAlias(): string
+            {
+                return 'framework';
+            }
+        };
+
+        $container = $this->createContainerFromFile('profiler', [], true, false, $extension);
+        $container->compile();
+
+        $this->assertFalse($container->hasDefinition('.data_collector.command'));
+    }
+
     public function testProfilerCollectSerializerDataEnabled()
     {
         $container = $this->createContainerFromFile('profiler');

Tests/Functional/TestServiceContainerTest.php

@@ -24,11 +24,9 @@ class TestServiceContainerTest extends AbstractWebTestCase
 {
     public function testLogicExceptionIfTestConfigIsDisabled()
     {
-        static::bootKernel(['test_case' => 'TestServiceContainer', 'root_config' => 'test_disabled.yml', 'environment' => 'test_disabled']);
-
         $this->expectException(\LogicException::class);
 
-        static::getContainer();
+        static::bootKernel(['test_case' => 'TestServiceContainer', 'root_config' => 'test_disabled.yml', 'environment' => 'test_disabled']);
     }
 
     public function testThatPrivateServicesAreAvailableIfTestConfigIsEnabled()