Merge pull request #184 from symfony-cmf/request-aware

now that we are symfony 2.3+ we no longer need the cmf_request_aware hack

Author: lsmith77

Provider/PhpcrMenuProvider.php

@@ -136,7 +136,7 @@ public function getPrefetch()
     }
 
     /**
-     * Set the request, used for the cmf_request_aware tag.
+     * Set the request.
      *
      * @param Request $request
      */

Resources/config/persistence-phpcr.xml

@@ -17,7 +17,7 @@
             <argument>%cmf_menu.persistence.phpcr.menu_basepath%</argument>
             <call method="setManagerName"><argument>%cmf_menu.persistence.phpcr.manager_name%</argument></call>
             <call method="setPrefetch"><argument>%cmf_menu.persistence.phpcr.prefetch%</argument></call>
-            <tag name="cmf_request_aware"/>
+            <call method="setRequest"><argument type="service" id="request" on-invalid="null" strict="false"/></call>
         </service>
 
         <service id="cmf_menu.initializer" class="Doctrine\Bundle\PHPCRBundle\Initializer\GenericInitializer">

Resources/config/voters.xml

@@ -12,14 +12,14 @@
     <services>
 
         <service id="cmf_menu.current_item_voter.uri_prefix" class="%cmf_menu.current_item_voter.uri_prefix.class%">
+            <call method="setRequest"><argument type="service" id="request" on-invalid="null" strict="false"/></call>
             <tag name="cmf_menu.voter"/>
-            <tag name="cmf_request_aware"/>
         </service>
 
         <service id="cmf_menu.current_item_voter.content_identity" class="%cmf_menu.current_item_voter.content_identity.class%">
             <argument>%cmf_menu.content_key%</argument>
+            <call method="setRequest"><argument type="service" id="request" on-invalid="null" strict="false"/></call>
             <tag name="cmf_menu.voter"/>
-            <tag name="cmf_request_aware"/>
         </service>
 
     </services>