Fixed dependencies range for doctrine & symfony (#40)

Author: yann-eugone

.travis.yml

@@ -2,19 +2,18 @@ language: php
 
 php:
   - 7.0
-  - 7.1
-  - 7.2
+  - 7.4
 
 env:
   - SYMFONY_VERSION="2.7.*"
   - SYMFONY_VERSION="2.8.*"
   - SYMFONY_VERSION="3.4.*"
-  - SYMFONY_VERSION="4.0.*"
+  - SYMFONY_VERSION="4.4.*"
 
 matrix:
   exclude:
     - php: 7.0
-      env: SYMFONY_VERSION="4.0.*" # Symfony >= 4.0 PHP requirement is ^7.1.3
+      env: SYMFONY_VERSION="4.4.*" # Symfony >= 4.0 PHP requirement is ^7.1.3
 
 sudo: false
 
@@ -24,7 +23,7 @@ cache:
 
 before_install:
   - composer selfupdate
-  - if [ "$SYMFONY_VERSION" = "3.4.*" ] || [ "$SYMFONY_VERSION" = "4.0.*" ]; then rm -f phpunit.xml; cp phpunit.sf4.xml.dist phpunit.xml; fi
+  - if [ "$SYMFONY_VERSION" = "3.4.*" ] || [ "$SYMFONY_VERSION" = "4.4.*" ]; then rm -f phpunit.xml; cp phpunit.sf4.xml.dist phpunit.xml; fi
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/framework-bundle:${SYMFONY_VERSION}" --no-update; fi;
 
 install: COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --prefer-dist --no-interaction

DependencyInjection/Configuration.php

@@ -5,6 +5,7 @@
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * @author Yann Eugoné <eugone.yann@gmail.com>
@@ -16,8 +17,13 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $builder = new TreeBuilder();
-        $root = $builder->root('yokai_security_token');
+        if (version_compare(Kernel::VERSION, '4.2') >= 0) {
+            $builder = new TreeBuilder('yokai_security_token');
+            $root = $builder->getRootNode();
+        } else {
+            $builder = new TreeBuilder();
+            $root = $builder->root('yokai_security_token');
+        }
 
         $root->addDefaultsIfNotSet();
         $root
@@ -35,8 +41,13 @@ public function getConfigTreeBuilder()
      */
     private function getTokensNode()
     {
-        $builder = new TreeBuilder();
-        $node = $builder->root('tokens');
+        if (version_compare(Kernel::VERSION, '4.2') >= 0) {
+            $builder = new TreeBuilder('tokens');
+            $node = $builder->getRootNode();
+        } else {
+            $builder = new TreeBuilder();
+            $node = $builder->root('tokens');
+        }
 
         $node
             ->useAttributeAsKey('purpose')
@@ -69,8 +80,13 @@ private function getTokensNode()
      */
     private function getServicesNode()
     {
-        $builder = new TreeBuilder();
-        $node = $builder->root('services');
+        if (version_compare(Kernel::VERSION, '4.2') >= 0) {
+            $builder = new TreeBuilder('services');
+            $node = $builder->getRootNode();
+        } else {
+            $builder = new TreeBuilder();
+            $node = $builder->root('services');
+        }
 
         $node->addDefaultsIfNotSet();
         $node

Manager/DoctrineUserManager.php

@@ -2,8 +2,8 @@
 
 namespace Yokai\SecurityTokenBundle\Manager;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectManager;
 use Doctrine\Common\Util\ClassUtils;
 
 /**

Resources/doc/3-usage.md

@@ -9,9 +9,9 @@ The following example is about allowing unauthenticated user to recover a lost p
 namespace AppBundle\Controller;
 
 use App\Entity\User;
-use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\Common\Persistence\ObjectRepository;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectRepository;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

Tests/DependencyInjection/DependencyInjectionTest.php

@@ -2,8 +2,8 @@
 
 namespace Yokai\SecurityTokenBundle\Tests\DependencyInjection;
 
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Prophecy\Prophecy\ProphecySubjectInterface;

Tests/Manager/DoctrineUserManagerTest.php

@@ -2,9 +2,9 @@
 
 namespace Yokai\SecurityTokenBundle\Tests\Manager;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\ObjectManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\Prophecy\ObjectProphecy;
 use Yokai\SecurityTokenBundle\Manager\DoctrineUserManager;

composer.json

@@ -11,8 +11,9 @@
     "require": {
         "php": ">=7.0",
         "ext-openssl": "*",
-        "symfony/framework-bundle": "~2.7|~3.0|~4.0",
+        "symfony/framework-bundle": "^2.7|^3.0|^4.0",
         "doctrine/orm": "^2.5",
+        "doctrine/persistence": "^2.0",
         "doctrine/doctrine-bundle": ">=1.6",
         "yokai/dependency-injection": "~1.0"
     },