makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15055] Further fixes to ensure PHP 7.1 & mssql compatibility

Browse source 
PHPBB3-15055
This commit is contained in:
Marc Alexander 2017-01-29 11:05:45 +01:00
parent 4a2e203a80
commit 66143e99be
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.appveyor.yml
View file

@ -6,10 +6,7 @@ services:
init: init:
- SET PATH=c:\php;%PATH% - SET PATH=c:\php;%PATH%
- SET COMPOSER_NO_INTERACTION=1
- SET SYMFONY_DEPRECATIONS_HELPER=strict
- SET ANSICON=121x90 (121x90) - 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 - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
before_test: before_test:
@ -19,6 +16,7 @@ before_test:
- cd c:\tools\php - cd c:\tools\php
- ps: cat php.ini-production | %{$_ -replace "memory_limit = 128M","memory_limit = 1024M"} | Out-File -Encoding "Default" php.ini - 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 date.timezone="UTC" >> php.ini
- echo display_errors=On >> php.ini
- echo extension_dir=ext >> php.ini - echo extension_dir=ext >> php.ini
- echo extension=php_openssl.dll >> php.ini - echo extension=php_openssl.dll >> php.ini
- echo extension=php_mbstring.dll >> php.ini - echo extension=php_mbstring.dll >> php.ini
@ -39,4 +37,4 @@ before_test:
test_script: test_script:
- cd c:\projects\phpbb - cd c:\projects\phpbb
- php -e phpBB\vendor\phpunit\phpunit\phpunit --verbose --stop-on-error - php -e phpBB\vendor\phpunit\phpunit\phpunit --verbose

2
phpBB/includes/acp/acp_bbcodes.php
View file

@ -253,7 +253,7 @@ class acp_bbcodes
if ($row) 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... // Make sure it is greater than the core bbcode ids...
if ($bbcode_id <= NUM_CORE_BBCODES) if ($bbcode_id <= NUM_CORE_BBCODES)

5
tests/console/user/base.php
View file

@ -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; 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_dispatcher = new phpbb_mock_event_dispatcher();
$phpbb_container = new phpbb_mock_container_builder(); $phpbb_container = new phpbb_mock_container_builder();
$phpbb_container->set('cache.driver', new phpbb_mock_cache()); $phpbb_container->set('cache.driver', new phpbb_mock_cache());

1
tests/test_framework/phpbb_functional_test_case.php
View file

@ -509,7 +509,6 @@ class phpbb_functional_test_case extends phpbb_test_case
else else
{ {
$db->sql_multi_insert(STYLES_TABLE, array(array( $db->sql_multi_insert(STYLES_TABLE, array(array(
'style_id' => $style_id,
'style_name' => $style_path, 'style_name' => $style_path,
'style_copyright' => '', 'style_copyright' => '',
'style_active' => 1, 'style_active' => 1,