From 9860cf6b165f71b58c69da0bfc42e27bea1c24c9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 23 Jan 2013 00:26:38 +0100
Subject: [PATCH] [ticket/11337] Only run functional tests on 5.3.19 or higher.
 No FPM otherwise.

There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19,
which is what 5.3 is currently aliased to.

PHPBB3-11337
---
 .travis.yml                        | 2 +-
 travis/phpunit-mysql-travis.xml    | 2 +-
 travis/phpunit-postgres-travis.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09c5059749..0bb6920412 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_script:
   - cd phpBB
   - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev; fi"
   - cd ..
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then travis/setup-webserver.sh; fi"
+  - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
 
 script:
   - phpunit --configuration travis/phpunit-$DB-travis.xml
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index df97f1c0f0..179a2a358e 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -17,7 +17,7 @@
 			<exclude>tests/functional</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
 	</testsuites>
 
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 49c001b717..12e20547ba 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -17,7 +17,7 @@
 			<exclude>tests/functional</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
 	</testsuites>