From e1bf699ad42333684f608bdc946f0c6eeef6f8d1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 12 Nov 2014 20:31:41 +0100
Subject: [PATCH 1/3] [ticket/13325] Update / Fix composer.lock hash.

PHPBB3-13325
---
 tests/composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/composer.lock b/tests/composer.lock
index 32d90d43fc..f714495d84 100644
--- a/tests/composer.lock
+++ b/tests/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "2affca245bd4946ca7acdf46f100af3c",
+    "hash": "cf1d8a4841e5e669b148e0df6645a788",
     "packages": [
 
     ],

From 8df63a44997a1e34575dd7f2a0d93eb47a51a562 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 12 Nov 2014 20:32:36 +0100
Subject: [PATCH 2/3] [ticket/13325] Remove whitespace at end of line.

PHPBB3-13325
---
 tests/test_framework/phpbb_ui_test_case.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php
index 702b15d50a..b23781ee21 100644
--- a/tests/test_framework/phpbb_ui_test_case.php
+++ b/tests/test_framework/phpbb_ui_test_case.php
@@ -49,7 +49,7 @@ class phpbb_ui_test_case extends phpbb_test_case
 		{
 			try {
 				$capabilities = array(\WebDriverCapabilityType::BROWSER_NAME => 'firefox');
-				self::$webDriver = RemoteWebDriver::create(self::$host . ':' . self::$port, $capabilities);	
+				self::$webDriver = RemoteWebDriver::create(self::$host . ':' . self::$port, $capabilities);
 			} catch (WebDriverCurlException $e) {
 				self::markTestSkipped('PhantomJS webserver is not running.');
 			}

From 1e4ff6105a3fc34440f5b1294e574d7f8ca7c906 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 12 Nov 2014 20:34:36 +0100
Subject: [PATCH 3/3] [ticket/13325] Make installing composer dependencies in
 tests folder optional.

Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19
here. Remove __init__ include. Composer classmap autoloading ensures classes
can be loaded.

PHPBB3-13325
---
 tests/bootstrap.php                         |  5 +++--
 tests/test_framework/phpbb_ui_test_case.php | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 65447eb95c..0e81f4372a 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -33,8 +33,9 @@ require_once 'test_framework/phpbb_test_case.php';
 require_once 'test_framework/phpbb_database_test_case.php';
 require_once 'test_framework/phpbb_database_test_connection_manager.php';
 require_once 'test_framework/phpbb_functional_test_case.php';
+require_once 'test_framework/phpbb_ui_test_case.php';
 
-if (version_compare(PHP_VERSION,'5.3.19', ">="))
+if (version_compare(PHP_VERSION, '5.3.19', ">=") && file_exists(__DIR__ . '/vendor/autoload.php'))
 {
-	require_once 'test_framework/phpbb_ui_test_case.php';
+	require_once __DIR__ . '/vendor/autoload.php';
 }
diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php
index b23781ee21..c8ac492e25 100644
--- a/tests/test_framework/phpbb_ui_test_case.php
+++ b/tests/test_framework/phpbb_ui_test_case.php
@@ -10,7 +10,7 @@
 * the docs/CREDITS.txt file.
 *
 */
-require_once __DIR__ . '/../vendor/facebook/webdriver/lib/__init__.php';
+
 require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
 
 class phpbb_ui_test_case extends phpbb_test_case
@@ -31,6 +31,18 @@ class phpbb_ui_test_case extends phpbb_test_case
 	{
 		parent::setUpBeforeClass();
 
+		if (version_compare(PHP_VERSION, '5.3.19', '<'))
+		{
+			self::markTestSkipped('UI test case requires at least PHP 5.3.19.');
+		}
+		else if (!class_exists('\RemoteWebDriver'))
+		{
+			self::markTestSkipped(
+				'Could not find RemoteWebDriver class. ' .
+				'Run "php ../composer.phar install" from the tests folder.'
+			);
+		}
+
 		self::$config = phpbb_test_case_helpers::get_test_config();
 		self::$root_url = self::$config['phpbb_functional_url'];