PHPUnit version update

remorhaz · remorhaz · commit 7c36e9457787 · 2017-04-12T16:25:30.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: php
 
 php:
   - '7.0'
+  - '7.1'
 
 before_script:
   - composer self-update
diff --git a/composer.json b/composer.json
@@ -13,10 +13,10 @@
   ],
   "require": {
     "php": ">=7.0",
-    "remorhaz/php-json-data" : "0.2.1"
+    "remorhaz/php-json-data" : "~0.3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "@stable",
+    "phpunit/phpunit": "~6.1",
     "codeclimate/php-test-reporter": "dev-master"
   },
   "autoload": {
diff --git a/tests/Locator/Reference/IsLastTest.php b/tests/Locator/Reference/IsLastTest.php
@@ -2,9 +2,10 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Locator\Reference;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Locator\Reference;
 
-class IsLastTest extends \PHPUnit_Framework_TestCase
+class IsLastTest extends TestCase
 {
 
 
diff --git a/tests/Locator/Reference/LengthTest.php b/tests/Locator/Reference/LengthTest.php
@@ -2,9 +2,10 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Locator\Reference;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Locator\Reference;
 
-class LengthTest extends \PHPUnit_Framework_TestCase
+class LengthTest extends TestCase
 {
 
 
diff --git a/tests/Locator/Reference/TypeTest.php b/tests/Locator/Reference/TypeTest.php
@@ -2,9 +2,10 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Locator\Reference;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Locator\Reference;
 
-class TypeTest extends \PHPUnit_Framework_TestCase
+class TypeTest extends TestCase
 {
 
 
diff --git a/tests/Locator/Reference/ValueTest.php b/tests/Locator/Reference/ValueTest.php
@@ -2,9 +2,10 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Locator\Reference;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Locator\Reference;
 
-class ValueTest extends \PHPUnit_Framework_TestCase
+class ValueTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Lexer/ReadTest.php b/tests/Parser/Lexer/ReadTest.php
@@ -2,10 +2,11 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Lexer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Lexer\Lexer;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class ReadTest extends \PHPUnit_Framework_TestCase
+class ReadTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Lexer/Scanner/ReadTest.php b/tests/Parser/Lexer/Scanner/ReadTest.php
@@ -2,12 +2,13 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Lexer\Scanner;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Lexer\Scanner;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
 /**
  */
-class ReadTest extends \PHPUnit_Framework_TestCase
+class ReadTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Lexer/Scanner/TextTest.php b/tests/Parser/Lexer/Scanner/TextTest.php
@@ -6,7 +6,7 @@
 
 /**
  */
-class TextTest extends \PHPUnit_Framework_TestCase
+class TextTest extends \PHPUnit\Framework\TestCase
 {
 
 
diff --git a/tests/Parser/Lexer/TextTest.php b/tests/Parser/Lexer/TextTest.php
@@ -2,10 +2,11 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Lexer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Lexer\Lexer;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class TextTest extends \PHPUnit_Framework_TestCase
+class TextTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Lexer/TokenBuffer/AddTest.php b/tests/Parser/Lexer/TokenBuffer/AddTest.php
@@ -2,10 +2,11 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Lexer\TokenBuffer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Lexer\TokenBuffer;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class AddTest extends \PHPUnit_Framework_TestCase
+class AddTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Lexer/TokenBuffer/ReadTest.php b/tests/Parser/Lexer/TokenBuffer/ReadTest.php
@@ -2,10 +2,11 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Lexer\TokenBuffer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Lexer\TokenBuffer;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class ReadTest extends \PHPUnit_Framework_TestCase
+class ReadTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Lexer/TokenBuffer/UnreadTest.php b/tests/Parser/Lexer/TokenBuffer/UnreadTest.php
@@ -2,54 +2,14 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Lexer\TokenBuffer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Lexer\TokenBuffer;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class UnreadTest extends \PHPUnit_Framework_TestCase
+class UnreadTest extends TestCase
 {
 
 
-    /**
-     * @param int $tokenAmount
-     * @dataProvider providerTokenAmount
-     */
-    public function testUnreadingAllReadTokensNoException(int $tokenAmount)
-    {
-        $buffer = TokenBuffer::factory();
-        for ($i = 0; $i < $tokenAmount; $i++) {
-            $token = Token::factory(Token::TYPE_SLASH, "/", 1);
-            $buffer->addToken($token);
-        }
-        for ($i = 0; $i < $tokenAmount; $i++) {
-            $buffer->readToken();
-        }
-        for ($i = 0; $i < $tokenAmount; $i++) {
-            $buffer->unreadToken();
-        }
-    }
-
-
-    /**
-     * @param int $tokenAmount
-     * @dataProvider providerTokenAmount
-     * @expectedException \Remorhaz\JSON\Pointer\Parser\Lexer\Exception
-     */
-    public function testUnreadingMoreTokensThanWasReadThrowsException(int $tokenAmount)
-    {
-        $buffer = TokenBuffer::factory();
-        for ($i = 0; $i < $tokenAmount; $i++) {
-            $token = Token::factory(Token::TYPE_SLASH, "/", 1);
-            $buffer->addToken($token);
-        }
-        for ($i = 0; $i < $tokenAmount; $i++) {
-            $buffer->readToken();
-        }
-        for ($i = 0; $i <= $tokenAmount; $i++) {
-            $buffer->unreadToken();
-        }
-    }
-
-
     /**
      * @param int $tokenAmount
      * @dataProvider providerTokenAmount
diff --git a/tests/Parser/Lexer/UnreadTest.php b/tests/Parser/Lexer/UnreadTest.php
@@ -2,9 +2,10 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Lexer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Lexer\Lexer;
 
-class UnreadTest extends \PHPUnit_Framework_TestCase
+class UnreadTest extends TestCase
 {
 
 
@@ -39,23 +40,6 @@ public function testReadingSameTokenAfterUnreading()
     }
 
 
-    /**
-     * @param int $tokenAmount
-     * @param string $text
-     * @dataProvider providerTokenAmountAndText
-     */
-    public function testUnreadingAllReadTokensNoException(int $tokenAmount, string $text)
-    {
-        $lexer = Lexer::factory()->setText($text);
-        for ($i = 0; $i < $tokenAmount; $i++) {
-            $lexer->readToken();
-        }
-        for ($i = 0; $i < $tokenAmount; $i++) {
-            $lexer->unreadToken();
-        }
-    }
-
-
     /**
      * @param int $tokenAmount
      * @param string $text
diff --git a/tests/Parser/ReferenceBufferTest.php b/tests/Parser/ReferenceBufferTest.php
@@ -2,10 +2,11 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\ReferenceBuffer;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class ReferenceBufferTest extends \PHPUnit_Framework_TestCase
+class ReferenceBufferTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Token/PositionTest.php b/tests/Parser/Token/PositionTest.php
@@ -2,9 +2,10 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Token;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class PositionTest extends \PHPUnit_Framework_TestCase
+class PositionTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Token/TextTest.php b/tests/Parser/Token/TextTest.php
@@ -2,9 +2,10 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Token;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class TextTest extends \PHPUnit_Framework_TestCase
+class TextTest extends TestCase
 {
 
 
diff --git a/tests/Parser/Token/TypeTest.php b/tests/Parser/Token/TypeTest.php
@@ -2,9 +2,10 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Parser\Token;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Parser\Token;
 
-class TypeTest extends \PHPUnit_Framework_TestCase
+class TypeTest extends TestCase
 {
 
 
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -2,10 +2,11 @@
 
 namespace Remorhaz\JSON\Pointer\Test;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Locator\Reference;
 use Remorhaz\JSON\Pointer\Parser\Parser;
 
-class ParserTest extends \PHPUnit_Framework_TestCase
+class ParserTest extends TestCase
 {
 
 
diff --git a/tests/Pointer/AddTest.php b/tests/Pointer/AddTest.php
@@ -2,11 +2,12 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Pointer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Data\Reference\Reader;
 use Remorhaz\JSON\Data\Reference\Writer;
 use Remorhaz\JSON\Pointer\Pointer;
 
-class AddTest extends \PHPUnit_Framework_TestCase
+class AddTest extends TestCase
 {
 
 
diff --git a/tests/Pointer/ReadTest.php b/tests/Pointer/ReadTest.php
@@ -2,13 +2,14 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Pointer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Data\Reference\Selector;
 use Remorhaz\JSON\Pointer\Pointer;
 
 /**
  * @todo Merge tests for non-numeric indices.
  */
-class ReadTest extends \PHPUnit_Framework_TestCase
+class ReadTest extends TestCase
 {
 
 
diff --git a/tests/Pointer/RemoveTest.php b/tests/Pointer/RemoveTest.php
@@ -2,10 +2,11 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Pointer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Data\Reference\Writer;
 use Remorhaz\JSON\Pointer\Pointer;
 
-class RemoveTest extends \PHPUnit_Framework_TestCase
+class RemoveTest extends TestCase
 {
 
 
diff --git a/tests/Pointer/ReplaceTest.php b/tests/Pointer/ReplaceTest.php
@@ -2,11 +2,12 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Pointer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Data\Reference\Reader;
 use Remorhaz\JSON\Data\Reference\Writer;
 use Remorhaz\JSON\Pointer\Pointer;
 
-class ReplaceTest extends \PHPUnit_Framework_TestCase
+class ReplaceTest extends TestCase
 {
 
 
diff --git a/tests/Pointer/TestTest.php b/tests/Pointer/TestTest.php
@@ -2,13 +2,14 @@
 
 namespace Remorhaz\JSON\Pointer\Test\Pointer;
 
+use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Data\Reference\Selector;
 use Remorhaz\JSON\Pointer\Pointer;
 
 /**
  * @todo Merge tests for non-numeric indices.
  */
-class TestTest extends \PHPUnit_Framework_TestCase
+class TestTest extends TestCase
 {
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace Remorhaz\JSON\Pointer\Test\Locator\Reference;`
`4`	`4`
	`5`	`+use PHPUnit\Framework\TestCase;`
`5`	`6`	`use Remorhaz\JSON\Pointer\Locator\Reference;`
`6`	`7`
`7`		`-class IsLastTest extends \PHPUnit_Framework_TestCase`
	`8`	`+class IsLastTest extends TestCase`
`8`	`9`	`{`
`9`	`10`
`10`	`11`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace Remorhaz\JSON\Pointer\Test\Parser\Lexer;`
`4`	`4`
	`5`	`+use PHPUnit\Framework\TestCase;`
`5`	`6`	`use Remorhaz\JSON\Pointer\Parser\Lexer\Lexer;`
`6`	`7`	`use Remorhaz\JSON\Pointer\Parser\Token;`
`7`	`8`
`8`		`-class ReadTest extends \PHPUnit_Framework_TestCase`
	`9`	`+class ReadTest extends TestCase`
`9`	`10`	`{`
`10`	`11`
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`*/`
`9`		`-class TextTest extends \PHPUnit_Framework_TestCase`
	`9`	`+class TextTest extends \PHPUnit\Framework\TestCase`
`10`	`10`	`{`
`11`	`11`
`12`	`12`