Merge pull request #363 from symfony-cmf/enable_ckeditor

enable ckeditor again for static content admin

Author: ElectricMaxxx

.travis.yml

@@ -41,7 +41,7 @@ before_script:
   - bin/console doctrine:phpcr:workspace:create sandbox_test -e=test
   - bin/console doctrine:phpcr:repository:init -e=test
 
-script: phpunit
+script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

app/config/config.yml

@@ -136,7 +136,9 @@ cmf_sonata_phpcr_admin_integration:
         seo: ~
         menu: ~
         core: ~
-        content: ~
+        content:
+           ivory_ckeditor:
+              config_name: cmf_sonata_phpcr_admin_integration
         block:
             basepath: /cms/content
             menu_basepath: /cms/content
@@ -280,7 +282,7 @@ sonata_seo:
 
 ivory_ck_editor:
     configs:
-        cmf_content: { toolbar: standard }
+        cmf_sonata_phpcr_admin_integration: { toolbar: standard }
 
 sensio_framework_extra:
     router:  { annotations: true }

composer.json

@@ -41,7 +41,7 @@
         "doctrine/phpcr-odm": "^1.4",
 
         "sonata-project/cache-bundle": "^2.1",
-        "sonata-project/translation-bundle": "^2.0",
+        "sonata-project/translation-bundle": "2.1.0",
         "sonata-project/doctrine-phpcr-admin-bundle": "^2.0@dev",
 
         "jms/serializer-bundle": "^1.1",
@@ -54,7 +54,8 @@
     "require-dev": {
         "sensio/generator-bundle": "^3.0",
         "liip/functional-test-bundle": "^1.3",
-        "symfony-cmf/testing": "^2.0"
+        "symfony-cmf/testing": "^2.0",
+        "symfony/phpunit-bridge": "^3.2"
     },
     "minimum-stability": "RC",
     "prefer-stable": true,