wip

Author: Litarnus

tests/phpt-oom/out_of_memory_fatal_error_increases_memory_limit.phpt

@@ -71,9 +71,7 @@ for ($i = 0; $i < 100000000; ++$i) {
     $array[] = 'sentry';
 }
 --EXPECTREGEX--
-Before OOM memory limit: 67108864
-Fatal error: Allowed memory size of 67108864 bytes exhausted \(tried to allocate 67108872 bytes\) in .* on line 66
-(Stack trace:)?
-(#0 {main})?
+^Before OOM memory limit: 67108864
+Fatal error: Allowed memory size of 67108864 bytes exhausted \(tried to allocate \d+ bytes\) in [^\r\n]+ on line \d+(?:\RStack trace:\R(?:#\d+[^\r\n]*)+)?
 Transport called
-After OOM memory limit: 72351744
+After OOM memory limit: 72351744$

tests/phpt/error_handler_captures_fatal_error.phpt

@@ -68,8 +68,6 @@ final class TestClass implements \JsonSerializable
 }
 ?>
 --EXPECTREGEX--
-Fatal error: Class Sentry\\Tests\\TestClass contains 1 abstract method and must therefore be declared abstract or implement the remaining methods? \(JsonSerializable::jsonSerialize\) in .* on line 63
-(Stack trace:)?
-(#0 {main})?
+Fatal error: Class Sentry\\Tests\\TestClass contains 1 abstract method and must therefore be declared abstract or implement the remaining methods? \(JsonSerializable::jsonSerialize\) in .* on line 63(?:\RStack trace:\R(?:#\d+[^\r\n]*)+)?
 Transport called
 Fatal error listener called

tests/phpt/error_handler_captures_out_of_memory_fatal_error.phpt

@@ -34,9 +34,6 @@ $foo = str_repeat('x', 1024 * 1024 * 1024);
 ?>
 --EXPECTREGEX--
 Before OOM memory limit: 67108864
-Fatal error: Allowed memory size of 67108864 bytes exhausted \(tried to allocate 1073741856 bytes\) in .* on line 28
-(Stack trace:)?
-(#0 Standard input code\(28\): str_repeat\('x', 1073741824\))?
-(#1 {main})?
+Fatal error: Allowed memory size of 67108864 bytes exhausted \(tried to allocate 1073741856 bytes\) in .* on line 28(?:\RStack trace:\R(?:#\d+.*\R?)+)?
 Fatal error listener called
 After OOM memory limit: 67108864

tests/phpt/fatal_error_integration_captures_fatal_error.phpt

@@ -58,7 +58,5 @@ final class TestClass implements \JsonSerializable
 }
 ?>
 --EXPECTREGEX--
-^Fatal error: Class Sentry\\Tests\\TestClass contains 1 abstract methods? and must therefore be declared abstract or implement the remaining methods? \(JsonSerializable::jsonSerialize\) in .* on line 53
-(Stack trace:)?
-(#0 {main})?
+^Fatal error: Class Sentry\\Tests\\TestClass contains 1 abstract methods? and must therefore be declared abstract or implement the remaining methods? \(JsonSerializable::jsonSerialize\) in .* on line 53(?:\RStack trace:\R(?:#\d+[^\r\n]*)+)?
 Transport called\R?$