Merge remote-tracking branch 'origin/4.x'

sonata-project · Aug 20, 2020 · 01138d0 · 01138d0
2 parents 41258ae + bc09c4f
commit 01138d0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^7.2",
-        "friendsofsymfony/ckeditor-bundle": "^1.0",
+        "friendsofsymfony/ckeditor-bundle": "^1.0 || ^2.0",
         "knplabs/knp-markdown-bundle": "^1.7",
         "psr/log": "^1.0",
         "sonata-project/block-bundle": "^3.16.1",

diff --git a/tests/Form/Type/FormatterTypeTest.php b/tests/Form/Type/FormatterTypeTest.php
@@ -159,7 +159,6 @@ public function testBuildFormWithDefaultFormatter(): void
         $formatters = ['text' => 'Text'];
 
         $choiceFormBuilder = $this->createMock(FormBuilderInterface::class);
-
         $choiceFormBuilder->expects($this->once())
             ->method('getOption')
             ->with('choices')