Merge branch '3.1.x'

marc1706 · marc1706 · commit 9ebbf2099b79 · 2015-10-14T10:42:57.000+02:00
Conflicts:
	.travis.yml
diff --git a/.travis.yml b/.travis.yml
@@ -48,3 +48,4 @@ script:
   - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
   - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
   - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
+  - php -i | grep opcache
diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh
@@ -48,6 +48,9 @@ then
 	echo 'Enabling APC PHP extension'
 	register_php_extension 'apc' "$php_ini_file"
 	echo 'apc.enable_cli=1' >> "$php_ini_file"
+else
+	echo 'Disabling Opcache'
+	echo 'opcache.enable=0' >> "$php_ini_file"
 fi
 
 # redis
