diff options
Diffstat (limited to 'tests/datetime')
| -rw-r--r-- | tests/datetime/from_format_test.php | 16 | 
1 files changed, 14 insertions, 2 deletions
| diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index 8968619bb5..32b88ff588 100644 --- a/tests/datetime/from_format_test.php +++ b/tests/datetime/from_format_test.php @@ -37,7 +37,11 @@ class phpbb_datetime_from_format_test extends phpbb_test_case  	*/  	public function test_from_format($timezone, $format, $expected)  	{ -		$user = new \phpbb\user('\phpbb\datetime'); +		global $phpbb_root_path, $phpEx; + +		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); +		$lang = new \phpbb\language\language($lang_loader); +		$user = new \phpbb\user($lang, '\phpbb\datetime');  		$user->timezone = new DateTimeZone($timezone);  		$user->lang['datetime'] = array(  			'TODAY'		=> 'Today', @@ -107,7 +111,15 @@ class phpbb_datetime_from_format_test extends phpbb_test_case  	 */  	public function test_relative_format_date($timestamp, $forcedate, $expected)  	{ -		$user = new \phpbb\user('\phpbb\datetime'); +		global $phpbb_root_path, $phpEx; + +		// This magically fixes the segmentation fault error on PHP7 tests +		// while date_default_timezone_set('UTC') does not +		date_default_timezone_set('Europe/Paris'); + +		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); +		$lang = new \phpbb\language\language($lang_loader); +		$user = new \phpbb\user($lang, '\phpbb\datetime');  		$user->timezone = new DateTimeZone('UTC');  		$user->lang['datetime'] = array(  			'TODAY'		=> 'Today', | 
