aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-01-29 11:05:45 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-01 18:54:08 +0100
commit66143e99bee0931b77c50d9e3b1fbd0b9629e48d (patch)
treeafac0e0f0aae352ee16329803e770c66a2381b2c /tests
parent4a2e203a80a4ab8f7983b8b203de38b37bd8764c (diff)
downloadforums-66143e99bee0931b77c50d9e3b1fbd0b9629e48d.tar
forums-66143e99bee0931b77c50d9e3b1fbd0b9629e48d.tar.gz
forums-66143e99bee0931b77c50d9e3b1fbd0b9629e48d.tar.bz2
forums-66143e99bee0931b77c50d9e3b1fbd0b9629e48d.tar.xz
forums-66143e99bee0931b77c50d9e3b1fbd0b9629e48d.zip
[ticket/15055] Further fixes to ensure PHP 7.1 & mssql compatibility
PHPBB3-15055
Diffstat (limited to 'tests')
-rw-r--r--tests/console/user/base.php5
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php1
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index b84c0bb267..6e5436fb9d 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -34,6 +34,11 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
{
global $auth, $db, $cache, $config, $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpEx;
+ if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
+ {
+ $this->markTestSkipped('Unable to test console feature on OS other than Linux.');
+ }
+
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$phpbb_container = new phpbb_mock_container_builder();
$phpbb_container->set('cache.driver', new phpbb_mock_cache());
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index c9943c4302..4e22e7b039 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -509,7 +509,6 @@ class phpbb_functional_test_case extends phpbb_test_case
else
{
$db->sql_multi_insert(STYLES_TABLE, array(array(
- 'style_id' => $style_id,
'style_name' => $style_path,
'style_copyright' => '',
'style_active' => 1,