Add type to final/internal public/protected properties

Author: nicolas-grekas

Attribute/Target.php

@@ -21,10 +21,7 @@
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
 final class Target
 {
-    /**
-     * @var string
-     */
-    public $name;
+    public string $name;
 
     public function __construct(string $name)
     {

Definition.php

@@ -52,14 +52,14 @@ class Definition
      *
      * Used to store the name of the inner id when using service decoration together with autowiring
      */
-    public $innerServiceId;
+    public ?string $innerServiceId = null;
 
     /**
      * @internal
      *
      * Used to store the behavior to follow when using service decoration and the decorated service is invalid
      */
-    public $decorationOnInvalid;
+    public ?int $decorationOnInvalid = null;
 
     public function __construct(string $class = null, array $arguments = [])
     {

Loader/Configurator/AbstractConfigurator.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\Config\Loader\ParamConfigurator;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -31,7 +32,7 @@ abstract class AbstractConfigurator
     public static $valuePreProcessor;
 
     /** @internal */
-    protected $definition;
+    protected Definition|Alias|null $definition = null;
 
     public function __call(string $method, array $args)
     {

Loader/Configurator/ReferenceConfigurator.php

@@ -19,10 +19,10 @@
 class ReferenceConfigurator extends AbstractConfigurator
 {
     /** @internal */
-    protected $id;
+    protected string $id;
 
     /** @internal */
-    protected $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
+    protected int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
 
     public function __construct(string $id)
     {

Tests/Fixtures/php/services_new_in_initializer.php

@@ -36,14 +36,6 @@ public function isCompiled(): bool
         return true;
     }
 
-    public function getRemovedIds(): array
-    {
-        return [
-            'Psr\\Container\\ContainerInterface' => true,
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
-        ];
-    }
-
     /**
      * Gets the public 'foo' shared autowired service.
      *