diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-29 11:05:45 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-01 18:54:08 +0100 |
| commit | 66143e99bee0931b77c50d9e3b1fbd0b9629e48d (patch) | |
| tree | afac0e0f0aae352ee16329803e770c66a2381b2c | |
| parent | 4a2e203a80a4ab8f7983b8b203de38b37bd8764c (diff) | |
| download | forums-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
| -rw-r--r-- | .appveyor.yml | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 2 | ||||
| -rw-r--r-- | tests/console/user/base.php | 5 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 5a4b2b4951..9ca7aee8a0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,10 +6,7 @@ services: init: - SET PATH=c:\php;%PATH% - - SET COMPOSER_NO_INTERACTION=1 - - SET SYMFONY_DEPRECATIONS_HELPER=strict - SET ANSICON=121x90 (121x90) - - SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f before_test: @@ -19,6 +16,7 @@ before_test: - cd c:\tools\php - ps: cat php.ini-production | %{$_ -replace "memory_limit = 128M","memory_limit = 1024M"} | Out-File -Encoding "Default" php.ini - echo date.timezone="UTC" >> php.ini + - echo display_errors=On >> php.ini - echo extension_dir=ext >> php.ini - echo extension=php_openssl.dll >> php.ini - echo extension=php_mbstring.dll >> php.ini @@ -39,4 +37,4 @@ before_test: test_script: - cd c:\projects\phpbb - - php -e phpBB\vendor\phpunit\phpunit\phpunit --verbose --stop-on-error + - php -e phpBB\vendor\phpunit\phpunit\phpunit --verbose diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 18d574081a..e9d96bdecc 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -253,7 +253,7 @@ class acp_bbcodes if ($row) { - $bbcode_id = $row['max_bbcode_id'] + 1; + $bbcode_id = (int) $row['max_bbcode_id'] + 1; // Make sure it is greater than the core bbcode ids... if ($bbcode_id <= NUM_CORE_BBCODES) 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, |