added support for PHPUnit 6

craue · Apr 12, 2017 · 2868c74 · 2868c74
1 parent 0b24d7c
commit 2868c74
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/Tests/Exception/InvalidTypeExceptionTest.php b/Tests/Exception/InvalidTypeExceptionTest.php
@@ -3,13 +3,14 @@
 namespace Craue\FormFlowBundle\Tests\Exception;
 
 use Craue\FormFlowBundle\Exception\InvalidTypeException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-class InvalidTypeExceptionTest extends \PHPUnit_Framework_TestCase {
+class InvalidTypeExceptionTest extends TestCase {
 
 	/**
 	 * @dataProvider dataExceptionMessage

diff --git a/Tests/Form/FormFlowBcMethodsTest.php b/Tests/Form/FormFlowBcMethodsTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Craue\FormFlowBundle\Tests\Form;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for BC.
@@ -12,7 +13,7 @@
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-class FormFlowBcMethodsTest extends \PHPUnit_Framework_TestCase {
+class FormFlowBcMethodsTest extends TestCase {
 
 	/**
 	 * @expectedDeprecation Method Craue\FormFlowBundle\Form\FormFlow::getCurrentStep is deprecated since version 2.0. Use method getCurrentStepNumber instead.

diff --git a/Tests/Form/FormFlowTest.php b/Tests/Form/FormFlowTest.php
@@ -4,6 +4,7 @@
 
 use Craue\FormFlowBundle\Event\GetStepsEvent;
 use Craue\FormFlowBundle\Form\FormFlowEvents;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 /**
@@ -14,7 +15,7 @@
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-class FormFlowTest extends \PHPUnit_Framework_TestCase {
+class FormFlowTest extends TestCase {
 
 	public function testStepListener() {
 		$steps = array(

diff --git a/Tests/Form/StepTest.php b/Tests/Form/StepTest.php
@@ -4,6 +4,7 @@
 
 use Craue\FormFlowBundle\Form\FormFlowInterface;
 use Craue\FormFlowBundle\Form\Step;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group unit
@@ -12,7 +13,7 @@
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-class StepTest extends \PHPUnit_Framework_TestCase {
+class StepTest extends TestCase {
 
 	public function testCreateFromConfig() {
 		// TODO replace by `$this->createMock('\Craue\FormFlowBundle\Form\FormFlowInterface')` as soon as PHPUnit >= 5.4 is required

diff --git a/Tests/Storage/AbstractStorageTest.php b/Tests/Storage/AbstractStorageTest.php
@@ -3,6 +3,7 @@
 namespace Craue\FormFlowBundle\Tests\Storage;
 
 use Craue\FormFlowBundle\Storage\StorageInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group unit
@@ -11,7 +12,7 @@
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-abstract class AbstractStorageTest extends \PHPUnit_Framework_TestCase {
+abstract class AbstractStorageTest extends TestCase {
 
 	/**
 	 * @var StorageInterface

diff --git a/composer.json b/composer.json
@@ -22,9 +22,9 @@
 	},
 	"require-dev": {
 		"doctrine/common": "~2.3",
-		"phpunit/phpunit": "~4.1|~5.0",
+		"phpunit/phpunit": "^4.8.35|~5.7|~6.0",
 		"sensio/framework-extra-bundle": "~2.1|~3.0",
-		"symfony/phpunit-bridge": "~3.2",
+		"symfony/phpunit-bridge": "^3.2.5|~3.3@dev",
 		"symfony/symfony": "^2.1.3"
 	},
 	"minimum-stability": "stable",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <phpunit
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+		xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
 		backupGlobals="false"
 		bootstrap="Tests/bootstrap.php"
 		colors="true">