dropping our ContentAwareGenerator class as the one from the component can now do all that is needed

dbu · lsmith77 · commit c70ef88d532b · 2013-09-04T09:03:58.000+02:00
diff --git a/Resources/config/routing-dynamic.xml b/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%">
diff --git a/Routing/ContentAwareGenerator.php b/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
 {
diff --git a/Tests/Unit/Routing/ContentAwareGeneratorTest.php b/Tests/Unit/Routing/ContentAwareGeneratorTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,13 @@`
`8`	`8`	`use Symfony\Cmf\Component\Routing\ContentAwareGenerator as BaseGenerator;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * Symfony framework integration of the CMF routing component ContentAwareGenerator class`
	`11`	`+ * Deprecated`
`12`	`12`	`*`
`13`	`13`	`* @author David Buchmann`
	`14`	`+ *`
	`15`	`+ * @deprecated This class is obsolete and the ContentAwareGenerator from the`
	`16`	`+ * CMF routing component should be used directly instead. This class will be`
	`17`	`+ * removed in 1.2.`
`14`	`18`	`*/`
`15`	`19`	`class ContentAwareGenerator extends BaseGenerator implements ContainerAwareInterface`
`16`	`20`	`{`