upgrade to phpunit 8

zordius · zordius · commit ff9ecc0a200c · 2019-04-05T10:06:33.000+08:00
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -15,5 +15,5 @@ git submodule init
 git submodule update
 composer install
 build/runphp build/gen_test.php
-phpunit
+build/test
 ```
diff --git a/build/gen_test.php b/build/gen_test.php
@@ -28,10 +28,11 @@ function genTestForClass($classname) {
 use LightnCandy\\LightnCandy;
 use LightnCandy\\Runtime;
 use LightnCandy\\SafeString;
+use PHPUnit\\Framework\\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class {$classname}Test extends PHPUnit_Framework_TestCase
+class {$classname}Test extends TestCase
 {
 
 VAR
diff --git a/build/test b/build/test
@@ -0,0 +1,2 @@
+#!/bin/sh
+vendor/bin/phpunit --bootstrap vendor/autoload.php
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "php": ">=5.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.8.35"
+        "phpunit/phpunit": "8.0.6"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -12,7 +12,7 @@
  </filter>
 
  <logging>
-  <log type="coverage-html" target="build/result/coverage" title="lightncandy" charset="UTF-8" />
+  <log type="coverage-html" target="build/result/coverage" />
   <log type="coverage-text" target="php://stdout" />
  </logging>
 
diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class CompilerTest extends PHPUnit_Framework_TestCase
+class CompilerTest extends TestCase
 {
     /**
      * @covers LightnCandy\Compiler::getFuncName
diff --git a/tests/ContextTest.php b/tests/ContextTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class ContextTest extends PHPUnit_Framework_TestCase
+class ContextTest extends TestCase
 {
     /**
      * @covers LightnCandy\Context::updateHelperTable
diff --git a/tests/EncoderTest.php b/tests/EncoderTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class EncoderTest extends PHPUnit_Framework_TestCase
+class EncoderTest extends TestCase
 {
     /**
      * @covers LightnCandy\Encoder::raw
diff --git a/tests/ExporterTest.php b/tests/ExporterTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class ExporterTest extends PHPUnit_Framework_TestCase
+class ExporterTest extends TestCase
 {
     /**
      * @covers LightnCandy\Exporter::closure
diff --git a/tests/ExpressionTest.php b/tests/ExpressionTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class ExpressionTest extends PHPUnit_Framework_TestCase
+class ExpressionTest extends TestCase
 {
     /**
      * @covers LightnCandy\Expression::boolString
diff --git a/tests/LightnCandyTest.php b/tests/LightnCandyTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class LightnCandyTest extends PHPUnit_Framework_TestCase
+class LightnCandyTest extends TestCase
 {
     /**
      * @covers LightnCandy\LightnCandy::compilePartial
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class ParserTest extends PHPUnit_Framework_TestCase
+class ParserTest extends TestCase
 {
     /**
      * @covers LightnCandy\Parser::getExpression
diff --git a/tests/PartialTest.php b/tests/PartialTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class PartialTest extends PHPUnit_Framework_TestCase
+class PartialTest extends TestCase
 {
     /**
      * @covers LightnCandy\Partial::prePartial
diff --git a/tests/RuntimeTest.php b/tests/RuntimeTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class RuntimeTest extends PHPUnit_Framework_TestCase
+class RuntimeTest extends TestCase
 {
     /**
      * @covers LightnCandy\Runtime::debug
diff --git a/tests/SafeStringTest.php b/tests/SafeStringTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class SafeStringTest extends PHPUnit_Framework_TestCase
+class SafeStringTest extends TestCase
 {
     /**
      * @covers LightnCandy\SafeString::stripExtendedComments
diff --git a/tests/TokenTest.php b/tests/TokenTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class TokenTest extends PHPUnit_Framework_TestCase
+class TokenTest extends TestCase
 {
     /**
      * @covers LightnCandy\Token::toString
diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -5,10 +5,11 @@
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
 use LightnCandy\SafeString;
+use PHPUnit\Framework\TestCase;
 
 require_once(__DIR__ . '/test_util.php');
 
-class ValidatorTest extends PHPUnit_Framework_TestCase
+class ValidatorTest extends TestCase
 {
     /**
      * @covers LightnCandy\Validator::delimiter
diff --git a/tests/errorTest.php b/tests/errorTest.php
@@ -2,6 +2,8 @@
 
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
+use PHPUnit\Framework\TestCase;
+
 require_once('tests/helpers_for_test.php');
 
 $tmpdir = sys_get_temp_dir();
@@ -29,7 +31,7 @@ function stop_catch_error_log() {
     }, file($errlog_fn));
 }
 
-class errorTest extends PHPUnit_Framework_TestCase
+class errorTest extends TestCase
 {
     public function testException()
     {
diff --git a/tests/handlebarsSpecTest.php b/tests/handlebarsSpecTest.php
@@ -2,6 +2,7 @@
 
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
+use PHPUnit\Framework\TestCase;
 
 $tmpdir = sys_get_temp_dir();
 $hb_test_flag = LightnCandy::FLAG_HANDLEBARSJS_FULL | LightnCandy::FLAG_ERROR_EXCEPTION | LightnCandy::FLAG_EXTHELPER;
@@ -62,7 +63,7 @@ static public function createFrame($data) {
     }
 }
 
-class HandlebarsSpecTest extends PHPUnit_Framework_TestCase
+class HandlebarsSpecTest extends TestCase
 {
     /**
      * @dataProvider jsonSpecProvider
diff --git a/tests/mustacheSpecTest.php b/tests/mustacheSpecTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use LightnCandy\LightnCandy;
+use PHPUnit\Framework\TestCase;
 
 $tmpdir = sys_get_temp_dir();
 
@@ -9,7 +10,7 @@ function getFunctionCode($func) {
     return $v;
 }
 
-class MustacheSpecTest extends PHPUnit_Framework_TestCase
+class MustacheSpecTest extends TestCase
 {
     /**
      * @dataProvider jsonSpecProvider
diff --git a/tests/regressionTest.php b/tests/regressionTest.php
@@ -2,11 +2,13 @@
 
 use LightnCandy\LightnCandy;
 use LightnCandy\Runtime;
+use PHPUnit\Framework\TestCase;
+
 require_once('tests/helpers_for_test.php');
 
 $tmpdir = sys_get_temp_dir();
 
-class regressionTest extends PHPUnit_Framework_TestCase
+class regressionTest extends TestCase
 {
     /**
      * @dataProvider issueProvider
diff --git a/tests/usageTest.php b/tests/usageTest.php
@@ -1,9 +1,11 @@
 <?php
 
 use LightnCandy\LightnCandy;
+use PHPUnit\Framework\TestCase;
+
 require_once('tests/helpers_for_test.php');
 
-class usageTest extends PHPUnit_Framework_TestCase
+class usageTest extends TestCase
 {
     /**
      * @dataProvider compileProvider

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/bin/sh`
	`2`	`+vendor/bin/phpunit --bootstrap vendor/autoload.php`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`use LightnCandy\LightnCandy;`
