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.

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

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

Closed
wants to merge 3 commits into from
Closed
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -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)));

This comment has been minimized.

Copy link
@stof

stof Nov 23, 2016

Member

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)

This comment has been minimized.

Copy link
@nicolas-grekas

nicolas-grekas Nov 23, 2016

Member

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

This comment has been minimized.

Copy link
@kiler129

kiler129 Nov 23, 2016

Author Contributor

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.

This comment has been minimized.

Copy link
@nicolas-grekas

nicolas-grekas Nov 23, 2016

Member

Can you update the message as suggested?

This comment has been minimized.

Copy link
@kiler129

kiler129 Nov 23, 2016

Author Contributor

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?

This comment has been minimized.

Copy link
@nicolas-grekas

nicolas-grekas Nov 23, 2016

Member

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

}
if ($definition->isSynthetic()) {
@@ -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
@@ -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()
{
@@ -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')));
@@ -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
{
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.