NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commit10a2d39

committed

bug#27265 [DI] Shared services should not be inlined in non-shared ones (nicolas-grekas)

This PR was merged into the 3.4 branch.Discussion----------[DI] Shared services should not be inlined in non-shared ones| Q | A| ------------- | ---| Branch? | 3.4| Bug fix? | yes| New feature? | no| BC breaks? | no| Deprecations? | no| Tests pass? | yes| Fixed tickets | -| License | MIT| Doc PR | -[Already good on 2.7/2.8.](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php#L152)Commits-------6f8b862 [DI] Shared services should not be inlined in non-shared ones

2 parents932dbd2 +6f8b862 commit10a2d39Copy full SHA for 10a2d39

File tree

2 files changed

-3

lines changed

src/Symfony/Component/DependencyInjection
- Compiler
  - InlineServiceDefinitionsPass.php
- Tests/Compiler
  - InlineServiceDefinitionsPassTest.php

2 files changed

-3

lines changed

`‎src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`138`	`138`	`returnfalse;`
`139`	`139`	`}`
`140`	`140`
`141`		`-returntrue;`
	`141`	`+return$this->container->getDefinition($ids[0])->isShared();`
`142`	`142`	`}`
`143`	`143`	`}`

`‎src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function testProcessDoesInlineNonSharedService()`
`92`	`92`	`$this->assertNotSame($container->getDefinition('bar'),$arguments[2]);`
`93`	`93`	`}`
`94`	`94`
`95`		`-publicfunctiontestProcessInlinesMixedServicesLoop()`
	`95`	`+publicfunctiontestProcessDoesNotInlineMixedServicesLoop()`
`96`	`96`	`{`
`97`	`97`	`$container =newContainerBuilder();`
`98`	`98`	`$container`
`@@ -108,7 +108,7 @@ public function testProcessInlinesMixedServicesLoop()`
`108`	`108`
`109`	`109`	`$this->process($container);`
`110`	`110`
`111`		`-$this->assertEquals($container->getDefinition('foo')->getArgument(0),$container->getDefinition('bar'));`
	`111`	`+$this->assertEquals(newReference('bar'),$container->getDefinition('foo')->getArgument(0));`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`/**`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit10a2d39

File tree

2 files changed

2 files changed

`‎src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php‎`

`‎src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php‎`

0 commit comments