introduce fos_ckeditor

Author: ElectricMaxxx

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
-1.0.0 (unreleased)
+2.0.0 (unreleased)
 ------------------
 
+* **2019-01-29**: [BC-BREAK] Replace IvoryCkEditor by FOSCkEditor.
+    Follow the migration Guide at: https://symfony.com/doc/master/bundles/FOSCKEditorBundle/migration.html
+
+1.0.0
+-----

composer.json

@@ -37,17 +37,19 @@
         "matthiasnoback/symfony-dependency-injection-test": "^1.1",
         "matthiasnoback/symfony-config-test": "^2.1",
         "burgov/key-value-form-bundle": "^1.0",
-        "symfony/asset": "^3.4 || ^4.0",
-        "symfony/browser-kit": "^3.4 || ^4.0",
-        "symfony/css-selector": "^3.4 || ^4.0",
-        "friendsofsymfony/ckeditor-bundle": "^3.4 || ^4.0"
+        "friendsofsymfony/ckeditor-bundle": "^1.0",
+        "sebastian/environment": "^1.3.4",
+        "sebastian/exporter": "^2.0.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"
     },
     "suggest": {
         "symfony-cmf/routing-bundle": "To make use of the alternate locale provider.",
         "doctrine/phpcr-bundle": "To persist the metadata in PHPCR ODM documents",
         "doctrine/doctrine-bundle": "To persist the metadata in ORM entities",
         "doctrine/orm": "To persist the metadata in ORM entities, ~2.4",
-        "friendsofsymfony/ckeditor-bundle": "To have CkEditor support on textareas."
+        "friendsofsymfony/ckeditor-bundl": "To have CkEditor support on textareas."
     },
     "autoload": {
         "psr-4": {
@@ -61,11 +63,16 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
         }
     },
+<<<<<<< HEAD
     "conflict": {
         "sebastian/environment": "<1.3.4",
         "sebastian/exporter": "<2.0.0"
     }
+=======
+    "minimum-stability": "dev",
+    "prefer-stable": true
+>>>>>>> 91dc9a3... introduce fos_ckeditor
 }

src/Admin/Content/StaticContentAdmin.php

@@ -40,7 +40,11 @@ public function getExportFormats()
     /**
      * Set configuration for CKEditorType.
      *
+<<<<<<< HEAD
      * Documentation: https://symfony.com/doc/master/bundles/FOSCKEditorBundle/index.html
+=======
+     * Documentation: https://symfony.com/doc/master/bundles/FOSCKEditorBundle/usage/config.html
+>>>>>>> 91dc9a3... introduce fos_ckeditor
      *
      * @param array $config configuration for CKEditorType
      */

src/DependencyInjection/Factory/ContentAdminFactory.php

@@ -62,15 +62,25 @@ public function create(array $config, ContainerBuilder $container, XmlFileLoader
     {
         $loader->load('content.xml');
 
+<<<<<<< HEAD
         $message = 'CKEditorBundle integration was explicitely enabled, but the bundle is not available.';
+=======
+        $message = 'FOSCKEditorBundle integration was explicitely enabled, but the bundle is not available.';
+>>>>>>> 91dc9a3... introduce fos_ckeditor
         if (class_exists(FOSCKEditorBundle::class)) {
             $message .= ' (did you forget to register the bundle in the AppKernel?)';
         }
 
         $ckeditorConfig = [];
+<<<<<<< HEAD
         if ($this->isConfigEnabledAuto($container, $config['fos_ckeditor']['enabled'], 'CKEditorBundle', $message)) {
             if (!isset($config['fos_ckeditor']['config_name'])) {
                 throw new InvalidConfigurationException('The cmf_sonata_phpcr_admin_integration.bundles.content.fos_ckeditor.config_name setting has to be defined when CKEditorBundle integration is enabled.');
+=======
+        if ($this->isConfigEnabledAuto($container, $config['fos_ckeditor']['enabled'], 'FOSCKEditorBundle', $message)) {
+            if (!isset($config['fos_ckeditor']['config_name'])) {
+                throw new InvalidConfigurationException('The cmf_sonata_phpcr_admin_integration.bundles.content.fos_ckeditor.config_name setting has to be defined when FOSCKEditorBundle integration is enabled.');
+>>>>>>> 91dc9a3... introduce fos_ckeditor
             }
 
             unset($config['fos_ckeditor']['enabled']);

tests/Fixtures/App/config/cmf_sonata_admin_integration.yml

@@ -36,6 +36,8 @@ cmf_routing:
 
 twig:
     exception_controller: cmf_seo.error.suggestion_provider.controller:listAction
+    form_themes:
+        - '@FOSCKEditor/Form/ckeditor_widget.html.twig'
 
 cmf_core:
     persistence:

tests/Unit/DependencyInjection/Factory/ContentAdminFactoryTest.php

@@ -33,13 +33,21 @@ protected function setUp()
     {
         $this->factory = new ContentAdminFactory();
         $this->container = new ContainerBuilder();
+<<<<<<< HEAD
         $this->container->setParameter('kernel.bundles', ['CKEditorBundle' => true]);
+=======
+        $this->container->setParameter('kernel.bundles', ['FOSCKEditorBundle' => true]);
+>>>>>>> 91dc9a3... introduce fos_ckeditor
         $this->fileLoader = $this->createMock(XmlFileLoader::class);
     }
 
     /**
      * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+<<<<<<< HEAD
      * @expectedExceptionMessage config_name setting has to be defined when CKEditorBundle integration is enabled
+=======
+     * @expectedExceptionMessage config_name setting has to be defined when FOSCKEditorBundle integration is enabled
+>>>>>>> 91dc9a3... introduce fos_ckeditor
      */
     public function testInvalidCKEditorEnabledWithoutConfigName()
     {