From e29366e245c765677e394ed469e18bbea92fb055 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Fri, 28 Jul 2017 06:53:32 +0200 Subject: [PATCH] add missing parameter --- .../SonataDoctrinePHPCRAdminExtension.php | 4 ++++ src/Resources/config/block.xml | 2 +- .../config/doctrine_phpcr_form_types.xml | 2 +- .../SonataDoctrinePHPCRAdminExtensionTest.php | 21 +++++++++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/DependencyInjection/SonataDoctrinePHPCRAdminExtension.php b/src/DependencyInjection/SonataDoctrinePHPCRAdminExtension.php index dab1a1f5..693117d8 100644 --- a/src/DependencyInjection/SonataDoctrinePHPCRAdminExtension.php +++ b/src/DependencyInjection/SonataDoctrinePHPCRAdminExtension.php @@ -101,5 +101,9 @@ private function loadDocumentTree($config, ContainerBuilder $container) ); $container->setParameter('sonata_admin_doctrine_phpcr.tree_block.configuration', $configuration); + + foreach ($configuration as $key => $value) { + $container->setParameter('sonata_admin_doctrine_phpcr.tree_block.'.$key, $value); + } } } diff --git a/src/Resources/config/block.xml b/src/Resources/config/block.xml index 218835a1..a37535f5 100644 --- a/src/Resources/config/block.xml +++ b/src/Resources/config/block.xml @@ -8,7 +8,7 @@ sonata_admin_doctrine_phpcr.tree_block - %sonata_admin_doctrine_phpcr.tree_block.defaults% + %sonata_admin_doctrine_phpcr.tree_block.routing_defaults% diff --git a/src/Resources/config/doctrine_phpcr_form_types.xml b/src/Resources/config/doctrine_phpcr_form_types.xml index fdfd5c5e..e3776140 100644 --- a/src/Resources/config/doctrine_phpcr_form_types.xml +++ b/src/Resources/config/doctrine_phpcr_form_types.xml @@ -4,7 +4,7 @@ - %sonata_admin_doctrine_phpcr.tree_block.defaults% + %sonata_admin_doctrine_phpcr.tree_block.routing_defaults% diff --git a/tests/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php b/tests/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php index 97396d32..884340d6 100644 --- a/tests/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php +++ b/tests/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php @@ -41,5 +41,26 @@ public function testDocumentTreeDefaultValues() 'reorder' => true, ) ); + + $this->assertContainerBuilderHasParameter( + 'sonata_admin_doctrine_phpcr.tree_block.routing_defaults', + array() + ); + $this->assertContainerBuilderHasParameter( + 'sonata_admin_doctrine_phpcr.tree_block.repository_name', + null + ); + $this->assertContainerBuilderHasParameter( + 'sonata_admin_doctrine_phpcr.tree_block.sortable_by', + 'position' + ); + $this->assertContainerBuilderHasParameter( + 'sonata_admin_doctrine_phpcr.tree_block.move', + true + ); + $this->assertContainerBuilderHasParameter( + 'sonata_admin_doctrine_phpcr.tree_block.reorder', + true + ); } }