Skip to content

Commit 410d151

Browse files
committed
Merge branch '2.1'
2 parents 159154f + 1b98fec commit 410d151

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection;
1515

16+
use ApiPlatform\Core\Api\FilterInterface;
1617
use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface;
1718
use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface;
1819
use ApiPlatform\Core\DataPersister\DataPersisterInterface;
@@ -100,6 +101,8 @@ public function load(array $configs, ContainerBuilder $container)
100101
->addTag('api_platform.doctrine.orm.query_extension.item');
101102
$container->registerForAutoconfiguration(QueryCollectionExtensionInterface::class)
102103
->addTag('api_platform.doctrine.orm.query_extension.collection');
104+
$container->registerForAutoconfiguration(FilterInterface::class)
105+
->addTag('api_platform.filter');
103106

104107
if (interface_exists(ValidatorInterface::class)) {
105108
$loader->load('validator.xml');

tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace ApiPlatform\Core\Tests\Bridge\Symfony\Bundle\DependencyInjection;
1515

16+
use ApiPlatform\Core\Api\FilterInterface;
1617
use ApiPlatform\Core\Api\IriConverterInterface;
1718
use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface;
1819
use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface;
@@ -328,6 +329,10 @@ private function getPartialContainerBuilderProphecy()
328329
->willReturn($childDefinitionProphecy)->shouldBeCalledTimes(1);
329330
$childDefinitionProphecy->addTag('api_platform.doctrine.orm.query_extension.collection')->shouldBeCalledTimes(1);
330331

332+
$containerBuilderProphecy->registerForAutoconfiguration(FilterInterface::class)
333+
->willReturn($childDefinitionProphecy)->shouldBeCalledTimes(1);
334+
$childDefinitionProphecy->addTag('api_platform.filter')->shouldBeCalledTimes(1);
335+
331336
$containerBuilderProphecy->getParameter('kernel.bundles')->willReturn([
332337
'DoctrineBundle' => DoctrineBundle::class,
333338
])->shouldBeCalled();

0 commit comments

Comments
 (0)