Merge pull request #32 from symfony-cmf/drop_symfony_cmf_prefix

Removed symfony_cmf prefix with cmf_

Author: dantleech

SymfonyCmfTreeBrowserBundle.php renamed to CmfTreeBrowserBundle.php

@@ -8,7 +8,7 @@
 
 use Symfony\Cmf\Bundle\TreeBrowserBundle\DependencyInjection\Compiler\AddTreesCompilerPass;
 
-class SymfonyCmfTreeBrowserBundle extends Bundle
+class CmfTreeBrowserBundle extends Bundle
 {
     public function build(ContainerBuilder $container)
     {

DependencyInjection/SymfonyCmfTreeBrowserExtension.php renamed to DependencyInjection/CmfTreeBrowserExtension.php

@@ -12,7 +12,7 @@
 /**
   * @author Lukas Kahwe Smith <[email protected]>
   */
-class SymfonyCmfTreeBrowserExtension extends Extension
+class CmfTreeBrowserExtension extends Extension
 {
     /**
      * Loads the services based on your application configuration.
@@ -30,7 +30,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         if (isset($bundles['DoctrinePHPCRBundle'])) {
             $loader->load('phpcr.xml');
-            $phpcr_tree = $container->getDefinition('symfony_cmf_tree_browser.phpcr_tree');
+            $phpcr_tree = $container->getDefinition('cmf_tree_browser.phpcr_tree');
             $phpcr_tree->replaceArgument(1, $config['session_name']);
         }
 

DependencyInjection/Compiler/AddTreesCompilerPass.php

@@ -18,20 +18,20 @@ class AddTreesCompilerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        $trees = $container->findTaggedServiceIds('symfony_cmf.tree');
+        $trees = $container->findTaggedServiceIds('cmf.tree');
         $controllers = array();
         foreach ($trees as $treeId => $tag) {
             $tree = $container->getDefinition($treeId);
             $alias = isset($tag[0]['alias'])
                 ? $tag[0]['alias']
                 : $treeId;
 
-            $controller = new DefinitionDecorator('symfony_cmf_tree_browser.controller_prototype');
+            $controller = new DefinitionDecorator('cmf_tree_browser.controller_prototype');
             $controller->replaceArgument(0, $tree);
-            $container->setDefinition($alias.'.symfony_cmf_tree_controller', $controller);
-            $controllers[] = array('id' => $alias.'.symfony_cmf_tree_controller', 'alias' => $alias);
+            $container->setDefinition($alias.'.cmf_tree_controller', $controller);
+            $controllers[] = array('id' => $alias.'.cmf_tree_controller', 'alias' => $alias);
         }
-        $container->setParameter('symfony_cmf_tree_browser.tree_controllers', $controllers);
+        $container->setParameter('cmf_tree_browser.tree_controllers', $controllers);
     }
 
 }

DependencyInjection/Configuration.php

@@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('symfony_cmf_tree_browser');
+        $rootNode = $treeBuilder->root('cmf_tree_browser');
 
         $rootNode
             ->children()

Resources/config/phpcr.xml

@@ -6,8 +6,8 @@
 
     <services>
 
-        <service id="symfony_cmf_tree_browser.phpcr_tree" class="Symfony\Cmf\Bundle\TreeBrowserBundle\Tree\PHPCRTree">
-            <tag name="symfony_cmf.tree" alias="phpcr_tree" />
+        <service id="cmf_tree_browser.phpcr_tree" class="Symfony\Cmf\Bundle\TreeBrowserBundle\Tree\PHPCRTree">
+            <tag name="cmf.tree" alias="phpcr_tree" />
             <argument type="service" id="doctrine_phpcr"/>
             <argument />
         </service>

Resources/config/tree.xml

@@ -5,13 +5,13 @@
 
     <services>
 
-        <service id="symfony_cmf_tree_browser.controller_prototype" class="Symfony\Cmf\Bundle\TreeBrowserBundle\Controller\TreeBrowserController" abstract="true">
+        <service id="cmf_tree_browser.controller_prototype" class="Symfony\Cmf\Bundle\TreeBrowserBundle\Controller\TreeBrowserController" abstract="true">
             <argument/> <!-- tree implementation -->
         </service>
 
-        <service id="symfony_cmf_tree_browser.route_loader" class="Symfony\Cmf\Bundle\TreeBrowserBundle\Route\TreeControllerRoutesLoader">
+        <service id="cmf_tree_browser.route_loader" class="Symfony\Cmf\Bundle\TreeBrowserBundle\Route\TreeControllerRoutesLoader">
             <tag name="routing.loader" />
-            <argument>%symfony_cmf_tree_browser.tree_controllers%</argument>
+            <argument>%cmf_tree_browser.tree_controllers%</argument>
         </service>
 
     </services>

Route/TreeControllerRoutesLoader.php

@@ -39,10 +39,10 @@ public function load($resource, $type = null)
                 $requirements = array(
                     '_method' => $definition['method']
                 );
-                $pattern = '_symfony_cmf_tree/'.$controller['alias'].'/'.$definition['pattern'];
+                $pattern = '_cmf_tree/'.$controller['alias'].'/'.$definition['pattern'];
 
                 $route = new Route($pattern, $defaults, $requirements, array('expose' => true));
-                $collection->add('_symfony_cmf_tree_'.$controller['alias'].'_'.$name, $route);
+                $collection->add('_cmf_tree_'.$controller['alias'].'_'.$name, $route);
             }
         }
         return $collection;
@@ -59,7 +59,7 @@ public function load($resource, $type = null)
      */
     public function supports($resource, $type = null)
     {
-        if ($type == 'symfony_cmf_tree') {
+        if ($type == 'cmf_tree') {
             return true;
         }
 

Tests/Functional/AppKernel.php

@@ -32,7 +32,7 @@ public function registerBundles()
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new \Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle(),
-            new \Symfony\Cmf\Bundle\TreeBrowserBundle\SymfonyCmfTreeBrowserBundle(),
+            new \Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle(),
         );
     }
 
@@ -43,6 +43,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
     public function getCacheDir()
     {
-        return sys_get_temp_dir().'/SymfonyCmfTreeBrowserBundle';
+        return sys_get_temp_dir().'/CmfTreeBrowserBundle';
     }
 }

Tests/Functional/PHPCR/PHPCRBrowserTest.php

@@ -18,7 +18,7 @@ public function testGetChildrenListFromRoot()
 
         $client = $this->createClient();
 
-        $client->request('GET', '/_symfony_cmf_tree/phpcr_tree/children');
+        $client->request('GET', '/_cmf_tree/phpcr_tree/children');
 
         $this->assertEquals(
             $client->getResponse()->getContent(),
@@ -32,7 +32,7 @@ public function testGetChildrenListFromInnerNode()
 
         $client = $this->createClient();
 
-        $crawler = $client->request('GET', '/_symfony_cmf_tree/phpcr_tree/children?root=%2Fcms%2Fcontent');
+        $crawler = $client->request('GET', '/_cmf_tree/phpcr_tree/children?root=%2Fcms%2Fcontent');
 
         $this->assertEquals(
             $client->getResponse()->getContent(),

Tests/Functional/config/routing.yml

@@ -2,6 +2,6 @@ symfony_route:
     pattern:  /symfony_route_test
     defaults: { _controller: Test:controller }
 
-symfony_cmf_tree:
+cmf_tree:
     resource: .
-    type: 'symfony_cmf_tree'
+    type: 'cmf_tree'