Merge pull request #136 from symfony-cmf/drop_2_2

drop Symfony 2.2 support

Author: lsmith77

.travis.yml

@@ -6,7 +6,6 @@ php:
     - 5.5
 
 env:
-  - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
   - SYMFONY_VERSION=2.4.*
   - SYMFONY_VERSION=dev-master

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.1.0-RC2
+---------
+
+* **2014-04-11**: drop Symfony 2.2 compatibility, also the "cmf_request_aware" tag
+    has been deprecated. please add the ``setRequest()`` call manually now:
+  ``<call method="setRequest"><argument type="service" id="request" on-invalid="null" strict="false"/></call>``
+
 1.1.0-RC1
 ---------
 

DependencyInjection/Compiler/RequestAwarePass.php

@@ -19,8 +19,8 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
- * A compiler pass to find all cmf_request_aware services and add them to the
- * RequestAwareListener
+ * BC: A compiler pass to find all cmf_request_aware services and adjust the
+ * service definition.
  *
  * @author David Buchmann <[email protected]>
  */
@@ -31,43 +31,12 @@ class RequestAwarePass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (version_compare(Kernel::VERSION, '2.3', '<')) {
-            $this->configureSynchronizer($container);
-        } else {
-            $this->makeSynchronized($container);
-        }
-    }
-
-    /**
-     * Configure the request synchronizer for symfony 2.2
-     *
-     * @param ContainerBuilder $container
-     */
-    private function configureSynchronizer(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition('cmf_core.listener.request_aware')) {
-            return;
-        }
-
-        $listener = $container->getDefinition('cmf_core.listener.request_aware');
         $services = $container->findTaggedServiceIds('cmf_request_aware');
         foreach ($services as $id => $attributes) {
-            $listener->addMethodCall('addService', array(new Reference($id)));
-        }
-    }
+            trigger_error("Service $id is using the deprecated tag cmf_request_aware");
 
-    /**
-     * Make the tagged services synchronized for symfony 2.3 and later.
-     *
-     * @param ContainerBuilder $container
-     */
-    private function makeSynchronized(ContainerBuilder $container)
-    {
-        $services = $container->findTaggedServiceIds('cmf_request_aware');
-        foreach ($services as $id => $attributes) {
             $definition = $container->getDefinition($id);
             $definition
-                ->setSynchronized(true)
                 ->addMethodCall('setRequest', array(
                     new Reference('request', ContainerInterface::NULL_ON_INVALID_REFERENCE, false)
                 ))

EventListener/RequestAwareListener.php

@@ -15,7 +15,7 @@ translated content.
 
 ## Requirements
 
-* Symfony 2.2.x
+* Symfony 2.3+
 
 
 ## Documentation

README.md

@@ -8,7 +8,6 @@
         <parameter key="cmf_core.persistence.phpcr.manager_name">null</parameter>
         <parameter key="cmf_core.twig_extension.class">Symfony\Cmf\Bundle\CoreBundle\Twig\Extension\CmfExtension</parameter>
         <parameter key="cmf_core.templating.helper.class">Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\CmfHelper</parameter>
-        <parameter key="cmf_core.listener.request_aware.class">Symfony\Cmf\Bundle\CoreBundle\EventListener\RequestAwareListener</parameter>
     </parameters>
 
     <services>
@@ -24,9 +23,5 @@
             <argument>%cmf_core.persistence.phpcr.manager_name%</argument>
         </service>
 
-        <service id="cmf_core.listener.request_aware" class="%cmf_core.listener.request_aware.class%">
-            <tag name="kernel.event_subscriber"/>
-        </service>
-
     </services>
 </container>

Resources/config/services.xml

@@ -14,7 +14,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.3",
-        "symfony/framework-bundle": "~2.2"
+        "symfony/framework-bundle": "~2.3"
     },
     "require-dev": {
         "symfony-cmf/routing-bundle": "1.2.*",