Skip to content

[DependencyInjection] fix the sorting by priority #19049

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
Jun 14, 2016
Merged

[DependencyInjection] fix the sorting by priority #19049

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
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"symfony/asset": "~2.8|~3.0",
"symfony/cache": "~3.1",
"symfony/class-loader": "~2.8|~3.0",
"symfony/dependency-injection": "~3.1",
"symfony/dependency-injection": "~3.2",
"symfony/config": "~2.8|~3.0",
"symfony/event-dispatcher": "~2.8|~3.0",
"symfony/http-foundation": "~3.1",
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container
foreach ($services as $serviceId => $tags) {
foreach ($tags as $attributes) {
$priority = isset($attributes['priority']) ? $attributes['priority'] : 0;
$queue->insert(new Reference($serviceId), $priority * -1);
$queue->insert(new Reference($serviceId), $priority);
}
}

return iterator_to_array($queue);
return iterator_to_array($queue, false);
}
}
85 changes: 0 additions & 85 deletions src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTrait.php
View file
Open in desktop

This file was deleted.

78 changes: 78 additions & 0 deletions src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?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\Compiler;

use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;

class PriorityTaggedServiceTraitTest extends \PHPUnit_Framework_TestCase
{
public function testThatCacheWarmersAreProcessedInPriorityOrder()
{
$services = array(
'my_service1' => array('my_custom_tag' => array('priority' => 100)),
'my_service2' => array('my_custom_tag' => array('priority' => 200)),
'my_service3' => array('my_custom_tag' => array('priority' => -501)),
'my_service4' => array('my_custom_tag' => array()),
'my_service5' => array('my_custom_tag' => array('priority' => -1)),
'my_service6' => array('my_custom_tag' => array('priority' => -500)),
'my_service7' => array('my_custom_tag' => array('priority' => -499)),
'my_service8' => array('my_custom_tag' => array('priority' => 1)),
'my_service9' => array('my_custom_tag' => array('priority' => -2)),
'my_service10' => array('my_custom_tag' => array('priority' => -1000)),
'my_service11' => array('my_custom_tag' => array('priority' => -1001)),
'my_service12' => array('my_custom_tag' => array('priority' => -1002)),
'my_service13' => array('my_custom_tag' => array('priority' => -1003)),
);

$container = new ContainerBuilder();

foreach ($services as $id => $tags) {
$definition = $container->register($id);

foreach ($tags as $name => $attributes) {
$definition->addTag($name, $attributes);
}
}

$expected = array(
new Reference('my_service2'),
new Reference('my_service1'),
new Reference('my_service8'),
new Reference('my_service4'),
new Reference('my_service5'),
new Reference('my_service9'),
new Reference('my_service7'),
new Reference('my_service6'),
new Reference('my_service3'),
new Reference('my_service10'),
new Reference('my_service11'),
new Reference('my_service12'),
new Reference('my_service13'),
);

$priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation();

$this->assertEquals($expected, $priorityTaggedServiceTraitImplementation->test('my_custom_tag', $container));
}
}

class PriorityTaggedServiceTraitImplementation
{
use PriorityTaggedServiceTrait;

public function test($tagName, ContainerBuilder $container)
{
return $this->findAndSortTaggedServices($tagName, $container);
}
}