Commit45f1e38

committed

[DependencyInjection] Ignore argument type check in CheckTypeDeclarationsPass if it's a Definition with a factory

1 parent69d4d6d commit45f1e38Copy full SHA for 45f1e38

File tree

+23

-0

lines changed

+23

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,10 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar`
`210`	`210`	`$class =null;`
`211`	`211`
`212`	`212`	`if ($valueinstanceof Definition) {`
	`213`	`+if ($value->getFactory()) {`
	`214`	`+return;`
	`215`	`+ }`
	`216`	`+`
`213`	`217`	`$class =$value->getClass();`
`214`	`218`
`215`	`219`	`if ($class &&isset(self::BUILTIN_TYPES[strtolower($class)])) {`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -999,6 +999,20 @@ public function testCallableClass()`
`999`	`999`
`1000`	`1000`	`$this->addToAssertionCount(1);`
`1001`	`1001`	`}`
	`1002`	`+`
	`1003`	`+publicfunctiontestIgnoreDefinitionFactoryArgument()`
	`1004`	`+ {`
	`1005`	`+$container =newContainerBuilder();`
	`1006`	`+$container->register('bar', Bar::class)`
	`1007`	`+ ->setArguments([`
	`1008`	`+ (newDefinition(Foo::class))`
	`1009`	`+ ->setFactory([Foo::class,'createStdClass'])`
	`1010`	`+ ]);`
	`1011`	`+`
	`1012`	`+ (newCheckTypeDeclarationsPass())->process($container);`
	`1013`	`+`
	`1014`	`+$this->addToAssertionCount(1);`
	`1015`	`+ }`
`1002`	`1016`	`}`
`1003`	`1017`
`1004`	`1018`	`class CallableClass`

Lines changed: 5 additions & 0 deletions

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`	`+publicstaticfunctioncreateStdClass():\stdClass`
	`28`	`+ {`
	`29`	`+returnnew \stdClass();`
	`30`	`+ }`
`26`	`31`	`}`

Comments

(0)