Merge remote-tracking branch 'origin/master' into orm

Author: dbu

.gitignore

@@ -1,5 +1,5 @@
 phpunit.xml
 composer.lock
-/vendor
-Tests/Functional/config/parameters.yml
-Tests/Functional/app.sqlite
+vendor
+Tests/Resources/app/cache
+Tests/Resources/app/logs

.travis.yml

@@ -11,11 +11,8 @@ env:
   - SYMFONY_VERSION=dev-master
 
 before_script:
-  - composer self-update
   - composer require symfony/framework-bundle:${SYMFONY_VERSION} --prefer-source
-  - cp ./Tests/Functional/config/parameters.yml.dist ./Tests/Functional/config/parameters.yml
-  - php Tests/Functional/console doctrine:phpcr:init:dbal
-  - php Tests/Functional/console doctrine:phpcr:repository:init
+  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
 script: phpunit --coverage-text
 

Admin/Extension/RouteReferrersExtension.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingBundle\Admin\Extension;
+
+use Sonata\AdminBundle\Admin\AdminExtension;
+use Sonata\AdminBundle\Admin\AdminInterface;
+use Sonata\AdminBundle\Datagrid\ListMapper;
+use Sonata\AdminBundle\Form\FormMapper;
+
+/**
+ * Admin extension to add routes tab to content implementing the
+ * RouteReferrersWriteInterface.
+ *
+ * @author David Buchmann <[email protected]>
+ */
+class RouteReferrersExtension extends AdminExtension
+{
+    public function configureFormFields(FormMapper $formMapper)
+    {
+        $formMapper
+            ->with('form.group_routes', array(
+                'translation_domain' => 'CmfRoutingBundle',
+            ))
+            ->add(
+                'routes',
+                'sonata_type_collection',
+                array(
+                    'by_reference' => false,
+                ),
+                array(
+                    'edit' => 'inline',
+                    'inline' => 'table',
+                ))
+            ->end()
+        ;
+    }
+}

Admin/RedirectRouteAdmin.php

@@ -14,7 +14,7 @@ class RedirectRouteAdmin extends Admin
     /**
      * work around https://github.com/sonata-project/SonataAdminBundle/pull/1472
      */
-    protected $baseRouteName = 'cmf_routing';
+    protected $baseRouteName = 'cmf_routing_redirectroute';
 
     /**
      * work around https://github.com/sonata-project/SonataAdminBundle/pull/1472

Admin/RouteAdmin.php

@@ -18,7 +18,7 @@ class RouteAdmin extends Admin
     /**
      * work around https://github.com/sonata-project/SonataAdminBundle/pull/1472
      */
-    protected $baseRouteName = 'cmf_routing';
+    protected $baseRouteName = 'cmf_routing_route';
 
     /**
      * work around https://github.com/sonata-project/SonataAdminBundle/pull/1472
@@ -71,7 +71,7 @@ protected function configureFormFields(FormMapper $formMapper)
             $formMapper
                 ->with('form.group_general')
                 ->add('variablePattern', 'text', array('required' => false))
-                ->add('routeContent', 'doctrine_phpcr_odm_tree', array('choice_list' => array(), 'required' => false, 'root_node' => $this->contentRoot))
+                ->add('content', 'doctrine_phpcr_odm_tree', array('choice_list' => array(), 'required' => false, 'root_node' => $this->contentRoot))
                 ->add('defaults', 'sonata_type_immutable_array', array('keys' => $this->configureFieldsForDefaults()))
                 ->end();
         }

CHANGELOG.md

@@ -3,7 +3,7 @@ Changelog
 
 * **2013-07-29**: [DependencyInjection] restructured `phpcr_provider` config into `persistence` -> `phpcr` to match other Bundles
 * **2013-07-28**: [DependencyInjection] added `enabled` flag to `phpcr_provider` config
-* **2013-07-26**: [Model] Deprecated setRouteContent and getRouteContent, use setContent and getContent instead.
+* **2013-07-26**: [Model] Removed setRouteContent and getRouteContent, use setContent and getContent instead.
 * **2013-07-19**: [Model] Separated database agnostic, doctrine generic and
   PHPCR-ODM specific code to prepare for Doctrine ORM support.
 * **2013-07-17**: [FormType] Moved TermsFormType to CoreBundle and renamed it to CheckboxUrlLableFormType

DependencyInjection/CmfRoutingExtension.php

@@ -34,7 +34,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         /* set up the chain router */
-        $loader->load('chain_routing.xml');
+        $loader->load('routing-chain.xml');
         $container->setParameter($this->getAlias() . '.replace_symfony_router', $config['chain']['replace_symfony_router']);
 
         // add the routers defined in the configuration mapping
@@ -48,7 +48,7 @@ public function load(array $configs, ContainerBuilder $container)
 
     public function setupFormTypes(array $config, ContainerBuilder $container, LoaderInterface $loader)
     {
-        $loader->load('form_type.xml');
+        $loader->load('form-type.xml');
 
         if (isset($config['dynamic'])) {
             $routeTypeTypeDefinition = $container->getDefinition('cmf_routing.route_type_form_type');
@@ -84,7 +84,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         $container->setParameter($this->getAlias() . '.defined_templates_class', $controllerForTemplates);
         $container->setParameter($this->getAlias() . '.uri_filter_regexp', $config['uri_filter_regexp']);
 
-        $loader->load('dynamic_routing.xml');
+        $loader->load('routing-dynamic.xml');
 
         $hasProvider = false;
         $hasContentRepository = false;
@@ -144,7 +144,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
 
     public function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuilder $container)
     {
-        $loader->load('provider_phpcr.xml');
+        $loader->load('provider-phpcr.xml');
 
         $container->setParameter($this->getAlias() . '.backend_type_phpcr', true);
 
@@ -174,7 +174,7 @@ public function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBu
             return;
         }
 
-        $loader->load('admin_phpcr.xml');
+        $loader->load('admin-phpcr.xml');
     }
 
     public function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilder $container)

Doctrine/Phpcr/RedirectRoute.php

@@ -3,6 +3,7 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr;
 
 use Symfony\Cmf\Bundle\RoutingBundle\Model\RedirectRoute as RedirectRouteModel;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 
 /**
  * {@inheritDoc}