bug symfony#44879 [DependencyInjection] Ignore argument type check in CheckTypeDeclarationsPass if it's a Definition with a factory (fancyweb)

fabpot · fabpot · commit c3674b4e7f1c · 2022-01-09T11:54:01.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection] Ignore argument type check in CheckTypeDeclarationsPass if it's a Definition with a factory | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | symfony#35599, symfony#44515 | License | MIT | Doc PR | - When a definition uses a factory, we don't know what it returns. Commits ------- b9095e6 [DependencyInjection] Ignore argument type check in CheckTypeDeclarationsPass if it's a Definition with a factory
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -210,6 +210,10 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
         $class = null;
 
         if ($value instanceof Definition) {
+            if ($value->getFactory()) {
+                return;
+            }
+
             $class = $value->getClass();
 
             if ($class && isset(self::BUILTIN_TYPES[strtolower($class)])) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -999,6 +999,20 @@ public function testCallableClass()
 
         $this->addToAssertionCount(1);
     }
+
+    public function testIgnoreDefinitionFactoryArgument()
+    {
+        $container = new ContainerBuilder();
+        $container->register('bar', Bar::class)
+            ->setArguments([
+                (new Definition(Foo::class))
+                    ->setFactory([Foo::class, 'createStdClass']),
+            ]);
+
+        (new CheckTypeDeclarationsPass())->process($container);
+
+        $this->addToAssertionCount(1);
+    }
 }
 
 class CallableClass
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Foo.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Foo.php
@@ -23,4 +23,9 @@ public static function createArray(): array
     {
         return [];
     }
+
+    public static function createStdClass(): \stdClass
+    {
+        return new \stdClass();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,9 @@ public static function createArray(): array`
`23`	`23`	`{`
`24`	`24`	`return [];`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ public static function createStdClass(): \stdClass`
	`28`	`+ {`
	`29`	`+ return new \stdClass();`
	`30`	`+ }`
`26`	`31`	`}`