fixed #81 cache clearer only registered for sf2.1

DependencyInjection/LiipImagineExtension.php

@@ -3,12 +3,16 @@
 namespace Liip\ImagineBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Reference;
 
+use Liip\ImagineBundle\LiipImagineBundle;
+
 class LiipImagineExtension extends Extension
 {
     /**
@@ -40,5 +44,9 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('liip_imagine.data.loader.default', $config['data_loader']);
 
         $container->setParameter('liip_imagine.controller_action', $config['controller_action']);
+
+        if (version_compare(LiipImagineBundle::getSymfonyVersion(Kernel::VERSION), '2.1.0', '<')) {
+            $container->removeDefinition('liip_imagine.cache.clearer');
+        }
     }
 }

LiipImagineBundle.php

@@ -18,4 +18,18 @@ public function build(ContainerBuilder $container)
 
         $container->addCompilerPass(new LoadersCompilerPass());
     }
+
+    /**
+     * Returns a cleaned version number
+     *
+     * @param string $version
+     * @return string
+     */
+    public static function getSymfonyVersion($version)
+    {
+        return implode('.', array_slice(array_map(function($val)
+        {
+            return (int)$val;
+        }, explode('.', $version)), 0, 3));
+    }
 }

Tests/DependencyInjection/LiipImagineExtensionTest.php

@@ -12,6 +12,8 @@
 namespace Liip\ImagineBundle\Tests\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel;
+use Liip\ImagineBundle\LiipImagineBundle;
 use Liip\ImagineBundle\DependencyInjection\LiipImagineExtension;
 use Symfony\Component\Yaml\Parser;
 use Symfony\Component\DependencyInjection\Reference;
@@ -46,6 +48,21 @@ public function testLoadWithDefaults()
         );
     }
 
+    public function testCacheClearerRegistration()
+    {
+        $this->createFullConfiguration();
+
+        if (version_compare(LiipImagineBundle::getSymfonyVersion(Kernel::VERSION), '2.1.0', '<')) {
+            $this->assertFalse($this->containerBuilder->hasDefinition('liip_imagine.cache.clearer'));
+        } else {
+            $this->assertTrue($this->containerBuilder->hasDefinition('liip_imagine.cache.clearer'));
+
+            $definition = $this->containerBuilder->getDefinition('liip_imagine.cache.clearer');
+            $definition->hasTag('kernel.cache_clearer');
+            $this->assertCount(2, $definition->getArguments());
+        }
+    }
+
     /**
      * @return ContainerBuilder
      */

composer.json

@@ -15,7 +15,8 @@
     "require": {
         "php":                      ">=5.3.2",
         "imagine/Imagine":          "<=0.2.8",
-        "symfony/framework-bundle": ">=2.0,<2.2-dev"
+        "symfony/framework-bundle": ">=2.0,<2.2-dev",
+        "symfony/yaml":             ">=2.0,<2.2-dev"
     },
 
     "require-dev": {