Merge branch '5.2' into 5.x

* 5.2:
  Replace "branch-version" by "versions" in composer.json
  Bump Symfony version to 5.2.3
  Update VERSION for 5.2.2
  Update CHANGELOG for 5.2.2
  Bump Symfony version to 4.4.20
  Update VERSION for 4.4.19
  Update CONTRIBUTORS for 4.4.19
  Update CHANGELOG for 4.4.19
  Use import instead of FQCN

Author: nicolas-grekas

Tests/Compiler/ValidateEnvPlaceholdersPassTest.php

@@ -20,6 +20,7 @@
 use Symfony\Component\DependencyInjection\Compiler\RegisterEnvVarProcessorsPass;
 use Symfony\Component\DependencyInjection\Compiler\ValidateEnvPlaceholdersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 
 class ValidateEnvPlaceholdersPassTest extends TestCase
@@ -59,7 +60,7 @@ public function testDefaultEnvIsValidatedInConfig()
 
     public function testDefaultEnvWithoutPrefixIsValidatedInConfig()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('The default value of an env() parameter must be a string or null, but "float" given to "env(FLOATISH)".');
 
         $container = new ContainerBuilder();
@@ -219,7 +220,7 @@ public function testEmptyEnvWhichCannotBeEmptyForScalarNode()
 
     public function testEmptyEnvWhichCannotBeEmptyForScalarNodeWithValidation()
     {
-        $this->expectException(\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException::class);
+        $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('The path "env_extension.scalar_node_not_empty_validated" cannot contain an environment variable when empty values are not allowed by definition and are validated.');
 
         $container = new ContainerBuilder();

Tests/Extension/ExtensionTest.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Extension\InvalidConfig\InvalidConfigExtension;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Extension\SemiValidConfig\SemiValidConfigExtension;
@@ -71,7 +72,7 @@ public function testSemiValidConfiguration()
 
     public function testInvalidConfiguration()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('The extension configuration class "Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\Extension\\InvalidConfig\\Configuration" must implement "Symfony\\Component\\Config\\Definition\\ConfigurationInterface".');
 
         $extension = new InvalidConfigExtension();

Tests/ParameterBag/EnvPlaceholderParameterBagTest.php

@@ -113,7 +113,7 @@ public function testMergeWithDifferentIdentifiersForPlaceholders()
 
     public function testResolveEnvRequiresStrings()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('The default value of env parameter "INT_VAR" must be a string or null, "int" given.');
 
         $bag = new EnvPlaceholderParameterBag();
@@ -124,7 +124,7 @@ public function testResolveEnvRequiresStrings()
 
     public function testGetDefaultScalarEnv()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('The default value of an env() parameter must be a string or null, but "int" given to "env(INT_VAR)".');
 
         $bag = new EnvPlaceholderParameterBag();