Merge branch '5.3' into 5.4

* 5.3:
  CS fix
  CS fix
  CS fixes
  Bump Symfony version to 5.3.4
  Update VERSION for 5.3.3
  Update CHANGELOG for 5.3.3
  Bump Symfony version to 5.2.12
  Update VERSION for 5.2.11
  Update CHANGELOG for 5.2.11
  Bump Symfony version to 4.4.27
  Update VERSION for 4.4.26
  Update CONTRIBUTORS for 4.4.26
  Update CHANGELOG for 4.4.26

Author: nicolas-grekas

Definition.php

@@ -135,7 +135,7 @@ public function getFactory()
      *
      * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
      */
-    public function setDecoratedService(?string $id, ?string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
+    public function setDecoratedService(?string $id, string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
     {
         if ($renamedId && $id === $renamedId) {
             throw new InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));

EnvVarProcessor.php

@@ -192,7 +192,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
             return (string) $env;
         }
 
-        if (in_array($prefix, ['bool', 'not'], true)) {
+        if (\in_array($prefix, ['bool', 'not'], true)) {
             $env = (bool) (filter_var($env, \FILTER_VALIDATE_BOOLEAN) ?: filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT));
 
             return 'not' === $prefix ? !$env : $env;

Loader/Configurator/AliasConfigurator.php

@@ -18,11 +18,11 @@
  */
 class AliasConfigurator extends AbstractServiceConfigurator
 {
-    public const FACTORY = 'alias';
-
     use Traits\DeprecateTrait;
     use Traits\PublicTrait;
 
+    public const FACTORY = 'alias';
+
     public function __construct(ServicesConfigurator $parent, Alias $alias)
     {
         $this->parent = $parent;

Loader/Configurator/DefaultsConfigurator.php

@@ -19,13 +19,13 @@
  */
 class DefaultsConfigurator extends AbstractServiceConfigurator
 {
-    public const FACTORY = 'defaults';
-
     use Traits\AutoconfigureTrait;
     use Traits\AutowireTrait;
     use Traits\BindTrait;
     use Traits\PublicTrait;
 
+    public const FACTORY = 'defaults';
+
     private $path;
 
     public function __construct(ServicesConfigurator $parent, Definition $definition, string $path = null)

Loader/Configurator/InlineServiceConfigurator.php

@@ -18,8 +18,6 @@
  */
 class InlineServiceConfigurator extends AbstractConfigurator
 {
-    public const FACTORY = 'service';
-
     use Traits\ArgumentTrait;
     use Traits\AutowireTrait;
     use Traits\BindTrait;
@@ -32,6 +30,8 @@ class InlineServiceConfigurator extends AbstractConfigurator
     use Traits\PropertyTrait;
     use Traits\TagTrait;
 
+    public const FACTORY = 'service';
+
     private $id = '[inline]';
     private $allowParent = true;
     private $path = null;

Loader/Configurator/InstanceofConfigurator.php

@@ -18,8 +18,6 @@
  */
 class InstanceofConfigurator extends AbstractServiceConfigurator
 {
-    public const FACTORY = 'instanceof';
-
     use Traits\AutowireTrait;
     use Traits\BindTrait;
     use Traits\CallTrait;
@@ -30,6 +28,8 @@ class InstanceofConfigurator extends AbstractServiceConfigurator
     use Traits\ShareTrait;
     use Traits\TagTrait;
 
+    public const FACTORY = 'instanceof';
+
     private $path;
 
     public function __construct(ServicesConfigurator $parent, Definition $definition, string $id, string $path = null)

Loader/Configurator/PrototypeConfigurator.php

@@ -19,8 +19,6 @@
  */
 class PrototypeConfigurator extends AbstractServiceConfigurator
 {
-    public const FACTORY = 'load';
-
     use Traits\AbstractTrait;
     use Traits\ArgumentTrait;
     use Traits\AutoconfigureTrait;
@@ -37,6 +35,8 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
     use Traits\ShareTrait;
     use Traits\TagTrait;
 
+    public const FACTORY = 'load';
+
     private $loader;
     private $resource;
     private $excludes;

Loader/Configurator/ServiceConfigurator.php

@@ -19,8 +19,6 @@
  */
 class ServiceConfigurator extends AbstractServiceConfigurator
 {
-    public const FACTORY = 'services';
-
     use Traits\AbstractTrait;
     use Traits\ArgumentTrait;
     use Traits\AutoconfigureTrait;
@@ -41,6 +39,8 @@ class ServiceConfigurator extends AbstractServiceConfigurator
     use Traits\SyntheticTrait;
     use Traits\TagTrait;
 
+    public const FACTORY = 'services';
+
     private $container;
     private $instanceof;
     private $allowParent;

Loader/PhpFileLoader.php

@@ -36,7 +36,7 @@ class PhpFileLoader extends FileLoader
     protected $autoRegisterAliasesForSinglyImplementedInterfaces = false;
     private $generator;
 
-    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, ?ConfigBuilderGeneratorInterface $generator = null)
+    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, ConfigBuilderGeneratorInterface $generator = null)
     {
         parent::__construct($container, $locator, $env);
         $this->generator = $generator;