Merge pull request #63 from ruudk/phpunit

Upgraded phpunit to allow 5.7 and 6.0

Author: cmodijk

composer.json

@@ -32,7 +32,7 @@
         "symfony/monolog-bundle": "For logging messages"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0 || ~5.0",
+        "phpunit/phpunit": "^5.7 || ^6.0",
         "simple-bus/doctrine-orm-bridge": "~5.0",
         "doctrine/orm": "~2.3",
         "doctrine/doctrine-bundle": "~1.0",

tests/SymfonyBundle/DependencyInjection/Compiler/ConfigureMiddlewaresTest.php

@@ -10,7 +10,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Kernel;
 
-class ConfigureMiddlewaresTest extends \PHPUnit_Framework_TestCase
+class ConfigureMiddlewaresTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ContainerBuilder

tests/bootstrap.php

@@ -5,3 +5,10 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 AnnotationRegistry::registerLoader('class_exists');
+
+// Polyfill PHPUnit 6.0 both ways
+if (!class_exists('\PHPUnit\Framework\TestCase', true)) {
+    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+} elseif (!class_exists('\PHPUnit_Framework_TestCase', true)) {
+    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
+}