From a6c9c7c2b8cfd4db8fcdcb66b908feac31b600af Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 27 Sep 2019 10:39:21 +0200 Subject: Handle resources used as array keys consistently Resources used as array keys are generally handled by throwing a notice and converting the resource to the resource handle. The only exception is the [$resource => null] syntax, where this was treated as an illegal offset type instead. However, this also only happened for VM evaluations, the AST evaluator did handle resources correctly. --- scripts/dev/bless_tests.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/dev/bless_tests.php b/scripts/dev/bless_tests.php index 25a4843c07..fbbfe505c9 100755 --- a/scripts/dev/bless_tests.php +++ b/scripts/dev/bless_tests.php @@ -54,6 +54,10 @@ function normalizeOutput(string $out): string { $out = preg_replace('/^#(\d+) \/.+\(\d+\):/m', '#$1 %s(%d):', $out); $out = preg_replace('/Resource id #\d+/', 'Resource id #%d', $out); $out = preg_replace('/resource\(\d+\) of type/', 'resource(%d) of type', $out); + $out = preg_replace( + '/Resource ID#\d+ used as offset, casting to integer \(\d+\)/', + 'Resource ID#%d used as offset, casting to integer (%d)', + $out); $out = preg_replace('/string\(\d+\) "([^"]*%d)/', 'string(%d) "$1', $out); return $out; } -- cgit v1.2.1