Merge pull request #191 from Masterminds/build-fix

goetas · web-flow · commit 30db060bff9b · 2020-07-05T10:22:59.000+02:00
Fix travisci build
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ matrix:
     - php: 5.4
     - php: 5.5
     - php: 5.6
-      env: SCRUTINIZER=1
+      env: SCRUTINIZER=1 PHPUNIT_FLAGS="--coverage-clover=coverage.xml"
     - php: 7.0
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 7.1
@@ -26,14 +26,15 @@ cache:
     - $HOME/.composer/cache
 
 before_script:
+  - if [[ SCRUTINIZER != '1' ]]; then phpenv config-rm xdebug.ini || true; fi
   - composer self-update
   - composer update $COMPOSER_FLAGS --prefer-dist
 
 script:
   - stty cols 120
   - if [ "$CS_FIXER" == 1 ]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.13.1/php-cs-fixer.phar && php php-cs-fixer.phar fix --dry-run --diff; fi
   - mkdir -p build/logs
-  - ./vendor/bin/phpunit --coverage-clover=coverage.xml
+  - ./vendor/bin/phpunit $PHPUNIT_FLAGS
 
 after_script:
   - if [ "$SCRUTINIZER" == 1 ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi
diff --git a/composer.json b/composer.json
@@ -26,9 +26,7 @@
         "php" : ">=5.3.0"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "1.0.*",
-        "phpunit/phpunit" : "^4.8.35",
-        "sami/sami": "~2.0"
+        "phpunit/phpunit" : "^4.8.35"
     },
     "autoload": {
         "psr-4": {"Masterminds\\": "src"}
diff --git a/sami.php b/sami.php
diff --git a/src/HTML5/Parser/DOMTreeBuilder.php b/src/HTML5/Parser/DOMTreeBuilder.php
@@ -475,7 +475,7 @@ public function endTag($name)
         $lname = $this->normalizeTagName($name);
 
         // Special case within 12.2.6.4.7: An end tag whose tag name is "br" should be treated as an opening tag
-        if ($name === 'br') {
+        if ('br' === $name) {
             $this->parseError('Closing tag encountered for void element br.');
 
             $this->startTag('br');
diff --git a/test/HTML5/Parser/DOMTreeBuilderTest.php b/test/HTML5/Parser/DOMTreeBuilderTest.php
@@ -718,7 +718,7 @@ public function testIAudioInParagraph()
 
     public function testClosingBr()
     {
-                $html = <<<EOM
+        $html = <<<EOM
 <!DOCTYPE html>
 <html>
     <head>

Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ public function testIAudioInParagraph()`
`718`	`718`
`719`	`719`	`public function testClosingBr()`
`720`	`720`	`{`
`721`		`- $html = <<<EOM`
	`721`	`+ $html = <<<EOM`
`722`	`722`	`<!DOCTYPE html>`
`723`	`723`	`<html>`
`724`	`724`	`<head>`