From d01c803806e34fb6d72673a3f46fff07d349c24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20F=C3=A9asson?= Date: Mon, 13 Jan 2020 17:27:30 +0100 Subject: [PATCH 1/3] updae for Symfony 5 --- composer.json | 16 ++++++++-------- .../DependencyInjection/Configuration.php | 8 ++++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index fcdde70..430f2c4 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.0", + "symfony/framework-bundle": "~2.7|~3.0|~4.0|~5.0", + "symfony/dependency-injection": "~2.7|~3.0|~4.0|~5.0", + "symfony/yaml": "~2.7|~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": "~2.7|~3.0|~4.0|~5.0", + "symfony/finder": "~2.7|~3.0|~4.0|~5.0", + "symfony/filesystem": "~2.7|~3.0|~4.0|~5.0", + "symfony/routing": "~2.7|~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..5e73c7d 100644 --- a/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php +++ b/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php @@ -23,8 +23,12 @@ 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 { + $root = $treeBuilder->root('light_saml_symfony_bridge'); + } $root->children() ->arrayNode('own') From f8c22a8cf7f2852337a8c7bca4e25ae9f5de8bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20F=C3=A9asson?= Date: Tue, 14 Jan 2020 08:48:37 +0100 Subject: [PATCH 2/3] change php version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 430f2c4..8f0b7da 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ } }, "require": { - "php": ">=7.0.0", + "php": ">=5.5.1", "symfony/framework-bundle": "~2.7|~3.0|~4.0|~5.0", "symfony/dependency-injection": "~2.7|~3.0|~4.0|~5.0", "symfony/yaml": "~2.7|~3.0|~4.0|~5.0", From dd91f2d0487bf118bcdc39c3487429258c91bac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20F=C3=A9asson?= Date: Thu, 23 Jan 2020 10:26:49 +0100 Subject: [PATCH 3/3] delete root function call --- .../DependencyInjection/Configuration.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php b/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php index 5e73c7d..28b62f2 100644 --- a/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php +++ b/src/LightSaml/SymfonyBridgeBundle/DependencyInjection/Configuration.php @@ -24,11 +24,7 @@ class Configuration implements ConfigurationInterface public function getConfigTreeBuilder() { $treeBuilder = new TreeBuilder('light_saml_symfony_bridge'); - if (method_exists($treeBuilder, 'getRootNode')) { - $root = $treeBuilder->getRootNode(); - } else { - $root = $treeBuilder->root('light_saml_symfony_bridge'); - } + $root = $treeBuilder->getRootNode(); $root->children() ->arrayNode('own')