summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsmir Mustafic <[email protected]>2021-03-28 15:58:04 +0200
committerGitHub <[email protected]>2021-03-28 15:58:04 +0200
commitb363cb3892053221407651c2b15d306c82e124a5 (patch)
treec104f1cde3c9689c65615769ae42a4218e02f093
parent9227822783c75406cfe400984b2f095cdf03d417 (diff)
parent9357c1aa9b3a16294643db585bf9877997383005 (diff)
Merge pull request #204 from alecpl/travis-php8
Travis: Enable tests on PHP 8.0
-rw-r--r--.travis.yml5
-rw-r--r--composer.json2
-rw-r--r--phpunit.xml.dist9
-rw-r--r--test/HTML5/Parser/TokenizerTest.php3
-rw-r--r--test/HTML5/TestCase.php5
5 files changed, 5 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
index 7bb8d7e..44661b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,9 @@ matrix:
- php: 7.2
- php: 7.3
env: BENCHMARK=1
- - php: 7.4snapshot
+ - php: 7.4
+ - php: 8.0
+ dist: bionic
fast_finish: true
cache:
@@ -28,6 +30,7 @@ cache:
before_script:
- if [[ SCRUTINIZER != '1' ]]; then phpenv config-rm xdebug.ini || true; fi
- composer self-update
+ - if [[ ${TRAVIS_PHP_VERSION:0:1} == "8" ]]; then composer config platform.php 7.4; fi
- composer update $COMPOSER_FLAGS --prefer-dist
script:
diff --git a/composer.json b/composer.json
index 6e5dddb..fb7674e 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
"php" : ">=5.3.0"
},
"require-dev": {
- "phpunit/phpunit" : "^4.8.35"
+ "phpunit/phpunit" : "^4.8.35 || ^5.7.21 || ^6 || ^7"
},
"autoload": {
"psr-4": {"Masterminds\\": "src"}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f36cf11..8e7750d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,13 +5,4 @@
<directory>test/HTML5/</directory>
</testsuite>
</testsuites>
- <filter>
- <blacklist>
- <file>systemlib.phpreflection_hni</file>
- <file>src/HTML5/Parser/InputStream.php</file>
- <file>src/HTML5/Serializer/RulesInterface.php</file>
- <file>src/HTML5/Entities.php</file>
- <file>src/HTML5/Serializer/HTML5Entities.php</file>
- </blacklist>
- </filter>
</phpunit>
diff --git a/test/HTML5/Parser/TokenizerTest.php b/test/HTML5/Parser/TokenizerTest.php
index 6c90686..5284d30 100644
--- a/test/HTML5/Parser/TokenizerTest.php
+++ b/test/HTML5/Parser/TokenizerTest.php
@@ -568,9 +568,6 @@ class TokenizerTest extends \Masterminds\HTML5\Tests\TestCase
}
}
- /**
- * @depends testCharacterReference
- */
public function testTagAttributes()
{
// Opening tags.
diff --git a/test/HTML5/TestCase.php b/test/HTML5/TestCase.php
index 990e8c1..a25ae21 100644
--- a/test/HTML5/TestCase.php
+++ b/test/HTML5/TestCase.php
@@ -11,11 +11,6 @@ class TestCase extends BaseTestCase
const DOC_CLOSE = '</body></html>';
- public function testFoo()
- {
- // Placeholder. Why is PHPUnit emitting warnings about no tests?
- }
-
public function getInstance(array $options = array())
{
return new HTML5($options);