Merge pull request #1 from phpbench/php8

Support PHP 8

Author: dantleech

.travis.yml

@@ -1,11 +1,10 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+  - 7.2
+  - 7.3
+  - 7.4
+  - nightly
 
 sudo: false
 

composer.json

@@ -9,11 +9,11 @@
         }
     ],
     "require": {
-        "php": "^5.4|^7.0",
+        "php": "^7.2|^8.0",
         "ext-dom": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.6"
+        "phpunit/phpunit": "^8.0|^9.0"
     },
     "autoload": {
         "psr-4": {

tests/Unit/DocumentTest.php

@@ -11,16 +11,17 @@
 
 namespace PhpBench\Dom\Tests\Unit;
 
+use PHPUnit\Framework\TestCase;
 use PhpBench\Dom\Document;
 
-class DocumentTest extends \PHPUnit_Framework_TestCase
+class DocumentTest extends TestCase
 {
     /**
      * @var Document
      */
     private $document;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->document = new Document(1.0);
     }
@@ -52,7 +53,7 @@ public function testEvaluate()
     public function testCreateRoot()
     {
         $this->document->createRoot('hello');
-        $this->assertContains('<hello/>', $this->document->saveXml());
+        $this->assertStringContainsString('<hello/>', $this->document->saveXml());
     }
 
     /**

tests/Unit/ElementTest.php

@@ -11,14 +11,15 @@
 
 namespace PhpBench\Dom\Tests\Unit;
 
+use PHPUnit\Framework\TestCase;
 use PhpBench\Dom\Document;
 
-class ElementTest extends \PHPUnit_Framework_TestCase
+class ElementTest extends TestCase
 {
     private $element;
     private $document;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->document = new Document();
         $this->element = $this->document->createRoot('test');

tests/Unit/XPathTest.php

@@ -11,18 +11,18 @@
 
 namespace PhpBench\Dom\Tests\Unit;
 
+use PHPUnit\Framework\TestCase;
 use PhpBench\Dom\Document;
+use PhpBench\Dom\Exception\InvalidQueryException;
 
-class XPathTest extends \PHPUnit_Framework_TestCase
+class XPathTest extends TestCase
 {
     /**
      * It should throw an exception if the xpath query is invalid.
-     *
-     * @expectedException PhpBench\Dom\Exception\InvalidQueryException
-     * @expectedExceptionMessage Errors encountered
      */
     public function testQueryException()
     {
+        $this->expectException(InvalidQueryException::class);
         $this->getDocument()->query('//article[noexistfunc() = "as"]');
     }