8 files changed, 142 insertions, 10 deletions
diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh
new file mode 100755
index 0000000000..4d420add1c
--- /dev/null
+++ b/travis/check-executable-files.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# This file is part of the phpBB Forum Software package.
+#
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
+#
+set -e
+
+DB=$1
+TRAVIS_PHP_VERSION=$2
+root="$3"
+path="${root}phpBB/"
+
+if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
+then
+	# Check the permissions of the files
+
+	# The following variables MUST NOT contain any wildcard
+	# Directories to skip
+	directories_skipped="-path ${path}develop -o -path ${path}vendor"
+
+	# Files to skip
+	files_skipped="-false"
+
+	# Files which have to be executable
+	executable_files="-path ${path}bin/*"
+
+	incorrect_files=$( 								\
+		find ${path}								\
+			'('										\
+				'('									\
+					${directories_skipped}			\
+				')'									\
+				-a -type d -prune -a -type f		\
+			')' -o 									\
+			'('										\
+				-type f -a							\
+				-not '('							\
+					${files_skipped}				\
+				')' -a								\
+				'('									\
+					'('								\
+						'('							\
+							${executable_files}		\
+						')' -a						\
+						-not -perm +100				\
+					')' -o							\
+					'('								\
+						-not '('					\
+							${executable_files}		\
+						')' -a						\
+						-perm +111					\
+					')'								\
+				')'									\
+			')'										\
+		)
+
+	if [ "${incorrect_files}" != '' ]
+	then
+		echo "The following files do not have proper permissions:";
+		ls -la ${incorrect_files}
+		exit 1;
+	fi
+fi
diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh
index 31848dc9e7..bb070ccc27 100755
--- a/travis/check-image-icc-profiles.sh
+++ b/travis/check-image-icc-profiles.sh
@@ -13,7 +13,7 @@ set -e
 DB=$1
 TRAVIS_PHP_VERSION=$2
 
-if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
 then
 	find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | \
 		parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}'
diff --git a/travis/check-sami-parse-errors.sh b/travis/check-sami-parse-errors.sh
new file mode 100755
index 0000000000..847c54a61a
--- /dev/null
+++ b/travis/check-sami-parse-errors.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# This file is part of the phpBB Forum Software package.
+#
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
+#
+set -e
+
+DB=$1
+TRAVIS_PHP_VERSION=$2
+
+if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
+then
+	# Workarounds for
+	# https://github.com/fabpot/Sami/issues/116
+	# and
+	# https://github.com/fabpot/Sami/issues/117
+	errors=$(
+		unbuffer phpBB/vendor/bin/sami.php parse travis/sami.conf.php -v | \
+		sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | \
+		grep "ERROR: " | \
+		tee /dev/tty | \
+		wc -l
+	)
+	if [ "$errors" != "0" ]
+	then
+		exit 1
+	fi
+fi
diff --git a/travis/sami.conf.php b/travis/sami.conf.php
new file mode 100644
index 0000000000..8e7cfa42e9
--- /dev/null
+++ b/travis/sami.conf.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+require __DIR__ . '/../build/' . basename(__FILE__);
+
+// Removing the versions array key will make Sami use the current branch.
+unset($config['versions']);
+
+return new Sami\Sami($iterator, $config);
diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh
index 3655d6e952..c0defe44ef 100755
--- a/travis/setup-php-extensions.sh
+++ b/travis/setup-php-extensions.sh
@@ -42,12 +42,6 @@ function install_php_extension
 
 php_ini_file=$(find_php_ini)
 
-# disable broken opcache on PHP 5.5.7 and 5.5.8
-if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.9', '<');"` == "1" ]
-then
-	sed -i '/opcache.so/d' "$php_ini_file"
-fi
-
 # apc
 if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ]
 then
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh
index e2cf6eeda2..d829772196 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -14,9 +14,10 @@ set -x
 DB=$1
 TRAVIS_PHP_VERSION=$2
 
-if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
 then
 	travis/setup-exiftool.sh
+	travis/setup-unbuffer.sh
 fi
 
 if [ "$DB" == "mariadb" ]
diff --git a/travis/setup-unbuffer.sh b/travis/setup-unbuffer.sh
new file mode 100755
index 0000000000..4423d1b8b6
--- /dev/null
+++ b/travis/setup-unbuffer.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# This file is part of the phpBB Forum Software package.
+#
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
+#
+set -e
+
+sudo apt-get update
+sudo apt-get install -y expect-dev
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index ea1929a5b0..ab045431cc 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -72,8 +72,11 @@ echo "
 		index	index.php index.html;
 
 		location ~ \.php {
-			fastcgi_pass	unix:$APP_SOCK;
-			include			fastcgi_params;
+			include							fastcgi_params;
+			fastcgi_split_path_info			^(.+\.php)(/.*)$;
+			fastcgi_param PATH_INFO			\$fastcgi_path_info;
+			fastcgi_param SCRIPT_FILENAME	\$document_root\$fastcgi_script_name;
+			fastcgi_pass					unix:$APP_SOCK;
 		}
 	}
 " | sudo tee $NGINX_CONF > /dev/null