Merge pull request jsonrainbow#466 from gabriel-caruso/phpunit

bighappyface · erayd · commit ca697a0b91e3 · 2018-02-14T14:29:46.000+13:00
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
     "require-dev": {
         "json-schema/JSON-Schema-Test-Suite": "1.2.0",
         "friendsofphp/php-cs-fixer": "^2.1",
-        "phpunit/phpunit": "^4.8.22"
+        "phpunit/phpunit": "^4.8.35"
     },
     "autoload": {
         "psr-4": { "JsonSchema\\": "src/JsonSchema/" }
diff --git a/tests/Constraints/FactoryTest.php b/tests/Constraints/FactoryTest.php
@@ -12,7 +12,7 @@
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Constraints\Factory;
 use JsonSchema\Entity\JsonPointer;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class MyBadConstraint
diff --git a/tests/Constraints/PointerTest.php b/tests/Constraints/PointerTest.php
@@ -10,8 +10,9 @@
 namespace JsonSchema\Tests\Constraints;
 
 use JsonSchema\Validator;
+use PHPUnit\Framework\TestCase;
 
-class PointerTest extends \PHPUnit_Framework_TestCase
+class PointerTest extends TestCase
 {
     protected $validateSchema = true;
 
diff --git a/tests/Constraints/SchemaValidationTest.php b/tests/Constraints/SchemaValidationTest.php
@@ -11,8 +11,9 @@
 
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Validator;
+use PHPUnit\Framework\TestCase;
 
-class SchemaValidationTest extends \PHPUnit_Framework_TestCase
+class SchemaValidationTest extends TestCase
 {
     protected $validateSchema = true;
 
diff --git a/tests/Constraints/TypeTest.php b/tests/Constraints/TypeTest.php
@@ -11,6 +11,7 @@
 
 use JsonSchema\Constraints\TypeCheck\LooseTypeCheck;
 use JsonSchema\Constraints\TypeConstraint;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class TypeTest
@@ -19,7 +20,7 @@
  *
  * @author hakre <https://github.com/hakre>
  */
-class TypeTest extends \PHPUnit_Framework_TestCase
+class TypeTest extends TestCase
 {
     /**
      * @see testIndefiniteArticleForTypeInTypeCheckErrorMessage
diff --git a/tests/Constraints/ValidationExceptionTest.php b/tests/Constraints/ValidationExceptionTest.php
@@ -12,8 +12,9 @@
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Exception\ValidationException;
 use JsonSchema\Validator;
+use PHPUnit\Framework\TestCase;
 
-class ValidationExceptionTest extends \PHPUnit_Framework_TestCase
+class ValidationExceptionTest extends TestCase
 {
     public function testValidationException()
     {
diff --git a/tests/Constraints/VeryBaseTestCase.php b/tests/Constraints/VeryBaseTestCase.php
@@ -9,12 +9,13 @@
 
 namespace JsonSchema\Tests\Constraints;
 
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 
 /**
  * @package JsonSchema\Tests\Constraints
  */
-abstract class VeryBaseTestCase extends \PHPUnit_Framework_TestCase
+abstract class VeryBaseTestCase extends TestCase
 {
     /** @var object */
     private $jsonSchemaDraft03;
diff --git a/tests/Entity/JsonPointerTest.php b/tests/Entity/JsonPointerTest.php
@@ -10,13 +10,14 @@
 namespace JsonSchema\Tests\Entity;
 
 use JsonSchema\Entity\JsonPointer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @package JsonSchema\Tests\Entity
  *
  * @author Joost Nijhuis <jnijhuis81@gmail.com>
  */
-class JsonPointerTest extends \PHPUnit_Framework_TestCase
+class JsonPointerTest extends TestCase
 {
     /**
      * @dataProvider getTestData
diff --git a/tests/Exception/InvalidArgumentExceptionTest.php b/tests/Exception/InvalidArgumentExceptionTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
 
-class InvalidArgumentExceptionTest extends \PHPUnit_Framework_TestCase
+class InvalidArgumentExceptionTest extends TestCase
 {
     public function testHierarchy()
     {
diff --git a/tests/Exception/InvalidSchemaMediaTypeExceptionTest.php b/tests/Exception/InvalidSchemaMediaTypeExceptionTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\InvalidSchemaMediaTypeException;
+use PHPUnit\Framework\TestCase;
 
-class InvalidSchemaMediaTypeExceptionTest extends \PHPUnit_Framework_TestCase
+class InvalidSchemaMediaTypeExceptionTest extends TestCase
 {
     public function testHierarchy()
     {
diff --git a/tests/Exception/InvalidSourceUriExceptionTest.php b/tests/Exception/InvalidSourceUriExceptionTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\InvalidSourceUriException;
+use PHPUnit\Framework\TestCase;
 
-class InvalidSourceUriExceptionTest extends \PHPUnit_Framework_TestCase
+class InvalidSourceUriExceptionTest extends TestCase
 {
     public function testHierarchy()
     {
diff --git a/tests/Exception/JsonDecodingExceptionTest.php b/tests/Exception/JsonDecodingExceptionTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\JsonDecodingException;
+use PHPUnit\Framework\TestCase;
 
-class JsonDecodingExceptionTest extends \PHPUnit_Framework_TestCase
+class JsonDecodingExceptionTest extends TestCase
 {
     public function testHierarchy()
     {
diff --git a/tests/Exception/ResourceNotFoundExceptionTest.php b/tests/Exception/ResourceNotFoundExceptionTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\ResourceNotFoundException;
+use PHPUnit\Framework\TestCase;
 
-class ResourceNotFoundExceptionTest extends \PHPUnit_Framework_TestCase
+class ResourceNotFoundExceptionTest extends TestCase
 {
     public function testHierarchy()
     {
diff --git a/tests/Exception/RuntimeExceptionTest.php b/tests/Exception/RuntimeExceptionTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\RuntimeException;
+use PHPUnit\Framework\TestCase;
 
-class RuntimeExceptionTest extends \PHPUnit_Framework_TestCase
+class RuntimeExceptionTest extends TestCase
 {
     public function testHierarchy()
     {
diff --git a/tests/Exception/UnresolvableJsonPointerExceptionTest.php b/tests/Exception/UnresolvableJsonPointerExceptionTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\UnresolvableJsonPointerException;
+use PHPUnit\Framework\TestCase;
 
-class UnresolvableJsonPointerExceptionTest extends \PHPUnit_Framework_TestCase
+class UnresolvableJsonPointerExceptionTest extends TestCase
 {
     public function testHierarchy()
     {
diff --git a/tests/Exception/UriResolverExceptionTest.php b/tests/Exception/UriResolverExceptionTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\UriResolverException;
+use PHPUnit\Framework\TestCase;
 
-class UriResolverExceptionTest extends \PHPUnit_Framework_TestCase
+class UriResolverExceptionTest extends TestCase
 {
     public function testHierarchy()
     {
diff --git a/tests/Iterators/ObjectIteratorTest.php b/tests/Iterators/ObjectIteratorTest.php
@@ -10,8 +10,9 @@
 namespace JsonSchema\Tests\Iterators;
 
 use JsonSchema\Iterator\ObjectIterator;
+use PHPUnit\Framework\TestCase;
 
-class ObjectIteratorTest extends \PHPUnit_Framework_TestCase
+class ObjectIteratorTest extends TestCase
 {
     protected $testObject;
 
diff --git a/tests/Rfc3339Test.php b/tests/Rfc3339Test.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests;
 
 use JsonSchema\Rfc3339;
+use PHPUnit\Framework\TestCase;
 
-class Rfc3339Test extends \PHPUnit_Framework_TestCase
+class Rfc3339Test extends TestCase
 {
     /**
      * @param string         $string
diff --git a/tests/SchemaStorageTest.php b/tests/SchemaStorageTest.php
@@ -12,9 +12,10 @@
 use JsonSchema\SchemaStorage;
 use JsonSchema\Uri\UriRetriever;
 use JsonSchema\Validator;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 
-class SchemaStorageTest extends \PHPUnit_Framework_TestCase
+class SchemaStorageTest extends TestCase
 {
     public function testResolveRef()
     {
diff --git a/tests/Uri/Retrievers/CurlTest.php b/tests/Uri/Retrievers/CurlTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Uri\Retrievers
 {
     use JsonSchema\Uri\Retrievers\Curl;
+    use PHPUnit\Framework\TestCase;
 
-    class CurlTest extends \PHPUnit_Framework_TestCase
+    class CurlTest extends TestCase
     {
         public function testRetrieveFile()
         {
diff --git a/tests/Uri/Retrievers/FileGetContentsTest.php b/tests/Uri/Retrievers/FileGetContentsTest.php
@@ -3,11 +3,12 @@
 namespace JsonSchema\Tests\Uri\Retrievers
 {
     use JsonSchema\Uri\Retrievers\FileGetContents;
+    use PHPUnit\Framework\TestCase;
 
     /**
      * @group FileGetContents
      */
-    class FileGetContentsTest extends \PHPUnit_Framework_TestCase
+    class FileGetContentsTest extends TestCase
     {
         /**
          * @expectedException \JsonSchema\Exception\ResourceNotFoundException
diff --git a/tests/Uri/Retrievers/PredefinedArrayTest.php b/tests/Uri/Retrievers/PredefinedArrayTest.php
@@ -3,11 +3,12 @@
 namespace JsonSchema\Tests\Uri\Retrievers;
 
 use JsonSchema\Uri\Retrievers\PredefinedArray;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group PredefinedArray
  */
-class PredefinedArrayTest extends \PHPUnit_Framework_TestCase
+class PredefinedArrayTest extends TestCase
 {
     private $retriever;
 
diff --git a/tests/Uri/UriResolverTest.php b/tests/Uri/UriResolverTest.php
@@ -3,8 +3,9 @@
 namespace JsonSchema\Tests\Uri;
 
 use JsonSchema\Uri\UriResolver;
+use PHPUnit\Framework\TestCase;
 
-class UriResolverTest extends \PHPUnit_Framework_TestCase
+class UriResolverTest extends TestCase
 {
     public function setUp()
     {
diff --git a/tests/Uri/UriRetrieverTest.php b/tests/Uri/UriRetrieverTest.php
@@ -12,11 +12,12 @@
 use JsonSchema\Exception\JsonDecodingException;
 use JsonSchema\Uri\UriRetriever;
 use JsonSchema\Validator;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group UriRetriever
  */
-class UriRetrieverTest extends \PHPUnit_Framework_TestCase
+class UriRetrieverTest extends TestCase
 {
     protected $validator;
 
diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -4,8 +4,9 @@
 
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Validator;
+use PHPUnit\Framework\TestCase;
 
-class ValidatorTest extends \PHPUnit_Framework_TestCase
+class ValidatorTest extends TestCase
 {
     public function testValidateWithAssocSchema()
     {

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,9 @@`
`10`	`10`	`namespace JsonSchema\Tests\Constraints;`
`11`	`11`
`12`	`12`	`use JsonSchema\Validator;`
	`13`	`+use PHPUnit\Framework\TestCase;`
`13`	`14`
`14`		`-class PointerTest extends \PHPUnit_Framework_TestCase`
	`15`	`+class PointerTest extends TestCase`
`15`	`16`	`{`
`16`	`17`	`protected $validateSchema = true;`
`17`	`18`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@`
`11`	`11`
`12`	`12`	`use JsonSchema\Constraints\Constraint;`
`13`	`13`	`use JsonSchema\Validator;`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`
`15`		`-class SchemaValidationTest extends \PHPUnit_Framework_TestCase`
	`16`	`+class SchemaValidationTest extends TestCase`
`16`	`17`	`{`
`17`	`18`	`protected $validateSchema = true;`
`18`	`19`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`use JsonSchema\Constraints\TypeCheck\LooseTypeCheck;`
`13`	`13`	`use JsonSchema\Constraints\TypeConstraint;`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`* Class TypeTest`
`@@ -19,7 +20,7 @@`
`19`	`20`	`*`
`20`	`21`	`* @author hakre <https://github.com/hakre>`
`21`	`22`	`*/`
`22`		`-class TypeTest extends \PHPUnit_Framework_TestCase`
	`23`	`+class TypeTest extends TestCase`
`23`	`24`	`{`
`24`	`25`	`/**`
`25`	`26`	`* @see testIndefiniteArticleForTypeInTypeCheckErrorMessage`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,9 @@`
`12`	`12`	`use JsonSchema\Constraints\Constraint;`
`13`	`13`	`use JsonSchema\Exception\ValidationException;`
`14`	`14`	`use JsonSchema\Validator;`
	`15`	`+use PHPUnit\Framework\TestCase;`
`15`	`16`
`16`		`-class ValidationExceptionTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class ValidationExceptionTest extends TestCase`
`17`	`18`	`{`
`18`	`19`	`public function testValidationException()`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,14 @@`
`10`	`10`	`namespace JsonSchema\Tests\Entity;`
`11`	`11`
`12`	`12`	`use JsonSchema\Entity\JsonPointer;`
	`13`	`+use PHPUnit\Framework\TestCase;`
`13`	`14`
`14`	`15`	`/**`
`15`	`16`	`* @package JsonSchema\Tests\Entity`
`16`	`17`	`*`
`17`	`18`	`* @author Joost Nijhuis <[email protected]>`
`18`	`19`	`*/`
`19`		`-class JsonPointerTest extends \PHPUnit_Framework_TestCase`
	`20`	`+class JsonPointerTest extends TestCase`
`20`	`21`	`{`
`21`	`22`	`/**`
`22`	`23`	`* @dataProvider getTestData`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`namespace JsonSchema\Tests\Exception;`
`4`	`4`
`5`	`5`	`use JsonSchema\Exception\InvalidArgumentException;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`6`	`7`
`7`		`-class InvalidArgumentExceptionTest extends \PHPUnit_Framework_TestCase`
	`8`	`+class InvalidArgumentExceptionTest extends TestCase`
`8`	`9`	`{`
`9`	`10`	`public function testHierarchy()`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`namespace JsonSchema\Tests\Exception;`
`4`	`4`
`5`	`5`	`use JsonSchema\Exception\InvalidSchemaMediaTypeException;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`6`	`7`
`7`		`-class InvalidSchemaMediaTypeExceptionTest extends \PHPUnit_Framework_TestCase`
	`8`	`+class InvalidSchemaMediaTypeExceptionTest extends TestCase`
`8`	`9`	`{`
`9`	`10`	`public function testHierarchy()`
`10`	`11`	`{`