Skip to content

Commit 4d05f0f

Browse files
Merge branch '2.8' into 3.2
* 2.8: [HttpFoundation] Fix transient tests [DI] Fix second auto-registration
2 parents e12386a + 4fe98c2 commit 4d05f0f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Compiler/AutowirePass.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ private function completeDefinition($id, Definition $definition)
134134
}
135135

136136
if (isset($this->autowired[$typeHint->name])) {
137-
return $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;
137+
$arguments[$index] = $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;
138+
continue;
138139
}
139140

140141
if (null === $this->types) {

Tests/Compiler/AutowirePassTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,9 @@ public function testCreateDefinition()
230230
$pass = new AutowirePass();
231231
$pass->process($container);
232232

233-
$this->assertCount(1, $container->getDefinition('coop_tilleuls')->getArguments());
233+
$this->assertCount(2, $container->getDefinition('coop_tilleuls')->getArguments());
234234
$this->assertEquals('autowired.symfony\component\dependencyinjection\tests\compiler\dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));
235+
$this->assertEquals('autowired.symfony\component\dependencyinjection\tests\compiler\dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));
235236

236237
$dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
237238
$this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
@@ -651,7 +652,7 @@ public function __construct(Lille $l)
651652

652653
class LesTilleuls
653654
{
654-
public function __construct(Dunglas $k)
655+
public function __construct(Dunglas $j, Dunglas $k)
655656
{
656657
}
657658
}

0 commit comments

Comments
 (0)