fixed sf version compare

liip · Jun 19, 2012 · 547628d · 547628d · renevall · Jun 20, 2012
1 parent 2825a61
commit 547628d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/DependencyInjection/LiipImagineExtension.php b/DependencyInjection/LiipImagineExtension.php
@@ -45,7 +45,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('liip_imagine.controller_action', $config['controller_action']);
 
-        if (version_compare(LiipImagineBundle::getSymfonyVersion(Kernel::VERSION), '2.1.0', '<')) {
+        if ('2' == Kernel::MAJOR_VERSION && '0' == Kernel::MINOR_VERSION) {
             $container->removeDefinition('liip_imagine.cache.clearer');
         }
     }

diff --git a/LiipImagineBundle.php b/LiipImagineBundle.php
@@ -18,18 +18,4 @@ 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));
-    }
 }
diff --git a/Tests/DependencyInjection/LiipImagineExtensionTest.php b/Tests/DependencyInjection/LiipImagineExtensionTest.php
@@ -52,7 +52,7 @@ public function testCacheClearerRegistration()
     {
         $this->createFullConfiguration();
 
-        if (version_compare(LiipImagineBundle::getSymfonyVersion(Kernel::VERSION), '2.1.0', '<')) {
+        if ('2' == Kernel::MAJOR_VERSION && '0' == Kernel::MINOR_VERSION) {
             $this->assertFalse($this->containerBuilder->hasDefinition('liip_imagine.cache.clearer'));
         } else {
             $this->assertTrue($this->containerBuilder->hasDefinition('liip_imagine.cache.clearer'));