Merge remote-tracking branch 'origin/master' into create-models

Conflicts:
	CHANGELOG.md
	DependencyInjection/CmfRoutingExtension.php
	Tests/Functional/Doctrine/Phpcr/RedirectRouteTest.php
	Tests/Functional/Doctrine/Phpcr/RouteTest.php

Author: dbu

.travis.yml

@@ -10,8 +10,8 @@ env:
   - SYMFONY_VERSION=dev-master
 
 before_script:
-  - composer require symfony/routing:${SYMFONY_VERSION} --no-update
-  - composer install --dev
+  - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
+  - composer update
   - 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

CHANGELOG.md

@@ -1,20 +1,11 @@
 Changelog
 =========
 
-* **2013-06-15**: [Model] Separated database agnostic, doctrine generic and
-  PHPCR-ODM specific code to prepare for Doctrine ORM support. Deprecated
-  RoutingBundle\Document\Route and RedirectRoute in favor of
-  RoutingBundle\Doctrine\Phpcr\Route resp. RedirectRoute and also moved the
-  PHPCR-ODM specific listeners and repository implementations to Doctrine\Phpcr
-  Configuration was cleaned up as well. PHPCR specific configurations moved
-  into dynamic.phpcr_provider: use_sonata_admin, 'manager_registry,
-  manager_name, route_basepath, content_basepath.
-  In preparation of other route provider support, you need to at least set
-  `phpcr_provider: ~` to have the PHPCR provider loaded.
-  Dropped redundant routing_repositoryroot.
+* **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
 
-1.1.0-beta1
------------
+1.1.0-beta2
 
 * **2013-05-28**: [Bundle] Only include Doctrine PHPCR compiler pass if PHPCR-ODM is present
 * **2013-05-25**: [Bundle] Drop symfony_ from symfony_cmf prefix

CONTRIBUTING.md

@@ -0,0 +1,12 @@
+Contributing
+------------
+
+Symfony2 CMF is an open source, community-driven project. We follow the same
+guidelines as core Symfony2. If you'd like to contribute, please read the
+[Contributing Code][1] part of the documentation. If you're submitting a pull
+request, please follow the guidelines in the [Submitting a Patch][2] section
+and use the [Pull Request Template][3].
+
+[1]: http://symfony.com/doc/current/contributing/code/index.html
+[2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
+[3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request

CmfRoutingBundle.php

@@ -6,8 +6,8 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\ChainRouterPass;
-use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\RouteEnhancerPass;
+use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRoutersPass;
+use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRouteEnhancersPass;
 use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\SetRouterPass;
 
 /**
@@ -21,8 +21,8 @@ class CmfRoutingBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
-        $container->addCompilerPass(new ChainRouterPass());
-        $container->addCompilerPass(new RouteEnhancerPass());
+        $container->addCompilerPass(new RegisterRoutersPass());
+        $container->addCompilerPass(new RegisterRouteEnhancersPass());
         $container->addCompilerPass(new SetRouterPass());
 
         if (class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')) {

DependencyInjection/CmfRoutingExtension.php

@@ -43,12 +43,6 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         $this->setupFormTypes($config, $container, $loader);
-
-        // if there is twig, register our form type with twig
-        if ($container->hasParameter('twig.form.resources')) {
-            $resources = $container->getParameter('twig.form.resources');
-            $container->setParameter('twig.form.resources', array_merge($resources, array('CmfRoutingBundle:Form:terms_form_type.html.twig')));
-        }
     }
 
     public function setupFormTypes(array $config, ContainerBuilder $container, LoaderInterface $loader)

DependencyInjection/Compiler/ChainRouterPass.php

@@ -61,7 +61,7 @@
 
         <service id="cmf_routing.nested_matcher" class="%cmf_routing.nested_matcher_class%">
             <argument type="service" id="cmf_routing.route_provider" />
-            <call method="setFinalMatcher"><argument type="service" id="cmf_routing.final_matcher"/></call>
+            <argument type="service" id="cmf_routing.final_matcher"/>
         </service>
 
         <service id="cmf_routing.matcher.dummy_collection" class="Symfony\Component\Routing\RouteCollection" public="false"/>

DependencyInjection/Compiler/RouteEnhancerPass.php

@@ -5,16 +5,9 @@
 
     <parameters>
         <parameter key="cmf_routing.route_type_type_class">Symfony\Cmf\Bundle\RoutingBundle\Form\Type\RouteTypeType</parameter>
-        <parameter key="cmf_routing.terms_form_type_class">Symfony\Cmf\Bundle\RoutingBundle\Form\Type\TermsFormType</parameter>
     </parameters>
 
     <services>
-
-        <service id="cmf_routing.terms_form_type" class="%cmf_routing.terms_form_type_class%">
-            <tag name="form.type" alias="cmf_routing_terms_form_type" />
-            <argument type="service" id="router" />
-        </service>
-
         <service id="cmf_routing.route_type_form_type" class="%cmf_routing.route_type_type_class%">
             <tag name="form.type" alias="cmf_routing_route_type" />
         </service>