aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/bootstrap.php2
-rw-r--r--tests/lint_test.php5
-rw-r--r--tests/test_framework/phpbb_ui_test_case.php9
-rwxr-xr-xtravis/setup-php-extensions.sh13
4 files changed, 6 insertions, 23 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 18977bac88..62f91e346e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -42,7 +42,7 @@ 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', ">=") && file_exists(__DIR__ . '/vendor/autoload.php'))
+if (file_exists(__DIR__ . '/vendor/autoload.php'))
{
require_once __DIR__ . '/vendor/autoload.php';
}
diff --git a/tests/lint_test.php b/tests/lint_test.php
index 8ab31f976c..8356389acf 100644
--- a/tests/lint_test.php
+++ b/tests/lint_test.php
@@ -45,11 +45,6 @@ class phpbb_lint_test extends phpbb_test_case
*/
public function test_lint($path)
{
- if (version_compare(PHP_VERSION, '5.3.0', '<'))
- {
- $this->markTestSkipped('phpBB uses PHP 5.3 syntax in some files, linting on PHP < 5.3 will fail');
- }
-
$cmd = sprintf('(%s -l %s) 2>&1', self::$php_binary, escapeshellarg($path));
$output = array();
$status = 1;
diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php
index 2d249f5c73..914de2e02a 100644
--- a/tests/test_framework/phpbb_ui_test_case.php
+++ b/tests/test_framework/phpbb_ui_test_case.php
@@ -52,15 +52,10 @@ 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('\Facebook\WebDriver\Remote\RemoteWebDriver'))
+ if (!class_exists('\Facebook\WebDriver\Remote\RemoteWebDriver'))
{
self::markTestSkipped(
- 'Could not find RemoteWebDriver class. ' .
- 'Run "php ../composer.phar install" from the tests folder.'
+ 'Could not find RemoteWebDriver class.'
);
}
diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh
index de27965e39..7d1400c3b3 100755
--- a/travis/setup-php-extensions.sh
+++ b/travis/setup-php-extensions.sh
@@ -42,16 +42,9 @@ function install_php_extension
php_ini_file=$(find_php_ini)
-# apc
-if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ]
-then
- echo 'Enabling APC PHP extension'
- printf "\n" | pecl install apc
- echo 'apc.enable_cli=1' >> "$php_ini_file"
-else
- echo 'Disabling Opcache'
- echo 'opcache.enable=0' >> "$php_ini_file"
-fi
+# Disable opcache for testing
+echo 'Disabling Opcache'
+echo 'opcache.enable=0' >> "$php_ini_file"
# APCu
if [ `php -r "echo (int) (version_compare(PHP_VERSION, '7.0.0-dev', '>=') && version_compare(PHP_VERSION, '7.3.0-dev', '<'));"` == "1" ]