`4`	`4`	`use LightnCandy\Runtime;`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
`5`	`7`	`require_once('tests/helpers_for_test.php');`
`6`	`8`
`7`	`9`	`$tmpdir = sys_get_temp_dir();`
`@@ -29,7 +31,7 @@ function stop_catch_error_log() {`
`29`	`31`	`}, file($errlog_fn));`
`30`	`32`	`}`
`31`	`33`
`32`		`-class errorTest extends PHPUnit_Framework_TestCase`
	`34`	`+class errorTest extends TestCase`
`33`	`35`	`{`
`34`	`36`	`public function testException()`
`35`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use LightnCandy\LightnCandy;`
`4`	`4`	`use LightnCandy\Runtime;`
	`5`	`+use PHPUnit\Framework\TestCase;`
`5`	`6`
`6`	`7`	`$tmpdir = sys_get_temp_dir();`
`7`	`8`	`$hb_test_flag = LightnCandy::FLAG_HANDLEBARSJS_FULL \| LightnCandy::FLAG_ERROR_EXCEPTION \| LightnCandy::FLAG_EXTHELPER;`
`@@ -62,7 +63,7 @@ static public function createFrame($data) {`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`
`65`		`-class HandlebarsSpecTest extends PHPUnit_Framework_TestCase`
	`66`	`+class HandlebarsSpecTest extends TestCase`
`66`	`67`	`{`
`67`	`68`	`/**`
`68`	`69`	`* @dataProvider jsonSpecProvider`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use LightnCandy\LightnCandy;`
	`4`	`+use PHPUnit\Framework\TestCase;`
`4`	`5`
`5`	`6`	`$tmpdir = sys_get_temp_dir();`
`6`	`7`
`@@ -9,7 +10,7 @@ function getFunctionCode($func) {`
`9`	`10`	`return $v;`
`10`	`11`	`}`
`11`	`12`
`12`		`-class MustacheSpecTest extends PHPUnit_Framework_TestCase`
	`13`	`+class MustacheSpecTest extends TestCase`
`13`	`14`	`{`
`14`	`15`	`/**`
`15`	`16`	`* @dataProvider jsonSpecProvider`