Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix travisci build #191

Merged
merged 3 commits into from
Jul 5, 2020
Merged

Fix travisci build #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
093fc3b
cs fix
goetas Jul 5, 2020
dc6e84f
fix travis build
goetas Jul 5, 2020
391b571
remove some unused deps
goetas Jul 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
10 changes: 0 additions & 10 deletions sami.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/HTML5/Parser/DOMTreeBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/HTML5/Parser/DOMTreeBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ public function testIAudioInParagraph()

public function testClosingBr()
{
$html = <<<EOM
$html = <<<EOM
<!DOCTYPE html>
<html>
<head>
Expand Down