Merge pull request #107 from pascalbaljet/php-8.0

mtibben · web-flow · commit 642f1e6e3171 · 2020-11-04T08:59:14.000+11:00
Support for PHP 8.0
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,8 @@ matrix:
     - php: 7.1
     - php: 7.2
     - php: 7.3
+    - php: 7.4
+    - php: 8.0snapshot
 
 before_script:
   - composer install
diff --git a/composer.json b/composer.json
@@ -14,10 +14,10 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "~4"
+        "phpunit/phpunit": "~4|^9.0"
     },
     "suggest": {
         "ext-mbstring": "For best performance",
         "symfony/polyfill-mbstring": "If you can't install ext-mbstring"
     }
-}
+}
diff --git a/test/BasicTest.php b/test/BasicTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class BasicTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class BasicTest extends TestCase
 {
     public function basicDataProvider() {
         return array(
diff --git a/test/BlockquoteTest.php b/test/BlockquoteTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class BlockquoteTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class BlockquoteTest extends TestCase
 {
     public function blockquoteDataProvider()
     {
diff --git a/test/ConstructorTest.php b/test/ConstructorTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class ConstructorTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ConstructorTest extends TestCase
 {
     public function testConstructor()
     {
@@ -29,7 +31,10 @@ public function testLegacyConstructorThrowsExceptionWhenFromFileIsTrue()
         $html = 'Foo';
         $options = array('do_links' => 'none');
 
-        $this->setExpectedException('InvalidArgumentException');
+        method_exists($this, 'expectException') 
+            ? $this->expectException('InvalidArgumentException')
+            : $this->setExpectedException('InvalidArgumentException');
+
         $html2text = new Html2Text($html, true, $options);
     }
 }
diff --git a/test/DefinitionListTest.php b/test/DefinitionListTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class DefinitionListTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DefinitionListTest extends TestCase
 {
     public function testDefinitionList()
     {
diff --git a/test/DelTest.php b/test/DelTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class DelTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class DelTest extends TestCase
 {
     public function testDel()
     {
diff --git a/test/HtmlCharsTest.php b/test/HtmlCharsTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class HtmlCharsTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class HtmlCharsTest extends TestCase
 {
     public function testLaquoAndRaquo()
     {
diff --git a/test/ImageTest.php b/test/ImageTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class ImageTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ImageTest extends TestCase
 {
     public function testImageDataProvider() {
         return array(
diff --git a/test/InsTest.php b/test/InsTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class InsTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class InsTest extends TestCase
 {
     public function testIns()
     {
diff --git a/test/LinkTest.php b/test/LinkTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class LinkTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class LinkTest extends TestCase
 {
     const TEST_HTML = '<a href="http://example.com">Link text</a>';
 
diff --git a/test/ListTest.php b/test/ListTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class ListTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ListTest extends TestCase
 {
     public function testList()
     {
diff --git a/test/PreTest.php b/test/PreTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class PreTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class PreTest extends TestCase
 {
     public function preDataProvider()
     {
diff --git a/test/PrintTest.php b/test/PrintTest.php
@@ -2,23 +2,24 @@
 
 namespace Html2Text;
 
-class PrintTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class PrintTest extends TestCase
 {
 	const TEST_HTML = 'Hello, &quot;<b>world</b>&quot;';
 	const EXPECTED = 'Hello, "WORLD"';
 
-	public function setUp() {
-        $this->html = new Html2Text(self::TEST_HTML);
-        $this->expectOutputString(self::EXPECTED);		
-	}
-
     public function testP()
     {
+        $this->html = new Html2Text(self::TEST_HTML);
         $this->html->p();
+        $this->expectOutputString(self::EXPECTED);
     }
 
     public function testPrint_text()
     {
+        $this->html = new Html2Text(self::TEST_HTML);
         $this->html->print_text();
+        $this->expectOutputString(self::EXPECTED);
     }
 }
diff --git a/test/SearchReplaceTest.php b/test/SearchReplaceTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class SearchReplaceTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class SearchReplaceTest extends TestCase
 {
     public function searchReplaceDataProvider() {
         return array(
diff --git a/test/SpanTest.php b/test/SpanTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class SpanTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class SpanTest extends TestCase
 {
 
     public function testIgnoreSpans()
diff --git a/test/StrToUpperTest.php b/test/StrToUpperTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class StrToUpperTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class StrToUpperTest extends TestCase
 {
     public function testToUpper()
     {
diff --git a/test/TableTest.php b/test/TableTest.php
@@ -2,7 +2,9 @@
 
 namespace Html2Text;
 
-class TableTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TableTest extends TestCase
 {
     public function testTable()
     {

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@`
`14`	`14`	`}`
`15`	`15`	`},`
`16`	`16`	`"require-dev": {`
`17`		`- "phpunit/phpunit": "~4"`
	`17`	`+ "phpunit/phpunit": "~4\|^9.0"`
`18`	`18`	`},`
`19`	`19`	`"suggest": {`
`20`	`20`	`"ext-mbstring": "For best performance",`
`21`	`21`	`"symfony/polyfill-mbstring": "If you can't install ext-mbstring"`
`22`	`22`	`}`
`23`		`-}`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Html2Text;`
`4`	`4`
`5`		`-class BasicTest extends \PHPUnit_Framework_TestCase`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
	`7`	`+class BasicTest extends TestCase`
`6`	`8`	`{`
`7`	`9`	`public function basicDataProvider() {`
`8`	`10`	`return array(`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Html2Text;`
`4`	`4`
`5`		`-class BlockquoteTest extends \PHPUnit_Framework_TestCase`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
	`7`	`+class BlockquoteTest extends TestCase`
`6`	`8`	`{`
`7`	`9`	`public function blockquoteDataProvider()`
`8`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Html2Text;`
`4`	`4`
`5`		`-class ConstructorTest extends \PHPUnit_Framework_TestCase`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
	`7`	`+class ConstructorTest extends TestCase`
`6`	`8`	`{`
`7`	`9`	`public function testConstructor()`
`8`	`10`	`{`
`@@ -29,7 +31,10 @@ public function testLegacyConstructorThrowsExceptionWhenFromFileIsTrue()`
`29`	`31`	`$html = 'Foo';`
`30`	`32`	`$options = array('do_links' => 'none');`
`31`	`33`
`32`		`- $this->setExpectedException('InvalidArgumentException');`
	`34`	`+ method_exists($this, 'expectException')`
	`35`	`+ ? $this->expectException('InvalidArgumentException')`
	`36`	`+ : $this->setExpectedException('InvalidArgumentException');`
	`37`	`+`
`33`	`38`	`$html2text = new Html2Text($html, true, $options);`
`34`	`39`	`}`
`35`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Html2Text;`
`4`	`4`
`5`		`-class DefinitionListTest extends \PHPUnit_Framework_TestCase`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
	`7`	`+class DefinitionListTest extends TestCase`
`6`	`8`	`{`
`7`	`9`	`public function testDefinitionList()`
`8`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Html2Text;`
`4`	`4`
`5`		`-class DelTest extends \PHPUnit_Framework_TestCase`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
	`7`	`+class DelTest extends TestCase`
`6`	`8`	`{`
`7`	`9`	`public function testDel()`
`8`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Html2Text;`
`4`	`4`
`5`		`-class HtmlCharsTest extends \PHPUnit_Framework_TestCase`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
	`7`	`+class HtmlCharsTest extends TestCase`
`6`	`8`	`{`
`7`	`9`	`public function testLaquoAndRaquo()`
`8`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Html2Text;`
`4`	`4`
`5`		`-class ImageTest extends \PHPUnit_Framework_TestCase`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
	`7`	`+class ImageTest extends TestCase`
`6`	`8`	`{`
`7`	`9`	`public function testImageDataProvider() {`
`8`	`10`	`return array(`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Html2Text;`
`4`	`4`
`5`		`-class InsTest extends \PHPUnit_Framework_TestCase`
	`5`	`+use PHPUnit\Framework\TestCase;`
	`6`	`+`
	`7`	`+class InsTest extends TestCase`
`6`	`8`	`{`
`7`	`9`	`public function testIns()`
`8`	`10`	`{`