Skip to content

Commit d552403

Browse files
committed
travis: phpdbg added to allow_failures (due to segfaults)
This also reverts commit 0b6bfc7.
1 parent eea931c commit d552403

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

.travis.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@ php:
44
- 7.0
55
- 7.1
66

7+
matrix:
8+
include:
9+
- php: 7.0
10+
env: coverage=on
11+
12+
allow_failures:
13+
- php: 7.0
14+
env: coverage=on
15+
716
script:
8-
- vendor/bin/tester tests -s -c tests/php-unix.ini $coverage
17+
- vendor/bin/tester tests -s -c tests/php-unix.ini $coverageArgs
918
- php temp/code-checker/src/code-checker.php --short-arrays
1019

1120
after_failure:
@@ -16,12 +25,12 @@ before_script:
1625
# Install Nette Tester & Code Checker
1726
- travis_retry composer install --no-interaction --prefer-dist
1827
- travis_retry composer create-project nette/code-checker temp/code-checker ~2.5 --no-interaction
19-
- if [ $TRAVIS_PHP_VERSION == "7.0" ]; then coverage="-p phpdbg --coverage ./coverage.xml --coverage-src ./src"; fi
28+
- if [ "$coverage" == "on" ]; then coverageArgs="-p phpdbg --coverage ./coverage.xml --coverage-src ./src"; fi
2029

2130
after_script:
2231
# Report Code Coverage
2332
- >
24-
if [ "$coverage" != "" ]; then
33+
if [ "$coverage" == "on" ]; then
2534
wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
2635
&& php coveralls.phar --verbose --config tests/.coveralls.yml
2736
|| true; fi

tests/Utils/Object.events.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class TestClass extends Nette\Object
1313
{
1414
public $onPublic;
1515

16-
//static public $onPublicStatic;
16+
static public $onPublicStatic;
1717

1818
protected $onProtected;
1919

tests/Utils/SmartObject.events.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class TestClass
1515

1616
public $onPublic;
1717

18-
//static public $onPublicStatic;
18+
static public $onPublicStatic;
1919

2020
protected $onProtected;
2121

0 commit comments

Comments
 (0)