bug #34515 [DependencyInjection] definitions are valid objects (xabbuh)

fabpot · fabpot · commit f6c4b67fe360 · 2019-11-25T08:06:53.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection] definitions are valid objects | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34480 | License | MIT | Doc PR | Commits ------- 0acaa5c definitions are valid objects
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -152,6 +152,10 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
                 return;
             }
 
+            if ('object' === $type) {
+                return;
+            }
+
             if (is_a($class, $type, true)) {
                 return;
             }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -15,12 +15,14 @@
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\CheckTypeDeclarationsPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Bar;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarMethodCall;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgument;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgumentNotNull;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Foo;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\FooObject;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -390,6 +392,18 @@ public function testProcessSuccessWhenPassingAnIteratorArgumentToIterable()
         $this->addToAssertionCount(1);
     }
 
+    public function testProcessSuccessWhenPassingDefintionForObjectType()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo_object', FooObject::class)
+            ->addArgument(new Definition(Foo::class));
+
+        (new CheckTypeDeclarationsPass(true))->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
     public function testProcessFactory()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/FooObject.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/FooObject.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass;
+
+class FooObject
+{
+    public function __construct(object $foo)
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,10 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar`
`152`	`152`	`return;`
`153`	`153`	`}`
`154`	`154`
	`155`	`+ if ('object' === $type) {`
	`156`	`+ return;`
	`157`	`+ }`
	`158`	`+`
`155`	`159`	`if (is_a($class, $type, true)) {`
`156`	`160`	`return;`
`157`	`161`	`}`