Merge pull request #4 from mihaichitic/2.x

Updates for new versions of Symfony and Doctrine
innobyte · Jan 17, 2022 · f62e825 · f62e825
2 parents 5737820 + 9386b5b
commit f62e825
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -11,3 +11,6 @@ services:
     # shorthand name
     innobyte_token:
         alias: innobyte_token.token
+
+    Innobyte\TokenBundle\Service\TokenService:
+        alias: innobyte_token.token
diff --git a/composer.json b/composer.json
@@ -11,8 +11,10 @@
     },
     "require": {
         "php": ">=5.5.0",
-        "symfony/symfony": ">=2.7",
-        "doctrine/doctrine-bundle": "~1.4"
+        "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": {
         "psr-0": { "Innobyte\\TokenBundle": "" }
@@ -25,6 +27,6 @@
             "email": "sorin.dumitrescu@innobyte.com"
         }
     ],
-    "version": "2.1.1",
+    "version": "2.1.2",
     "minimum-stability": "dev"
 }