Merge pull request #166 from symfony-cmf/request-context

dropping extending the ContentAwareGenerator class

Author: lsmith77

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.1.0-RC3
+---------
+
+* **2013-09-04**: Marked ContentAwareGenerator as obsolete, use ContentAwareGenerator
+   from the CMF routing component directly instead. This class will be removed in 1.2
 * **2013-08-09**: dynamic.generic_controller is now defaulting to null instead
   of the controller from CmfContentBundle. CmfCoreBundle is prepending the
   CmfContentBundle generic controller if that bundle is present. If you do not

Resources/config/routing-dynamic.xml

@@ -10,7 +10,7 @@
         <parameter key="cmf_routing.nested_matcher_class">Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher</parameter>
         <parameter key="cmf_routing.final_matcher_class">Symfony\Cmf\Component\Routing\NestedMatcher\UrlMatcher</parameter>
         <parameter key="cmf_routing.url_matcher_class">Symfony\Bundle\FrameworkBundle\Routing\RedirectableUrlMatcher</parameter>
-        <parameter key="cmf_routing.generator_class">Symfony\Cmf\Bundle\RoutingBundle\Routing\ContentAwareGenerator</parameter>
+        <parameter key="cmf_routing.generator_class">Symfony\Cmf\Component\Routing\ContentAwareGenerator</parameter>
         <parameter key="cmf_routing.enhancer_route_content_class">Symfony\Cmf\Component\Routing\Enhancer\RouteContentEnhancer</parameter>
         <parameter key="cmf_routing.enhancer_explicit_template_class">Symfony\Cmf\Component\Routing\Enhancer\FieldPresenceEnhancer</parameter>
         <parameter key="cmf_routing.enhancer_controllers_by_type_class">Symfony\Cmf\Component\Routing\Enhancer\FieldMapEnhancer</parameter>
@@ -76,7 +76,6 @@
         <service id="cmf_routing.generator" class="%cmf_routing.generator_class%">
             <argument type="service" id="cmf_routing.route_provider" />
             <argument type="service" id="logger" on-invalid="ignore" />
-            <call method="setContainer"><argument type="service" id="service_container"/></call>
         </service>
 
         <service id="cmf_routing.redirect_controller" class="%cmf_routing.redirect_controller_class%">

Routing/ContentAwareGenerator.php

@@ -8,9 +8,13 @@
 use Symfony\Cmf\Component\Routing\ContentAwareGenerator as BaseGenerator;
 
 /**
- * Symfony framework integration of the CMF routing component ContentAwareGenerator class
+ * **Deprecated**
  *
  * @author David Buchmann
+ *
+ * @deprecated This class is obsolete and the ContentAwareGenerator from the
+ *  CMF routing component should be used directly instead. This class will be
+ *  removed in 1.2.
  */
 class ContentAwareGenerator extends BaseGenerator implements ContainerAwareInterface
 {

Tests/Unit/Routing/ContentAwareGeneratorTest.php

@@ -15,7 +15,7 @@
     "prefer-stable": false,
     "require": {
         "php": ">=5.3.3",
-        "symfony-cmf/routing": "~1.1.0-RC1",
+        "symfony-cmf/routing": "~1.1.0-RC3",
         "symfony/framework-bundle": "~2.2"
     },
     "require-dev": {