Merge 03fa03e into 2150175

lightSAML · Jan 5, 2020 · f370850 · f370850
2 parents 2150175 + 03fa03e
commit f370850
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
     },
     "require": {
         "php": ">=5.6",
-        "symfony/framework-bundle": "~2.7|~3.0|~4.0",
-        "symfony/security-bundle": "~2.7|~3.0|~4.0",
+        "symfony/framework-bundle": "~2.7|~3.0|~4.0|~5.0",
+        "symfony/security-bundle": "~2.7|~3.0|~4.0|~5.0",
         "lightsaml/symfony-bridge": "~1.3"
     },
     "require-dev": {

diff --git a/src/LightSaml/SpBundle/DependencyInjection/Configuration.php b/src/LightSaml/SpBundle/DependencyInjection/Configuration.php
@@ -25,8 +25,14 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $root = $treeBuilder->root('light_saml_sp');
+        $treeBuilder = new TreeBuilder('light_saml_sp');
+
+        if (method_exists($treeBuilder, 'getRootNode')) {
+            $root = $treeBuilder->getRootNode();
+        } else {
+            // BC layer for symfony/config 4.1 and older
+            $root = $treeBuilder->root('light_saml_sp');
+        }
 
         $root
             ->children()