Merge pull request #2671 from XWB/phpunit

Allow PHPUnit 6

Author: XWB

Tests/Services/EmailEncryptionTest.php

@@ -12,10 +12,11 @@
 namespace FOS\UserBundle\Tests\Util;
 
 use FOS\UserBundle\Services\EmailConfirmation\EmailEncryption;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-class EmailEncryptionTest extends \PHPUnit_Framework_TestCase
+class EmailEncryptionTest extends TestCase
 {
     /** @var ValidatorInterface */
     private $emailValidator;

Tests/Services/EmailUpdateConfirmationTest.php

@@ -16,13 +16,14 @@
 use FOS\UserBundle\Services\EmailConfirmation\EmailEncryption;
 use FOS\UserBundle\Services\EmailConfirmation\EmailUpdateConfirmation;
 use FOS\UserBundle\Util\TokenGenerator;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-class EmailUpdateConfirmationTest extends \PHPUnit_Framework_TestCase
+class EmailUpdateConfirmationTest extends TestCase
 {
     /** @var ExpressionFunctionProviderInterface */
     private $provider;

composer.json

@@ -36,7 +36,7 @@
         "symfony/console": "^2.8 || ^3.0 || ^4.0",
         "symfony/phpunit-bridge": "^2.8 || ^3.0 || ^4.0",
         "symfony/yaml": "^2.8 || ^3.0 || ^4.0",
-        "phpunit/phpunit": "^4.8.35|^5.4.3"
+        "phpunit/phpunit": "^4.8.35|^5.7.11|^6.5"
     },
     "conflict": {
         "doctrine/doctrine-bundle": "<1.3",