From f3dc2a801d7e077e5e10a143b8d450b0b4a3aa11 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Mon, 28 Sep 2015 17:40:24 +0200
Subject: [ticket/14205] Bump PHP requirement to PHP 5.4

PHPBB3-14205
---
 travis/setup-database.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'travis/setup-database.sh')

diff --git a/travis/setup-database.sh b/travis/setup-database.sh
index 4ba9157d9d..3771f19073 100755
--- a/travis/setup-database.sh
+++ b/travis/setup-database.sh
@@ -13,6 +13,12 @@ set -x
 
 DB=$1
 TRAVIS_PHP_VERSION=$2
+NOTESTS=$3
+
+if [ "$NOTESTS" == '1' ]
+then
+	exit 0
+fi
 
 if [ "$DB" == "postgres" ]
 then
@@ -20,7 +26,7 @@ then
 	psql -c 'create database phpbb_tests;' -U postgres
 fi
 
-if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.4" -a "$DB" == "mysqli" ]
 then
 	mysql -e 'SET GLOBAL storage_engine=MyISAM;'
 fi
-- 
cgit v1.2.1