1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-13 20:28:44 +01:00

[ticket/15055] Display content on unexpted server error

PHPBB3-15055
This commit is contained in:
Marc Alexander 2018-01-08 21:15:24 +01:00
parent f26cf2dc1f
commit daf668a969
2 changed files with 15 additions and 10 deletions

View File

@ -7,15 +7,15 @@ services:
environment:
matrix:
- db: mssql
db_version: sql2012sp1
php: 7.0
- db: mssql
db_version: sql2014
php: 7.0
- db: mssql
db_version: sql2016
php: 7.0
# - db: mssql
# db_version: sql2012sp1
# php: 7.0
# - db: mssql
# db_version: sql2014
# php: 7.0
# - db: mssql
# db_version: sql2016
# php: 7.0
- db: mssql
db_version: sql2017
php: 7.1

View File

@ -911,10 +911,15 @@ class phpbb_functional_test_case extends phpbb_test_case
* status code. This assertion tries to catch that.
*
* @param int $status_code Expected status code
* @return null
* @return void
*/
static public function assert_response_status_code($status_code = 200)
{
if ($status_code != self::$client->getResponse()->getStatus() &&
preg_match('/^5[0-9]{2}/', self::$client->getResponse()->getStatus()))
{
self::fail('Encountered unexpected server error:\n' . self::$client->getResponse()->getContent());
}
self::assertEquals($status_code, self::$client->getResponse()->getStatus(), 'HTTP status code does not match');
}