Merge baa8588 into 78dcab7

FriendsOfSymfony · Dec 10, 2018 · e2b6f90 · e2b6f90
2 parents 78dcab7 + baa8588
commit e2b6f90
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,10 @@ matrix:
           env: STABILITY="dev"
 
         - php: 7.1
-          env: TARGET=phpstan LEVEL=7
+          env:
+            - COMPOSER_MEMORY_LIMIT=-1
+            - DEPENDENCIES="symfony/dependency-injection:^4.2"
+            - TARGET=phpstan LEVEL=7
 
         - php: '7.2'
           env: PHPUNIT_FLAGS="--group=proxy"

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -24,8 +24,14 @@ final class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = $this->createTreeBuilder();
-        $treeBuilder
-            ->root('fos_ck_editor')
+        if (method_exists($treeBuilder, 'getRootNode')) {
+            $rootNode = $treeBuilder->getRootNode();
+        } else {
+            // BC layer for symfony/config 4.1 and older
+            $rootNode = $treeBuilder->root('fos_ck_editor');
+        }
+
+        $rootNode
             ->children()
                 ->booleanNode('enable')->defaultTrue()->end()
                 ->booleanNode('async')->defaultFalse()->end()
@@ -160,6 +166,6 @@ private function createNode(string $name): ArrayNodeDefinition
 
     private function createTreeBuilder(): TreeBuilder
     {
-        return new TreeBuilder();
+        return new TreeBuilder('fos_ck_editor');
     }
 }