Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fix bug when using an private aliased factory service #17942

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

Closed
wants to merge 2 commits into from
Closed

Fix bug when using an private aliased factory service #17942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a995bd
Fix bug when using an private aliased factory service
wouterj Feb 27, 2016
70c32c4
Add failing test case
wouterj Feb 27, 2016
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
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,6 @@ private function updateFactoryServiceReference($factoryService, $currentId, $new
return;
}

return $currentId === $factoryService ? $newId : $currentId;
return $currentId === $factoryService ? $newId : $factoryService;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$currentId is the current ID of the removed alias, while $factoryService is the original ID of the factory service.

If the factory service equals the ID of the removed alias, it should be updated to become the actual service ID. However, if the factory service does not equal the ID of the removed alias, the original value should be used.

With the old code, it was always replacing the original code, either with the actual definition ID or the ID of the removed alias (which was causing the troubles people were reporting).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch @wouterj 👏

}
}
22 changes: 22 additions & 0 deletions 22 ...y/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;

require_once __DIR__.'/../Fixtures/includes/foo.php';

class ReplaceAliasByActualDefinitionPassTest extends \PHPUnit_Framework_TestCase
{
public function testProcess()
Expand Down Expand Up @@ -44,6 +46,26 @@ public function testProcess()
$this->assertSame('b_alias', $aDefinition->getFactoryService());
}

/**
* @group legacy
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not really legacy in 2.3, but this makes things easier to merge to 2.7/2.8

*/
public function testPrivateAliasesInFactory()
{
$container = new ContainerBuilder();

$container->register('a', 'FooClass');
$container->register('b', 'FooClass')
->setFactoryService('a')
->setFactoryMethod('getInstance');

$container->register('c', 'stdClass')->setPublic(false);
$container->setAlias('c_alias', 'c');

$this->process($container);

$this->assertInstanceOf('FooClass', $container->get('b'));
}

/**
* @expectedException \InvalidArgumentException
*/
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.