Merge pull request #44 from kea/patch/41-upgrade-to-new-standard

Upgrade to new standard

Author: lsmith77

DependencyInjection/CmfTreeBrowserExtension.php

@@ -2,12 +2,12 @@
 
 namespace Symfony\Cmf\Bundle\TreeBrowserBundle\DependencyInjection;
 
-use Symfony\Component\Config\FileLocator,
-    Symfony\Component\HttpKernel\DependencyInjection\Extension,
-    Symfony\Component\DependencyInjection\Reference,
-    Symfony\Component\DependencyInjection\ContainerInterface,
-    Symfony\Component\DependencyInjection\ContainerBuilder,
-    Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
 /**
   * @author Lukas Kahwe Smith <[email protected]>
@@ -28,10 +28,12 @@ public function load(array $configs, ContainerBuilder $container)
 
         $bundles = $container->getParameter('kernel.bundles');
 
-        if (isset($bundles['DoctrinePHPCRBundle'])) {
-            $loader->load('phpcr.xml');
-            $phpcr_tree = $container->getDefinition('cmf_tree_browser.phpcr_tree');
-            $phpcr_tree->replaceArgument(1, $config['session_name']);
+        if (isset($bundles['DoctrinePHPCRBundle'])
+            && !empty($config['persistence']['phpcr']['enabled'])) {
+
+            $loader->load('tree-phpcr.xml');
+            $phpcrTree = $container->getDefinition('cmf_tree_browser.phpcr_tree');
+            $phpcrTree->replaceArgument(1, $config['persistence']['phpcr']['session_name']);
         }
 
         $loader->load('tree.xml');

DependencyInjection/Configuration.php

@@ -24,11 +24,18 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('cmf_tree_browser');
-
-        $rootNode
+        $treeBuilder->root('cmf_tree_browser')
             ->children()
-                ->scalarNode('session_name')->defaultValue('default')->end()
+                ->arrayNode('persistence')
+                    ->children()
+                        ->arrayNode('phpcr')
+                            ->children()
+                                ->scalarNode('enabled')->defaultValue(true)->end()
+                                ->scalarNode('session_name')->defaultValue('default')->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 

Resources/config/phpcr.xml renamed to Resources/config/tree-phpcr.xml

@@ -0,0 +1,23 @@
+TreeBrowerBundle
+
+The MIT License
+
+Copyright (c) 2011-2013 Symfony2 CMF
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Resources/meta/LICENSE

@@ -0,0 +1,5 @@
+cmf_tree_browser:
+    persistence:
+        phpcr:
+            enabled: true
+            session_name: 'default'