[DI] Allow auto-configured method calls. #24996
Conversation
| @@ -63,7 +60,10 @@ private function processDefinition(ContainerBuilder $container, $id, Definition | |||
|
|
|||
| $definition->setInstanceofConditionals(array()); | |||
| $parent = $shared = null; | |||
| $instanceofTags = array(); | |||
| $instanceof = array( | |||
There was a problem hiding this comment.
another variable instead of an array would be better I think
There was a problem hiding this comment.
Fixed in b61d981
| @@ -77,11 +77,13 @@ private function processDefinition(ContainerBuilder $container, $id, Definition | |||
| foreach ($instanceofDefs as $key => $instanceofDef) { | |||
| /** @var ChildDefinition $instanceofDef */ | |||
| $instanceofDef = clone $instanceofDef; | |||
| $instanceofDef->setAbstract(true)->setParent($parent ?: 'abstract.instanceof.'.$id); | |||
| $parent = 'instanceof.'.$interface.'.'.$key.'.'.$id; | |||
| $instanceofDef->setAbstract(true)->setParent($parent ?: "abstract.instanceof.$id"); | |||
There was a problem hiding this comment.
please revert these changes, they are unrelated (did fabbot suggest them? if yes, please ignore it :) )
There was a problem hiding this comment.
Not fabbot, just did it because string interpolation run faster in PHP7, but I can revert it.
There was a problem hiding this comment.
yes please do, that's unrelated
| @@ -91,23 +93,24 @@ private function processDefinition(ContainerBuilder $container, $id, Definition | |||
|
|
|||
| if ($parent) { | |||
| $bindings = $definition->getBindings(); | |||
| $abstract = $container->setDefinition('abstract.instanceof.'.$id, $definition); | |||
| $abstract = $container->setDefinition("abstract.instanceof.$id", $definition); | |||
| @@ -60,7 +60,6 @@ public function testProcessInheritance() | |||
| (new ResolveChildDefinitionsPass())->process($container); | |||
|
|
|||
| $expected = array( | |||
| array('foo', array('bar')), | |||
There was a problem hiding this comment.
changing an existing test case is always suspicious,
is this really legitimate? won't it introduce BC breaks?
we need to answer these questions carefully
There was a problem hiding this comment.
This change came from the fact that if a definition has already a method call (line 125: if (!$definition->hasMethodCall($call[0])) {), I do not add it again to avoid call a setter multiple times. Hard to say if we should deduplicate or not method calls...
There was a problem hiding this comment.
Hard to say if we should deduplicate or not method calls
we should not:
$twig->addExtension($ext1);
$twig->addExtension($ext1);
...
There was a problem hiding this comment.
I removed method filtering. Method order has changed, but seems normal since we now allow calls inheritance and they are added at the end of the process.
There was a problem hiding this comment.
Test order fixed in da6d7e4
| @@ -20,7 +20,6 @@ services: | |||
| # calls from instanceof are kept, but this comes later | |||
| calls: | |||
| # first call is from instanceof | |||
| - [setSunshine, [bright]] | |||
There was a problem hiding this comment.
same as above: changing an existing test case needs to be doubly confirmed
There was a problem hiding this comment.
@nicolas-grekas fixed in da6d7e4
| - [enableSummer, [true]] | ||
| - [setSunshine, [warm]] | ||
| # Call from instanceof |
There was a problem hiding this comment.
if the order of calls changes, that means a BC break
44b706c to
9d0bd6e
Compare
|
Methods calls are now in the right order, error on Travis is unrelated (error with RedisAdapter). |
|
@GaryPEGEOT Why did you close here? |
|
Continued in #26768 |
|
Lost some of my commits, so openned a new one |
Allow to auto-configure method calls like: