Merge pull request #204 from alecpl/travis-php8

Travis: Enable tests on PHP 8.0
Masterminds · Mar 28, 2021 · b363cb3 · b363cb3
2 parents 9227822 + 9357c1a
commit b363cb3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -568,9 +568,6 @@ public function testIllegalTagNames()
         }
     }
 
-    /**
-     * @depends testCharacterReference
-     */
     public function testTagAttributes()
     {
         // Opening tags.

diff --git 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);
-Original file line number
+Diff line change
@@ Expand Up / @@ -568,9 +568,6 @@ public function testIllegalTagNames() @@
             }
         }
-        /**
-         * @depends testCharacterReference
-         */
         public function testTagAttributes()
         {
             // Opening tags.
@@ Expand Down @@