Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-06-28 21:10:18 +02:00
commit 46aa5e65e4

View file

@ -14,8 +14,9 @@ set -x
DB=$1 DB=$1
TRAVIS_PHP_VERSION=$2 TRAVIS_PHP_VERSION=$2
EXTNAME=$3 EXTNAME=$3
NOTESTS=$4
if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] if [ "$NOTESTS" == "1" ]
then then
phpBB/vendor/bin/phpcs \ phpBB/vendor/bin/phpcs \
-s \ -s \