fix extension configuration and registering

rollerworks-graveyard · Jun 19, 2015 · f0f6ab4 · f0f6ab4
1 parent 1df544f
commit f0f6ab4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/DependencyInjection/Compiler/ExtensionPass.php b/src/DependencyInjection/Compiler/ExtensionPass.php
@@ -35,9 +35,12 @@ public function process(ContainerBuilder $container)
 
     private function processTwig(ContainerBuilder $container)
     {
+        $reflection = new \ReflectionClass(TwigDatagridExtension::class);
+        $extensionFolder = dirname(dirname(dirname($reflection->getFileName())));
+
         $container->getDefinition('twig.loader.filesystem')->addMethodCall(
             'addPath',
-            [dirname((new \ReflectionClass(TwigDatagridExtension::class))->getFileName().'/../').'/Resources/views/theme']
+            [$extensionFolder.'/Resources/theme']
         );
     }
 

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -28,12 +28,13 @@ public function getConfigTreeBuilder()
         $rootNode = $treeBuilder->root($this->configName);
 
         $rootNode
+            ->addDefaultsIfNotSet()
             ->children()
                 ->arrayNode('twig')
-                    ->addDefaultChildrenIfNoneSet()
+                    ->addDefaultsIfNotSet()
                     ->children()
                         ->arrayNode('themes')
-                            ->prototype('scalar')
+                            ->prototype('scalar')->end()
                             ->defaultValue(['datagrid.html.twig'])
                         ->end()
                     ->end()

diff --git a/src/RollerworksDatagridBundle.php b/src/RollerworksDatagridBundle.php
@@ -2,8 +2,8 @@
 
 namespace Rollerworks\Component\DatagridBundle;
 
+use Rollerworks\Component\DatagridBundle\DependencyInjection\Compiler\ExtensionPass;
 use Rollerworks\Component\DatagridBundle\DependencyInjection\DatagridExtension;
-use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\ExtensionPass;
 use Symfony\Component\Console\Application;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;