From 07e73d8afce343df7194222f5b48e8a727665357 Mon Sep 17 00:00:00 2001 From: Marcel Marnitz Date: Sun, 5 Jan 2020 15:58:28 +0100 Subject: [PATCH] Add Symfony 5 and drop Symfony 2.8 --- composer.json | 16 ++++++++-------- .../DependencyInjection/Configuration.php | 10 ++++++++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index fcdde70..8f0817d 100644 --- a/composer.json +++ b/composer.json @@ -19,17 +19,17 @@ } }, "require": { - "php": ">=5.5.1", - "symfony/framework-bundle": "~2.7|~3.0|~4.0", - "symfony/dependency-injection": "~2.7|~3.0|~4.0", - "symfony/yaml": "~2.7|~3.0|~4.0", + "php": "^7.0", + "symfony/framework-bundle": "~3.0|~4.0|~5.0", + "symfony/dependency-injection": "~3.0|~4.0|~5.0", + "symfony/yaml": "~3.0|~4.0|~5.0", "lightsaml/lightsaml": "~1.1" }, "require-dev": { - "symfony/browser-kit": "~2.7|~3.0|~4.0", - "symfony/finder": "~2.7|~3.0|~4.0", - "symfony/filesystem": "~2.7|~3.0|~4.0", - "symfony/routing": "~2.7|~3.0|~4.0", + "symfony/browser-kit": "~3.0|~4.0|~5.0", + "symfony/finder": "~3.0|~4.0|~5.0", + "symfony/filesystem": "~3.0|~4.0|~5.0", + "symfony/routing": "~3.0|~4.0|~5.0", "phpunit/phpunit": "^5.7" }, "config": { diff --git a/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php b/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php index a4cc7d6..171f38a 100644 --- a/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php +++ b/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php @@ -23,8 +23,14 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $root = $treeBuilder->root('light_saml_symfony_bridge'); + $treeBuilder = new TreeBuilder('light_saml_symfony_bridge'); + + if (method_exists($treeBuilder, 'getRootNode')) { + $root = $treeBuilder->getRootNode(); + } else { + // BC layer for symfony/config 4.1 and older + $root = $treeBuilder->root('light_saml_symfony_bridge'); + } $root->children() ->arrayNode('own')