Skip to content

Commit

Permalink
Merge branch 'master' into 8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitry-ivanov committed Dec 21, 2020
2 parents 546ea7a + be1a325 commit 665370e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
10 changes: 8 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@ language: php
php:
- 7.3
- 7.4
- 8.0

env:
global:
- COMPOSER_MEMORY_LIMIT=-1
- XDEBUG_MODE=coverage

cache:
directories:
- $HOME/.composer/cache

install:
- COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --no-interaction --prefer-dist
- COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require --no-interaction --prefer-dist --dev php-coveralls/php-coveralls
- travis_retry composer install --no-interaction --prefer-dist
- travis_retry composer require --no-interaction --prefer-dist --dev php-coveralls/php-coveralls

script: vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"email": "dmitry.g.ivanov@gmail.com"
}],
"require": {
"php": "^7.3",
"php": "^7.3|^8.0",
"ext-json": "*",
"guzzlehttp/guzzle": "^6.5.5|^7.0.1",
"illuminate/support": "^8.0"
Expand Down
1 change: 1 addition & 0 deletions tests/Grabber/PageTest/page-with-images-when-disabled.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Sofa tables are similar to Pembroke tables and usually have longer and narrower
Work tables were small tables designed to hold sewing materials and implements, providing a convenient work place for women who sewed. They appeared during the 18th century and were popular throughout the 19th century. Most examples have rectangular tops, sometimes with folding leaves, and usually one or more drawers fitted with partitions. Early examples typically have four legs, often standing on casters, while later examples sometimes have turned columns or other forms of support.<br />
Drum tables are round tables introduced for writing, with drawers around the platform.<br />
End tables are small tables typically placed beside couches or armchairs. Often lamps will be placed on an end table.<br />
Overbed tables are narrow rectangular tables whose top is designed for use above the bed, especially for hospital patients.<br />
Billiards tables are bounded tables on which billiards-type games are played. All provide a flat surface, usually composed of slate and covered with cloth, elevated above the ground.<br />
Chess tables are a type of games table that integrates a chessboard.<br />
Table tennis tables are usually masonite or a similar wood, layered with a smooth low-friction coating. they are divided into two halves by a low net, which separates opposing players.<br />
Expand Down
1 change: 1 addition & 0 deletions tests/Grabber/PageTest/page-with-images-when-enabled.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ Sofa tables are similar to Pembroke tables and usually have longer and narrower
Work tables were small tables designed to hold sewing materials and implements, providing a convenient work place for women who sewed. They appeared during the 18th century and were popular throughout the 19th century. Most examples have rectangular tops, sometimes with folding leaves, and usually one or more drawers fitted with partitions. Early examples typically have four legs, often standing on casters, while later examples sometimes have turned columns or other forms of support.<br />
Drum tables are round tables introduced for writing, with drawers around the platform.<br />
End tables are small tables typically placed beside couches or armchairs. Often lamps will be placed on an end table.<br />
Overbed tables are narrow rectangular tables whose top is designed for use above the bed, especially for hospital patients.<br />
Billiards tables are bounded tables on which billiards-type games are played. All provide a flat surface, usually composed of slate and covered with cloth, elevated above the ground.<br />
Chess tables are a type of games table that integrates a chessboard.<br />
Table tennis tables are usually masonite or a similar wood, layered with a smooth low-friction coating. they are divided into two halves by a low net, which separates opposing players.<br />
Expand Down

0 comments on commit 665370e

Please sign in to comment.