Skip to content
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

Jump to bottom

[DI] Fixed custom services definition BC break introduced in ec7e70fb… #20609

Closed
wants to merge 3 commits into from
Closed

[DI] Fixed custom services definition BC break introduced in ec7e70fb… #20609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4197696
[DI] Fixed custom services definition BC break introduced in ec7e70fb…
kiler129 Nov 23, 2016
0222936
[DI] Fixed CS
kiler129 Nov 23, 2016
8325f18
[DI] Fixed for older PHPs
kiler129 Nov 23, 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
4 changes: 2 additions & 2 deletions src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,8 @@ public function findDefinition($id)
*/
public function createService(Definition $definition, $id, $tryProxy = true)
{
if ('Symfony\Component\DependencyInjection\Definition' !== get_class($definition)) {
throw new RuntimeException(sprintf('Constructing service "%s" from a %s is not supported at build time.', $id, get_class($definition)));
if ($definition instanceof DefinitionDecorator) {
throw new RuntimeException(sprintf('Constructing decorated service "%s" from a %s is not supported at build time.', $id, get_class($definition)));
Copy link
Member

Choose a reason for hiding this comment

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

this is not a decorated service. It is about using definition inheritance (yes, the name DefinitionDecorator is quite bad, but the service decoration feature was implemented years later)

Copy link
Member

Choose a reason for hiding this comment

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

Constructing service "foo" from parent definition "bar" etc.

Copy link
Contributor Author

@kiler129 kiler129 Nov 23, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Oh, I didn't knew that and just assumed that by name. I'm thinking how we can actually handle that without breaking custom definition classes.

Edit:
Actually if it's just that, instanceof checking for decorator should solve the problem, since for custom definition classes we'll never see DefinitionDecorator in inheritance chain while for decorators it will always be there.

Copy link
Member

Choose a reason for hiding this comment

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

Can you update the message as suggested?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Don't you think we should update this message to inform about service inheritance? For me "Constructing service "..." from a ... is not supported at build time." is too generic.

Maybe "Constructing service SERVICE_ID inherited from PARENT_ID is not supported at build time." will be a better fit?

Copy link
Member

Choose a reason for hiding this comment

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

That's why I added the "parent" word above, which is also the vocabulary used to declare such services

}

if ($definition->isSynthetic()) {
Expand Down
11 changes: 10 additions & 1 deletion src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
use Symfony\Component\DependencyInjection\Scope;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
use Symfony\Component\ExpressionLanguage\Expression;

class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -407,7 +408,7 @@ public function testResolveServices()

/**
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
* @expectedExceptionMessage Constructing service "foo" from a Symfony\Component\DependencyInjection\DefinitionDecorator is not supported at build time.
* @expectedExceptionMessage Constructing decorated service "foo" from a Symfony\Component\DependencyInjection\DefinitionDecorator is not supported at build time.
*/
public function testResolveServicesWithDecoratedDefinition()
{
Expand All @@ -419,6 +420,14 @@ public function testResolveServicesWithDecoratedDefinition()
$builder->get('foo');
}

public function testResolveServicesWithCustomDefinitionClass()
{
$builder = new ContainerBuilder();
$builder->setDefinition('foo', new CustomDefinition('stdClass'));

$this->assertInstanceOf('stdClass', $builder->get('foo'));
}

public function testMerge()
{
$container = new ContainerBuilder(new ParameterBag(array('bar' => 'foo')));
Expand Down
18 changes: 18 additions & 0 deletions src/Symfony/Component/DependencyInjection/Tests/Fixtures/CustomDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\DependencyInjection\Tests\Fixtures;

use Symfony\Component\DependencyInjection\Definition;

class CustomDefinition extends Definition
{
}