Skip to content

Reuse PriorityTaggedServiceTrait from symfony #1417

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
dunglas merged 1 commit into from
Oct 11, 2017
Merged

Reuse PriorityTaggedServiceTrait from symfony #1417

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
31 changes: 5 additions & 26 deletions src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DoctrineQueryExtensionPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler;

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

/**
* Injects query extensions.
Expand All @@ -27,6 +27,8 @@
*/
final class DoctrineQueryExtensionPass implements CompilerPassInterface
{
use PriorityTaggedServiceTrait;

/**
* {@inheritdoc}
*/
Expand All @@ -41,35 +43,12 @@ public function process(ContainerBuilder $container)
$itemDataProviderDefinition = $container->getDefinition('api_platform.doctrine.orm.item_data_provider');
$subresourceDataProviderDefinition = $container->getDefinition('api_platform.doctrine.orm.subresource_data_provider');

$collectionExtensions = $this->findSortedServices($container, 'api_platform.doctrine.orm.query_extension.collection');
$itemExtensions = $this->findSortedServices($container, 'api_platform.doctrine.orm.query_extension.item');
$collectionExtensions = $this->findAndSortTaggedServices('api_platform.doctrine.orm.query_extension.collection', $container);
$itemExtensions = $this->findAndSortTaggedServices('api_platform.doctrine.orm.query_extension.item', $container);

$collectionDataProviderDefinition->replaceArgument(1, $collectionExtensions);
$itemDataProviderDefinition->replaceArgument(3, $itemExtensions);
$subresourceDataProviderDefinition->replaceArgument(3, $collectionExtensions);
$subresourceDataProviderDefinition->replaceArgument(4, $itemExtensions);
}

/**
* Finds services having the given tag and sorts them by their priority attribute.
*
* @param ContainerBuilder $container
* @param string $tag
*
* @return Reference[]
*/
private function findSortedServices(ContainerBuilder $container, $tag)
{
$extensions = [];
foreach ($container->findTaggedServiceIds($tag) as $serviceId => $tags) {
foreach ($tags as $tag) {
$priority = $tag['priority'] ?? 0;
$extensions[$priority][] = new Reference($serviceId);
}
}
krsort($extensions);

// Flatten the array
return empty($extensions) ? [] : call_user_func_array('array_merge', $extensions);
}
}
4 changes: 2 additions & 2 deletions tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DoctrineQueryExtensionPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public function testProcess()

$containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
$containerBuilderProphecy->hasDefinition('api_platform.doctrine.metadata_factory')->willReturn(true)->shouldBeCalled();
$containerBuilderProphecy->findTaggedServiceIds('api_platform.doctrine.orm.query_extension.collection')->willReturn(['foo' => [], 'bar' => ['priority' => 1]])->shouldBeCalled();
$containerBuilderProphecy->findTaggedServiceIds('api_platform.doctrine.orm.query_extension.item')->willReturn(['foo' => [], 'bar' => ['priority' => 1]])->shouldBeCalled();
$containerBuilderProphecy->findTaggedServiceIds('api_platform.doctrine.orm.query_extension.collection', true)->willReturn(['foo' => [], 'bar' => ['priority' => 1]])->shouldBeCalled();
$containerBuilderProphecy->findTaggedServiceIds('api_platform.doctrine.orm.query_extension.item', true)->willReturn(['foo' => [], 'bar' => ['priority' => 1]])->shouldBeCalled();

$containerBuilderProphecy->getDefinition('api_platform.doctrine.orm.collection_data_provider')->willReturn($collectionDataProviderDefinition)->shouldBeCalled();
$containerBuilderProphecy->getDefinition('api_platform.doctrine.orm.item_data_provider')->willReturn($itemDataProviderDefinition)->shouldBeCalled();
Expand Down