Skip to content

Commit bbb498d

Browse files
committed
Move testing to phpBB 3.3.x branch
1 parent 8c163a5 commit bbb498d

2 files changed

Lines changed: 17 additions & 23 deletions

File tree

.travis.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
11
language: php
2-
dist: trusty
2+
dist: xenial
33

44
matrix:
55
include:
6-
- php: 5.5
6+
- php: 7.1
77
env: DB=none;NOTESTS=1
8-
- php: 5.4
9-
env: DB=mysqli #myisam
10-
- php: 5.4
11-
env: DB=mysql
12-
- php: 5.4
8+
- php: 7.1
139
env: DB=mariadb
14-
- php: 5.4
10+
- php: 7.1
1511
env: DB=postgres
16-
- php: 5.4
12+
- php: 7.1
1713
env: DB=sqlite3
18-
- php: 5.5
19-
env: DB=mysqli
20-
- php: 5.6
21-
env: DB=mysqli
22-
- php: 7.0
23-
env: DB=mysqli
2414
- php: 7.1
25-
env: DB=mysqli
15+
env: DB=mysqli # MyISAM
2616
- php: 7.2
2717
env: DB=mysqli
18+
- php: 7.3
19+
env: DB=mysqli
20+
- php: 7.4snapshot
21+
env: DB=mysqli
2822
- php: nightly
2923
env: DB=mysqli
3024
allow_failures:
@@ -37,7 +31,7 @@ env:
3731
- SNIFF="1" # Should we run code sniffer on your code?
3832
- IMAGE_ICC="1" # Should we run icc profile sniffer on your images?
3933
- EPV="1" # Should we run EPV (Extension Pre Validator) on your code?
40-
- PHPBB_BRANCH="3.2.x"
34+
- PHPBB_BRANCH="3.3.x"
4135

4236
branches:
4337
only:
@@ -46,6 +40,10 @@ branches:
4640
- /^develop-.*$/
4741
- /^\d+(\.\d+)?\.x$/
4842

43+
services:
44+
- postgresql
45+
- mysql
46+
4947
install:
5048
- travis/prepare-phpbb.sh $PHPBB_BRANCH
5149
- cd ../../phpBB3
@@ -59,5 +57,5 @@ before_script:
5957
script:
6058
- sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME $NOTESTS; fi"
6159
- sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS; fi"
62-
- sh -c "if [ '$EPV' != '0' ] && [ '$NOTESTS' = '1' ]; then phpBB/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
60+
- sh -c "if [ '$EPV' != '0' -a '$NOTESTS' = '1' ]; then phpBB/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
6361
- sh -c "if [ '$NOTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php; fi"

phpunit.xml.dist

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
convertWarningsToExceptions="true"
99
processIsolation="false"
1010
stopOnFailure="false"
11-
syntaxCheck="false"
1211
verbose="true"
1312
bootstrap="../../../../tests/bootstrap.php"
1413
>
@@ -18,14 +17,11 @@
1817
<exclude>./tests/functional</exclude>
1918
</testsuite>
2019
<testsuite name="Extension Functional Tests">
21-
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">./tests/functional/</directory>
20+
<directory suffix="_test.php">./tests/functional/</directory>
2221
</testsuite>
2322
</testsuites>
2423

2524
<filter>
26-
<blacklist>
27-
<directory>./tests/</directory>
28-
</blacklist>
2925
<whitelist processUncoveredFilesFromWhitelist="true">
3026
<directory suffix=".php">./</directory>
3127
<exclude>

0 commit comments

Comments
 (0)