Skip to content

Skip abstract definitions in compiler passes #22039

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
merged 1 commit into from
Mar 17, 2017
Merged

Skip abstract definitions in compiler passes #22039

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
4 changes: 2 additions & 2 deletions ...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function process(ContainerBuilder $container)
uasort($subscribers, $sortFunc);
foreach ($subscribers as $id => $instance) {
if ($container->getDefinition($id)->isAbstract()) {
throw new InvalidArgumentException(sprintf('The abstract service "%s" cannot be tagged as a doctrine event subscriber.', $id));
continue;
}

$em->addMethodCall('addEventSubscriber', array(new Reference($id)));
Expand All @@ -95,7 +95,7 @@ public function process(ContainerBuilder $container)
uasort($listeners, $sortFunc);
foreach ($listeners as $id => $instance) {
if ($container->getDefinition($id)->isAbstract()) {
throw new InvalidArgumentException(sprintf('The abstract service "%s" cannot be tagged as a doctrine event listener.', $id));
continue;
}

$em->addMethodCall('addEventListener', array(
Expand Down
10 changes: 3 additions & 7 deletions ...e/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

class RegisterEventListenersAndSubscribersPassTest extends TestCase
{
/**
* @expectedException \InvalidArgumentException
*/
public function testExceptionOnAbstractTaggedSubscriber()
{
$container = $this->createBuilder();
Expand All @@ -32,12 +29,10 @@ public function testExceptionOnAbstractTaggedSubscriber()
$container->setDefinition('a', $abstractDefinition);

$this->process($container);
$this->assertSame(array(), $container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls());
Copy link
Contributor

Choose a reason for hiding this comment

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

assertEmpty()?

}

/**
* @expectedException \InvalidArgumentException
*/
public function testExceptionOnAbstractTaggedListener()
public function testAbstractTaggedListenerIsSkipped()
{
$container = $this->createBuilder();

Expand All @@ -48,6 +43,7 @@ public function testExceptionOnAbstractTaggedListener()
$container->setDefinition('a', $abstractDefinition);

$this->process($container);
$this->assertSame(array(), $container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls());
}

public function testProcessEventListenersWithPriorities()
Expand Down
6 changes: 2 additions & 4 deletions ...y/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ public function visibilityProvider()
);
}

/**
* @expectedException \InvalidArgumentException
* @expectedExceptionMessage The service "my-command" tagged "console.command" must not be abstract.
*/
public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
{
$container = new ContainerBuilder();
Expand All @@ -77,6 +73,8 @@ public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
$container->setDefinition('my-command', $definition);

$container->compile();

$this->assertSame(array(), $container->getParameter('console.command.ids'));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
$definition = $container->getDefinition($id);

if ($definition->isAbstract()) {
throw new \InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must not be abstract.', $id));
continue;
}

$class = $container->getParameterBag()->resolveValue($definition->getClass());
Expand Down
8 changes: 3 additions & 5 deletions src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ public function visibilityProvider()
);
}

/**
* @expectedException \InvalidArgumentException
* @expectedExceptionMessage The service "my-command" tagged "console.command" must not be abstract.
*/
public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
public function testProcessSkipAbstractDefinitions()
{
$container = new ContainerBuilder();
$container->setResourceTracking(false);
Expand All @@ -66,6 +62,8 @@ public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
$container->setDefinition('my-command', $definition);

$container->compile();

$this->assertSame(array(), $container->getParameter('console.command.ids'));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function process(ContainerBuilder $container)
foreach ($container->findTaggedServiceIds($this->listenerTag) as $id => $events) {
$def = $container->getDefinition($id);
if ($def->isAbstract()) {
throw new InvalidArgumentException(sprintf('The service "%s" must not be abstract as event listeners are lazy-loaded.', $id));
continue;
}

foreach ($events as $event) {
Expand All @@ -90,7 +90,7 @@ public function process(ContainerBuilder $container)
foreach ($container->findTaggedServiceIds($this->subscriberTag) as $id => $attributes) {
$def = $container->getDefinition($id);
if ($def->isAbstract()) {
throw new InvalidArgumentException(sprintf('The service "%s" must not be abstract as event subscribers are lazy-loaded.', $id));
continue;
}

// We must assume that the class value has been correctly filled, even if the service is created by a factory
Expand Down
14 changes: 5 additions & 9 deletions ...Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ public function testValidEventSubscriber()
$registerListenersPass->process($builder);
}

/**
* @expectedException \InvalidArgumentException
* @expectedExceptionMessage The service "foo" must not be abstract as event listeners are lazy-loaded.
*/
public function testAbstractEventListener()
{
$container = new ContainerBuilder();
Expand All @@ -99,20 +95,20 @@ public function testAbstractEventListener()

$registerListenersPass = new RegisterListenersPass();
$registerListenersPass->process($container);

$this->assertSame(array(), $container->getDefinition('event_dispatcher')->getMethodCalls());
}

/**
* @expectedException \InvalidArgumentException
* @expectedExceptionMessage The service "foo" must not be abstract as event subscribers are lazy-loaded.
*/
public function testAbstractEventSubscriber()
public function testAbstractEventSubscriberIsSkipped()
{
$container = new ContainerBuilder();
$container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_subscriber', array());
$container->register('event_dispatcher', 'stdClass');

$registerListenersPass = new RegisterListenersPass();
$registerListenersPass->process($container);

$this->assertSame(array(), $container->getDefinition('event_dispatcher')->getMethodCalls());
}

public function testEventSubscriberResolvableClassName()
Expand Down