Merge 1c0042c into 78dcab7

FriendsOfSymfony · Dec 15, 2018 · 9518347 · 9518347
2 parents 78dcab7 + 1c0042c
commit 9518347
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,10 @@ matrix:
     include:
           # Minimum supported dependencies with the oldest supported PHP version
         - php: 7.1
-          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
+          env:
+            - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
+            - SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
+            - SYMFONY_PHPUNIT_VERSION="5.7.26"
 
           # Coverage
         - php: 7.1
@@ -37,10 +40,14 @@ matrix:
           env: TARGET=docs
 
         - php: 7.2
-          env: STABILITY="dev"
+          env:
+            - STABILITY="dev"
+            - SYMFONY_PHPUNIT_VERSION="6.5"
 
         - php: 7.1
-          env: TARGET=phpstan LEVEL=7
+          env:
+            - DEPENDENCIES="symfony/dependency-injection:^4.2"
+            - TARGET=phpstan LEVEL=7
 
         - php: '7.2'
           env: PHPUNIT_FLAGS="--group=proxy"

diff --git a/composer.json b/composer.json
@@ -42,9 +42,8 @@
         "friendsofphp/php-cs-fixer": "^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "^1.0 || ^2.0",
         "phpunit/phpunit": "^6.0",
-        "sensio/distribution-bundle": "^3.0.12 || ^4.0 || ^5.0",
         "symfony/console": "^3.4 || ^4.0",
-        "symfony/phpunit-bridge": "^4.0",
+        "symfony/phpunit-bridge": "^4.1",
         "symfony/yaml": "^3.4 || ^4.0"
     },
     "suggest": {

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -23,9 +23,16 @@ final class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = $this->createTreeBuilder();
-        $treeBuilder
-            ->root('fos_ck_editor')
+        if (\method_exists(TreeBuilder::class, 'getRootNode')) {
+            $treeBuilder = new TreeBuilder('fos_ck_editor');
+            $rootNode = $treeBuilder->getRootNode();
+        } else {
+            // BC layer for symfony/config 4.1 and older
+            $treeBuilder = new TreeBuilder();
+            $rootNode = $treeBuilder->root('fos_ck_editor');
+        }
+
+        $rootNode
             ->children()
                 ->booleanNode('enable')->defaultTrue()->end()
                 ->booleanNode('async')->defaultFalse()->end()
@@ -151,15 +158,17 @@ private function createPrototypeNode(string $name): ArrayNodeDefinition
 
     private function createNode(string $name): ArrayNodeDefinition
     {
-        $node = $this->createTreeBuilder()->root($name);
+        if (\method_exists(TreeBuilder::class, 'getRootNode')) {
+            $treeBuilder = new TreeBuilder($name);
+            $node = $treeBuilder->getRootNode();
+        } else {
+            // BC layer for symfony/config 4.1 and older
+            $treeBuilder = new TreeBuilder();
+            $node = $treeBuilder->root($name);
+        }
 
         \assert($node instanceof ArrayNodeDefinition);
 
         return $node;
     }
-
-    private function createTreeBuilder(): TreeBuilder
-    {
-        return new TreeBuilder();
-    }
 }