Merge pull request #59 from Codeception/test-phpunit-8

PhpUnit 8 support

Author: Naktibalda

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
 env:
-  CODECEPTION_VERSION: '2.5.x-dev'
+  CODECEPTION_VERSION: '2.6.x-dev'
 
 php:
-  - 7.1
   - 7.2
   - 7.3
 

composer.json

@@ -10,8 +10,8 @@
         }
     ],
     "require": {
-        "phpunit/phpunit": ">=7.1 <7.6",
-        "phpunit/php-code-coverage": "^6.0",
+        "phpunit/phpunit": "^8.0",
+        "phpunit/php-code-coverage": "^7.0",
         "sebastian/comparator": "^3.0",
         "sebastian/diff": "^3.0"
     },

src/Constraint/JsonContains.php

@@ -16,7 +16,6 @@ class JsonContains extends \PHPUnit\Framework\Constraint\Constraint
 
     public function __construct(array $expected)
     {
-        parent::__construct();
         $this->expected = $expected;
     }
 

src/Constraint/JsonType.php

@@ -12,7 +12,6 @@ class JsonType extends \PHPUnit\Framework\Constraint\Constraint
 
     public function __construct(array $jsonType, $match = true)
     {
-        parent::__construct();
         $this->jsonType = $jsonType;
         $this->match = $match;
     }

src/Constraint/Page.php

@@ -10,7 +10,6 @@ class Page extends \PHPUnit\Framework\Constraint\Constraint
 
     public function __construct($string, $uri = '')
     {
-        parent::__construct();
         $this->string = $this->normalizeText((string)$string);
         $this->uri = $uri;
     }

src/FilterTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace Codeception\PHPUnit;
 
+use Codeception\PHPUnit\NonFinal\NameFilterIterator;
 use Codeception\Test\Descriptor;
 
 /**
@@ -9,7 +10,7 @@
  * Class FilterTest
  * @package Codeception\PHPUnit
  */
-class FilterTest extends \PHPUnit\Runner\Filter\NameFilterIterator
+class FilterTest extends NameFilterIterator
 {
     public function accept():bool
     {

src/Log/JUnit.php

@@ -6,7 +6,7 @@
 use Codeception\Test\Test;
 use PHPUnit\Framework\TestCase;
 
-class JUnit extends \PHPUnit\Util\Log\JUnit
+class JUnit extends \Codeception\PHPUnit\NonFinal\JUnit
 {
     protected $strictAttributes = ['file', 'name', 'class'];
 

src/Log/PhpUnit.php

@@ -7,7 +7,7 @@
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestSuite;
 
-class PhpUnit extends \PHPUnit\Util\Log\JUnit
+class PhpUnit extends \Codeception\PHPUnit\NonFinal\JUnit
 {
     const SUITE_LEVEL = 1;
     const FILE_LEVEL  = 2;