[Meta] fix issues found via PHPStan in DI component

symfony · dkarlovi · Dec 18, 2017 · Dec 18, 2017 · Dec 18, 2017 · Dec 18, 2017
commit bdeda31c0b01c1b362b5e3c66a18e1550c96ca1e
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ QA_DOCKER_IMAGE=jakzal/phpqa:latest
 QA_DOCKER_COMMAND=docker run -it --rm -v "$(shell pwd):/project" -w /project ${QA_DOCKER_IMAGE}
 
 phpstan:
-	sh -c "${QA_DOCKER_COMMAND} phpstan analyse --configuration phpstan.neon --level 0 src/Symfony/Component/Debug"
+	sh -c "${QA_DOCKER_COMMAND} phpstan analyse --configuration phpstan.neon --level 0 src/Symfony/Component/DependencyInjection"
 
 ##
 # Special operations

diff --git a/phpstan.neon b/phpstan.neon
@@ -11,6 +11,8 @@ parameters:
 
         # not errors, actually expected to fail
         - '#Class Symfony\\Bundle\\FrameworkBundle\\Tests\\DependencyInjection\\Compiler\\NotFound not found.#'
+        - '#Class Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\NotExist not found.#'
+        - '#Class Symfony\\Bug\\NotExistClass not found and could not be autoloaded.#'
     excludes_analyse:
         - */src/Symfony/Bridge/*/Tests/Fixtures/*
         - */src/Symfony/Bridge/*/Tests/*/Fixtures/*
@@ -35,7 +37,8 @@ parameters:
         - src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
         - src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
 
-        # temporary, loading a NotLoadableClass throws a fatal error
+        # temporary, loading a non-existant class, these should probably be fixtures
+        - src/symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php
         - src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
 
         # temporary, it's full of actual errors (which are triggers for the handler)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
@@ -40,7 +40,6 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
     private $loader;
     private $resource;
     private $exclude;
-    private $allowParent;
 
     public function __construct(ServicesConfigurator $parent, PhpFileLoader $loader, Definition $defaults, string $namespace, string $resource, bool $allowParent)
     {

diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
@@ -44,7 +44,6 @@ class ServiceConfigurator extends AbstractServiceConfigurator
 
     private $container;
     private $instanceof;
-    private $allowParent;
 
     public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, $id, array $defaultTags)
     {

diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php
@@ -16,6 +16,8 @@
 
 trait BindTrait
 {
+    protected $id;
+
     /**
      * Sets bindings.
      *

diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php
@@ -16,6 +16,8 @@
 
 trait ParentTrait
 {
+    protected $allowParent;
+
     /**
      * Sets the Definition to inherit from.
      *

diff --git a/...Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php b/...Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
@@ -26,7 +26,7 @@ public function testSimpleProcessor()
         (new RegisterEnvVarProcessorsPass())->process($container);
 
         $this->assertTrue($container->has('container.env_var_processors_locator'));
-        $this->assertInstanceof(SimpleProcessor::class, $container->get('container.env_var_processors_locator')->get('foo'));
+        $this->assertInstanceOf(SimpleProcessor::class, $container->get('container.env_var_processors_locator')->get('foo'));
 
         $expected = array(
             'foo' => array('string'),

diff --git a/...ny/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/...ny/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -32,7 +32,7 @@ public function testProcess()
         $parent = 'instanceof.'.parent::class.'.0.foo';
         $def = $container->getDefinition('foo');
         $this->assertEmpty($def->getInstanceofConditionals());
-        $this->assertInstanceof(ChildDefinition::class, $def);
+        $this->assertInstanceOf(ChildDefinition::class, $def);
         $this->assertTrue($def->isAutowired());
         $this->assertSame($parent, $def->getParent());
         $this->assertSame(array('tag' => array(array()), 'baz' => array(array('attr' => 123))), $def->getTags());

diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -412,6 +412,7 @@ class ProjectServiceContainer extends Container
     public $__foo_bar;
     public $__foo_baz;
     public $__internal;
+    private $privates;
     protected $methodMap = array(
         'bar' => 'getBarService',
         'foo_bar' => 'getFooBarService',
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,8 @@ @@
     trait BindTrait
     {
+        protected $id;
         /**
          * Sets bindings.
          *
@@ Expand Down @@