Skip to content

Commit b8d2446

Browse files
committed
Merge branch 'master' into 8.x
2 parents 938a528 + 1538792 commit b8d2446

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

.travis.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@ language: php
33
php:
44
- 7.3
55
- 7.4
6+
- 8.0
7+
8+
env:
9+
global:
10+
- COMPOSER_MEMORY_LIMIT=-1
11+
- XDEBUG_MODE=coverage
612

713
cache:
814
directories:
915
- $HOME/.composer/cache
1016

1117
install:
12-
- COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --no-interaction --prefer-dist
13-
- COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require --no-interaction --prefer-dist --dev php-coveralls/php-coveralls
18+
- travis_retry composer install --no-interaction --prefer-dist
19+
- travis_retry composer require --no-interaction --prefer-dist --dev php-coveralls/php-coveralls
1420

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"email": "[email protected]"
1313
}],
1414
"require": {
15-
"php": "^7.3",
15+
"php": "^7.3|^8.0",
1616
"ext-dom": "*",
1717
"ext-json": "*",
1818
"ext-simplexml": "*",
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#0 backtrace_as_string() called at [/Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:47]
2-
#1 Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->anotherExtraMethod() called at [/Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:37]
3-
#2 Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->getBacktrace() called at [/Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:13]
1+
#0 backtrace_as_string() called at [/Users/maind/Code/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:47]
2+
#1 Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->anotherExtraMethod() called at [/Users/maind/Code/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:37]
3+
#2 Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->getBacktrace() called at [/Users/maind/Code/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:13]
44
#3 Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->it_returns_backtrace_as_string_without_args()
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#0 /Applications/MAMP/htdocs/illuminated/helper-functions/src/debug.php:27
2-
#1 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:47
3-
#2 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:37
4-
#3 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:13
1+
#0 /Users/maind/Code/illuminated/helper-functions/src/debug.php:27
2+
#1 /Users/maind/Code/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:47
3+
#2 /Users/maind/Code/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:37
4+
#3 /Users/maind/Code/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:13

0 commit comments

Comments
 (0)