move to FOSCKEditor-Bundle

Author: ElectricMaxxx

composer.json

@@ -37,10 +37,10 @@
         "matthiasnoback/symfony-dependency-injection-test": "^1.1",
         "matthiasnoback/symfony-config-test": "^2.1",
         "burgov/key-value-form-bundle": "^1.0",
-        "egeloen/ckeditor-bundle": "^4.0",
         "symfony/asset": "^2.8 || ^3.3 || ^4.0",
         "symfony/browser-kit": "^2.8 || ^3.3 || ^4.0",
-        "symfony/css-selector": "^2.8 || ^3.3 || ^4.0"
+        "symfony/css-selector": "^2.8 || ^3.3 || ^4.0",
+        "friendsofsymfony/ckeditor-bundle": "^1.0"
     },
     "suggest": {
         "symfony-cmf/routing-bundle": "To make use of the alternate locale provider.",

src/Admin/Content/StaticContentAdmin.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Content;
 
-use Ivory\CKEditorBundle\Form\Type\CKEditorType;
+use FOS\CKEditorBundle\Form\Type\CKEditorType;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;

src/DependencyInjection/Factory/ContentAdminFactory.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\DependencyInjection\Factory;
 
-use Ivory\CKEditorBundle\IvoryCKEditorBundle;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -63,7 +62,7 @@ public function create(array $config, ContainerBuilder $container, XmlFileLoader
         $loader->load('content.xml');
 
         $message = 'IvoryCKEditorBundle integration was explicitely enabled, but the bundle is not available.';
-        if (class_exists(IvoryCKEditorBundle::class)) {
+        if (class_exists(FOSCKEditorBundle::class)) {
             $message .= ' (did you forget to register the bundle in the AppKernel?)';
         }
 

tests/Fixtures/App/config/bundles.php

@@ -27,11 +27,11 @@
     Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle::class => ['all' => true],
     Symfony\Cmf\Bundle\ContentBundle\CmfContentBundle::class => ['all' => true],
     JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
-    Ivory\CKEditorBundle\IvoryCKEditorBundle::class => ['all' => true],
     SonataBlockBundle::class => ['all' => true],
     SonataCoreBundle::class => ['all' => true],
     SonataAdminBundle::class => ['all' => true],
     KnpMenuBundle::class => ['all' => true],
     SonataDoctrinePHPCRAdminBundle::class => ['all' => true],
     CmfTreeBrowserBundle::class => ['all' => true],
+    \FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true],
 ];