Merge branch '4.4' into 5.4

* 4.4:
  Fix colors for 4.4
  Stand with Ukraine
  [FrameworkBundle] Ensure container is reset between tests
  Remove blocking test for adding support for placeholders in EmumNode in 6.1

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Console/Application.php

@@ -147,7 +147,7 @@ public function all(string $namespace = null)
      */
     public function getLongVersion()
     {
-        return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
+        return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>) <bg=blue;fg=yellow>#StandWith</><bg=yellow;fg=blue>Ukraine</> <href=https://sf.to/ukraine>https://sf.to/ukraine</>', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
     }
 
     public function add(Command $command)

src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

@@ -15,6 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * KernelTestCase is the base class for tests needing a Kernel.
@@ -155,8 +156,13 @@ protected static function ensureKernelShutdown()
     {
         if (null !== static::$kernel) {
             static::$kernel->boot();
+            $container = static::$kernel->getContainer();
             static::$kernel->shutdown();
             static::$booted = false;
+
+            if ($container instanceof ResetInterface) {
+                $container->reset();
+            }
         }
 
         static::$container = null;

src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php

@@ -153,19 +153,6 @@ public function testConcatenatedEnvInConfig()
         $this->assertSame(['scalar_node' => $expected], $container->resolveEnvPlaceholders($ext->getConfig()));
     }
 
-    public function testEnvIsIncompatibleWithEnumNode()
-    {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('A dynamic value is not compatible with a "Symfony\Component\Config\Definition\EnumNode" node type at path "env_extension.enum_node".');
-        $container = new ContainerBuilder();
-        $container->registerExtension(new EnvExtension());
-        $container->prependExtensionConfig('env_extension', [
-            'enum_node' => '%env(FOO)%',
-        ]);
-
-        $this->doProcess($container);
-    }
-
     public function testEnvIsIncompatibleWithArrayNode()
     {
         $this->expectException(InvalidConfigurationException::class);