makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 20:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-11-20 17:54:40 +01:00
commit 1bbb6ff031
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -23,6 +23,8 @@ matrix:
env: DB=mysqli env: DB=mysqli
- php: 7.4 - php: 7.4
env: DB=mysqli;MYSQL8=1 env: DB=mysqli;MYSQL8=1
- php: 8.0snapshot
env: DB=mysqli
- php: nightly - php: nightly
env: DB=mysqli env: DB=mysqli
allow_failures: allow_failures:

2
travis/setup-phpbb.sh
View file

@ -44,7 +44,7 @@ fi
cd phpBB cd phpBB
php ../composer.phar install --dev --no-interaction php ../composer.phar install --dev --no-interaction
if [ "$TRAVIS_PHP_VERSION" == "nightly" ] if [[ "$TRAVIS_PHP_VERSION" =~ ^nightly$ || "$TRAVIS_PHP_VERSION" =~ ^8 ]]
then then
php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \ php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \
&& php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-all-dependencies --ignore-platform-reqs && php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-all-dependencies --ignore-platform-reqs