Fix form type tag BC layer

DependencyInjection/IvoryCKEditorExtension.php

@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Ivory CKEditor extension.
@@ -42,6 +43,12 @@ protected function loadInternal(array $config, ContainerBuilder $container)
             $this->registerStylesSet($config, $container);
             $this->registerTemplates($config, $container);
         }
+
+        if (Kernel::VERSION_ID < 30000) {
+            $container->getDefinition('ivory_ck_editor.form.type')
+                ->clearTag('form.type')
+                ->addTag('form.type', array('alias' => 'ckeditor'));
+        }
     }
 
     /**

IvoryCKEditorBundle.php

@@ -12,7 +12,6 @@
 namespace Ivory\CKEditorBundle;
 
 use Ivory\CKEditorBundle\DependencyInjection\Compiler\AssetsHelperCompilerPass;
-use Ivory\CKEditorBundle\DependencyInjection\Compiler\FormTypeCompilerPass;
 use Ivory\CKEditorBundle\DependencyInjection\Compiler\ResourceCompilerPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -32,7 +31,6 @@ public function build(ContainerBuilder $container)
     {
         $container
             ->addCompilerPass(new ResourceCompilerPass())
-            ->addCompilerPass(new AssetsHelperCompilerPass())
-            ->addCompilerPass(new FormTypeCompilerPass());
+            ->addCompilerPass(new AssetsHelperCompilerPass());
     }
 }

Tests/DependencyInjection/AbstractIvoryCKEditorExtensionTest.php

@@ -15,6 +15,7 @@
 use Ivory\CKEditorBundle\DependencyInjection\IvoryCKEditorExtension;
 use Ivory\CKEditorBundle\Tests\Fixtures\Extension\FrameworkExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Abstract Ivory CKEditor extension test.
@@ -80,7 +81,7 @@ protected function tearDown()
      */
     abstract protected function loadConfiguration(ContainerBuilder $container, $configuration);
 
-    public function testDefaultFormType()
+    public function testFormType()
     {
         $this->container->compile();
 
@@ -102,6 +103,19 @@ public function testDefaultFormType()
         $this->assertSame($this->container->get('ivory_ck_editor.template_manager'), $type->getTemplateManager());
     }
 
+    public function testFormTag()
+    {
+        $this->container->compile();
+
+        $tag = $this->container->getDefinition('ivory_ck_editor.form.type')->getTag('form.type');
+
+        if (Kernel::VERSION_ID < 30000) {
+            $this->assertSame(array(array('alias' => 'ckeditor')), $tag);
+        } else {
+            $this->assertSame(array(array()), $tag);
+        }
+    }
+
     public function testDisable()
     {
         $this->loadConfiguration($this->container, 'disable');

Tests/IvoryCKEditorBundleTest.php

@@ -47,12 +47,6 @@ public function testCompilerPasses()
             ->with($this->isInstanceOf('Ivory\CKEditorBundle\DependencyInjection\Compiler\AssetsHelperCompilerPass'))
             ->will($this->returnSelf());
 
-        $containerBuilder
-            ->expects($this->at(2))
-            ->method('addCompilerPass')
-            ->with($this->isInstanceOf('Ivory\CKEditorBundle\DependencyInjection\Compiler\FormTypeCompilerPass'))
-            ->will($this->returnSelf());
-
         $bundle = new IvoryCKEditorBundle();
         $bundle->build($containerBuilder);
     }