Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[DependencyInjection] Inline pass fix #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Mar 1, 2011
Merged

[DependencyInjection] Inline pass fix #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function setRepeatedPass(RepeatedPass $repeatedPass)
/**
* Processes the ContainerBuilder for inline service definitions.
*
* @param ContainerBuilder $container
* @param ContainerBuilder $container
*/
public function process(ContainerBuilder $container)
{
Expand Down Expand Up @@ -89,9 +89,9 @@ protected function inlineArguments(ContainerBuilder $container, array $arguments
/**
* Checks if the definition is inlineable.
*
* @param ContainerBuilder $container
* @param string $id
* @param Definition $definition
* @param ContainerBuilder $container
* @param string $id
* @param Definition $definition
* @return boolean If the definition is inlineable
*/
protected function isInlinableDefinition(ContainerBuilder $container, $id, Definition $definition)
Expand All @@ -113,6 +113,10 @@ protected function isInlinableDefinition(ContainerBuilder $container, $id, Defin
$ids[] = $edge->getSourceNode()->getId();
}

return count(array_unique($ids)) <= 1;
if (count(array_unique($ids)) > 1) {
return false;
}

return $container->getDefinition(reset($ids))->getScope() === $definition->getScope();
}
}
16 changes: 16 additions & 0 deletions ...Symfony/Tests/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

namespace Symfony\Tests\Component\DependencyInjection\Compiler;

use Symfony\Component\DependencyInjection\Scope;

use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
use Symfony\Component\DependencyInjection\Compiler\Compiler;
Expand Down Expand Up @@ -110,6 +112,20 @@ public function testProcessInlinesIfMultipleReferencesButAllFromTheSameDefinitio
$this->assertSame($a, $inlinedArguments[0]);
}

public function testProcessInlinesOnlyIfSameScope()
{
$container = new ContainerBuilder();

$container->addScope(new Scope('foo'));
$a = $container->register('a')->setPublic(false)->setScope('foo');
$b = $container->register('b')->addArgument(new Reference('a'));

$this->process($container);
$arguments = $b->getArguments();
$this->assertEquals(new Reference('a'), $arguments[0]);
$this->assertTrue($container->hasDefinition('a'));
}

protected function process(ContainerBuilder $container)
{
$repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()));
Expand Down