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

Allow configuration to not use default RouteVoter #383

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public function getConfigTreeBuilder()
->end()
->end()
->booleanNode('templating')->defaultFalse()->end()
->booleanNode('use_knp_voters')->defaultTrue()->end()
->scalarNode('default_renderer')->cannotBeEmpty()->defaultValue('twig')->end()
->end();

Expand Down
4 changes: 4 additions & 0 deletions src/DependencyInjection/KnpMenuExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ public function load(array $configs, ContainerBuilder $container)
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);

if($config['use_knp_voters'] === true) {
$loader->load('voters.xml');
}

foreach ($config['providers'] as $builder => $enabled) {
if ($enabled) {
$container->getDefinition(sprintf('knp_menu.menu_provider.%s', $builder))->addTag('knp_menu.provider');
Expand Down
6 changes: 0 additions & 6 deletions src/Resources/config/menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<parameter key="knp_menu.renderer.list.class">Knp\Menu\Renderer\ListRenderer</parameter>
<parameter key="knp_menu.renderer.list.options" type="collection"></parameter>
<parameter key="knp_menu.listener.voters.class">Knp\Bundle\MenuBundle\EventListener\VoterInitializerListener</parameter>
<parameter key="knp_menu.voter.router.class">Knp\Menu\Matcher\Voter\RouteVoter</parameter>
</parameters>

<services>
Expand Down Expand Up @@ -81,11 +80,6 @@
<tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" />
</service>

<service id="knp_menu.voter.router" class="%knp_menu.voter.router.class%">
<argument type="service" id="request_stack" />
<tag name="knp_menu.voter" />
</service>

<service id="knp_menu.manipulator" class="Knp\Menu\Util\MenuManipulator" public="false" />

<!-- autowiring aliases -->
Expand Down
1 change: 1 addition & 0 deletions src/Resources/config/schema/menu-1.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<xsd:element name="twig" type="twig" minOccurs="0"/>
</xsd:all>

<xsd:attribute name="use-knp-voters" type="xsd:boolean" default="true"/>
<xsd:attribute name="templating" type="xsd:boolean" default="false"/>
<xsd:attribute name="default-renderer" type="xsd:string" default="twig"/>
</xsd:complexType>
Expand Down
18 changes: 18 additions & 0 deletions src/Resources/config/voters.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" ?>

<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<parameters>
<parameter key="knp_menu.voter.router.class">Knp\Menu\Matcher\Voter\RouteVoter</parameter>
</parameters>

<services>
<service id="knp_menu.voter.router" class="%knp_menu.voter.router.class%">
<argument type="service" id="request_stack" />
<tag name="knp_menu.voter" />
</service>
</services>

</container>
2 changes: 1 addition & 1 deletion tests/DependencyInjection/ConfigurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function getConfigs()
return array(
array('<config xmlns="http://knplabs.com/schema/dic/menu"/>'),
array(<<<EOC
<config xmlns="http://knplabs.com/schema/dic/menu" templating="true" default-renderer="templating">
<config xmlns="http://knplabs.com/schema/dic/menu" templating="true" default-renderer="templating" use-knp-voters="true">
<providers builder-alias="false" container-aware="false" builder-service="false"/>
<twig template="custom.html.twig"/>
</config>
Expand Down
9 changes: 9 additions & 0 deletions tests/DependencyInjection/KnpMenuExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public function testDefault()
$this->assertFalse($container->hasDefinition('knp_menu.templating.helper'), 'The PHP helper is not loaded');
$this->assertTrue($container->getDefinition('knp_menu.menu_provider.builder_alias')->hasTag('knp_menu.provider'), 'The BuilderAliasProvider is enabled');
$this->assertTrue($container->getDefinition('knp_menu.menu_provider.container_aware')->hasTag('knp_menu.provider'), 'The ContainerAwareProvider is enabled');
$this->assertTrue($container->hasDefinition('knp_menu.voter.router'),'The RouteVoter is loaded');
}

public function testEnableTwig()
Expand Down Expand Up @@ -73,4 +74,12 @@ public function testDisableContainerAwareProvider()
$this->assertTrue($container->getDefinition('knp_menu.menu_provider.builder_alias')->hasTag('knp_menu.provider'), 'The BuilderAliasProvider is enabled');
$this->assertFalse($container->getDefinition('knp_menu.menu_provider.container_aware')->hasTag('knp_menu.provider'), 'The ContainerAwareProvider is disabled');
}

public function testNotUseKnpVoters()
{
$container = new ContainerBuilder();
$loader = new KnpMenuExtension();
$loader->load(array(array('use_knp_voters' => false)), $container);
$this->assertFalse($container->hasDefinition('knp_menu.voter.router'));
}
}