do not rename the template in dynamic router

$template is in line with the FrameworkBundle TemplateController

Author: dbu

CHANGELOG.md

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+ * **2017-02-06**: [BC BREAK] The bundle dynamic router renames the `_template`
+   parameter to `template` and not `contentTemplate` anymore. The parameter is
+   still moved from the route defaults to the request attributes.
  * **2017-02-03**: [BC BREAK] Removed unused `cmf_routing.dynamic.persistence.phpcr.content_basepath`
 
 2.0.0-RC1

UPGRADE-2.0.md

@@ -198,3 +198,24 @@
        </dynamic>
    </config>
    ```
+
+## Route Template
+
+The `_template` parameter gets now renamed to `template`. The
+CmfContentBundle has been adjusted accordingly. If you have your own
+controllers that expect a template argument, adjust them accordingly:
+
+   **Before**
+   ```php
+   public function documentAction($contentDocument, $contentTemplate) {
+       ...
+   ```
+
+   **After**
+   ```php
+   public function documentAction($contentDocument, $template) {
+       ...
+   ```
+   
+For BC, version 2 of this bundle will still keep populating `contentTemplate` in 
+addition to `template` but it is deprecated to rely on the `contentTemplate` field. 

src/Routing/DynamicRouter.php

@@ -41,7 +41,15 @@ class DynamicRouter extends BaseDynamicRouter
      * key for the request attribute that contains the template this document
      * wants to use.
      */
-    const CONTENT_TEMPLATE = 'contentTemplate';
+    const CONTENT_TEMPLATE = 'template';
+
+    /**
+     * RoutingBundle 1.* put the template into the request attributes as "contentTemplate".
+     *
+     * This name is deprecated in favor of "template" for consistency with
+     * FrameworkBundle and will be removed in RoutingBundle 3.
+     */
+    const BC_CONTENT_TEMPLATE = 'contentTemplate';
 
     /**
      * @var Request
@@ -99,6 +107,7 @@ protected function cleanDefaults($defaults, Request $request = null)
 
         if (array_key_exists(RouteObjectInterface::TEMPLATE_NAME, $defaults)) {
             $request->attributes->set(self::CONTENT_TEMPLATE, $defaults[RouteObjectInterface::TEMPLATE_NAME]);
+            $request->attributes->set(self::BC_CONTENT_TEMPLATE, $defaults[RouteObjectInterface::TEMPLATE_NAME]);
             unset($defaults[RouteObjectInterface::TEMPLATE_NAME]);
         }