merged branch 2.1.x into master

craue · Apr 12, 2017 · e879f1e · e879f1e
2 parents 3c7fc04 + 2868c74
commit e879f1e
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 13 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/Extension/FormFlowFormExtensionTest.php b/Tests/Form/Extension/FormFlowFormExtensionTest.php
@@ -3,6 +3,7 @@
 namespace Craue\FormFlowBundle\Tests\Form\Extension;
 
 use Craue\FormFlowBundle\Form\Extension\FormFlowFormExtension;
+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
  */
-class FormFlowFormExtensionTest extends \PHPUnit_Framework_TestCase {
+class FormFlowFormExtensionTest extends TestCase {
 
 	public function testGetExtendedType() {
 		$extension = new FormFlowFormExtension();

diff --git a/Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php b/Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php
@@ -3,6 +3,7 @@
 namespace Craue\FormFlowBundle\Tests\Form\Extension;
 
 use Craue\FormFlowBundle\Form\Extension\FormFlowHiddenFieldExtension;
+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
  */
-class FormFlowHiddenFieldExtensionTest extends \PHPUnit_Framework_TestCase {
+class FormFlowHiddenFieldExtensionTest extends TestCase {
 
 	public function testGetExtendedType() {
 		$extension = new FormFlowHiddenFieldExtension();

diff --git a/Tests/Form/StepBcTest.php b/Tests/Form/StepBcTest.php
@@ -3,6 +3,7 @@
 namespace Craue\FormFlowBundle\Tests\Form;
 
 use Craue\FormFlowBundle\Form\Step;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for BC.
@@ -14,7 +15,7 @@
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-class StepBcTest extends \PHPUnit_Framework_TestCase {
+class StepBcTest extends TestCase {
 
 	/**
 	 * @expectedDeprecation Step config option "type" is deprecated since version 3.0. Use "form_type" instead.

diff --git a/Tests/Resources/TranslationsTest.php b/Tests/Resources/TranslationsTest.php
@@ -2,6 +2,7 @@
 
 namespace Craue\FormFlowBundle\Tests\Resources;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\YamlFileLoader;
 use Symfony\Component\Yaml\Yaml;
 
@@ -12,7 +13,7 @@
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-class TranslationsTest extends \PHPUnit_Framework_TestCase {
+class TranslationsTest extends TestCase {
 
 	protected static $defaultLocale = 'en';
 

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/Tests/Storage/SerializableFileTest.php b/Tests/Storage/SerializableFileTest.php
@@ -4,6 +4,7 @@
 
 use Craue\FormFlowBundle\Storage\SerializableFile;
 use Craue\FormFlowBundle\Util\TempFileUtil;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -14,7 +15,7 @@
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-class SerializableFileTest extends \PHPUnit_Framework_TestCase {
+class SerializableFileTest extends TestCase {
 
 	const DOCUMENT = '/../Fixtures/some-text.txt';
 

diff --git a/Tests/Storage/UserSessionStorageKeyGeneratorTest.php b/Tests/Storage/UserSessionStorageKeyGeneratorTest.php
@@ -4,6 +4,7 @@
 
 use Craue\FormFlowBundle\Storage\StorageKeyGeneratorInterface;
 use Craue\FormFlowBundle\Storage\UserSessionStorageKeyGenerator;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
@@ -21,7 +22,7 @@
  * @copyright 2011-2017 Christian Raue
  * @license http://opensource.org/licenses/mit-license.php MIT License
  */
-class UserSessionStorageKeyGeneratorTest extends \PHPUnit_Framework_TestCase {
+class UserSessionStorageKeyGeneratorTest extends TestCase {
 
 	/**
 	 * @var StorageKeyGeneratorInterface

diff --git a/Tests/UnitTestCase.php b/Tests/UnitTestCase.php
@@ -6,13 +6,14 @@
 use Craue\FormFlowBundle\Form\FormFlowInterface;
 use Craue\FormFlowBundle\Form\StepInterface;
 use Craue\FormFlowBundle\Storage\DataManagerInterface;
+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
  */
-abstract class UnitTestCase extends \PHPUnit_Framework_TestCase {
+abstract class UnitTestCase extends TestCase {
 
 	/**
 	 * @return \PHPUnit_Framework_MockObject_MockObject|FormFlow

diff --git a/Tests/Util/StringUtilTest.php b/Tests/Util/StringUtilTest.php
@@ -3,6 +3,7 @@
 namespace Craue\FormFlowBundle\Tests\Util;
 
 use Craue\FormFlowBundle\Util\StringUtil;
+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
  */
-class StringUtilTest extends \PHPUnit_Framework_TestCase {
+class StringUtilTest extends TestCase {
 
 	public function testGenerateRandomString() {
 		$this->assertEquals(1000, strlen(StringUtil::generateRandomString(1000)));

diff --git a/composer.json b/composer.json
@@ -25,9 +25,9 @@
 	},
 	"require-dev": {
 		"doctrine/doctrine-bundle": "~1.0",
-		"phpunit/phpunit": "~4.1|~5.0",
+		"phpunit/phpunit": "^4.8.35|~5.7|~6.0",
 		"sensio/framework-extra-bundle": "~3.0",
-		"symfony/phpunit-bridge": "~3.2",
+		"symfony/phpunit-bridge": "^3.2.5|~3.3@dev",
 		"symfony/symfony": "~2.7|~3.0"
 	},
 	"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">