Merge branch '4.4' into 5.2

* 4.4:
  CS fix

Author: nicolas-grekas

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;