From 084c62f2e4b47a0bd31e2e372a98c04e6cc89d52 Mon Sep 17 00:00:00 2001 From: Mihai Chitic Date: Tue, 11 Jan 2022 16:29:35 +0200 Subject: [PATCH 1/3] add support for doctrine-bundle ~2.0 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7cc4d8f..c079cf4 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "require": { "php": ">=5.5.0", "symfony/symfony": ">=2.7", - "doctrine/doctrine-bundle": "~1.4" + "doctrine/doctrine-bundle": "~1.4 | ~2.0" }, "autoload": { "psr-0": { "Innobyte\\TokenBundle": "" } @@ -25,6 +25,6 @@ "email": "sorin.dumitrescu@innobyte.com" } ], - "version": "2.1.1", + "version": "2.1.2", "minimum-stability": "dev" } From f8918824d6023b9632dca1d6c1f5b6e3db950a83 Mon Sep 17 00:00:00 2001 From: Mihai Chitic Date: Tue, 11 Jan 2022 16:59:26 +0200 Subject: [PATCH 2/3] require specific symfony components --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c079cf4..e5bb235 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,9 @@ }, "require": { "php": ">=5.5.0", - "symfony/symfony": ">=2.7", + "symfony/config": "~2.3|~3.0|~4.0|~5.0", + "symfony/dependency-injection": "~2.3|~3.0|~4.0|~5.0", + "symfony/http-kernel": "~2.3|~3.0|~4.0|~5.0", "doctrine/doctrine-bundle": "~1.4 | ~2.0" }, "autoload": { From 9386b5b9ecf6087e48e5dcb97c93279367c72e1a Mon Sep 17 00:00:00 2001 From: Mihai Chitic Date: Tue, 11 Jan 2022 19:09:51 +0200 Subject: [PATCH 3/3] update Configuration to support many symfony versions; add service alias to work with autowiring --- DependencyInjection/Configuration.php | 9 +++++++-- Resources/config/services.yml | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 8ae96bb..5a619a8 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -22,8 +22,13 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('innobyte_token'); + if (method_exists(TreeBuilder::class, 'getRootNode')) { + $treeBuilder = new TreeBuilder('innobyte_token'); + $rootNode = $treeBuilder->getRootNode(); + } else { + $treeBuilder = new TreeBuilder(); + $rootNode = $treeBuilder->root('innobyte_token'); + } $rootNode ->children() diff --git a/Resources/config/services.yml b/Resources/config/services.yml index b7d438b..6917b91 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -11,3 +11,6 @@ services: # shorthand name innobyte_token: alias: innobyte_token.token + + Innobyte\TokenBundle\Service\TokenService: + alias: innobyte_token.token