-
Notifications
You must be signed in to change notification settings - Fork 8k
ext/pcre: Refactor preg_replace_callback(_array)()
to not pass a useless FCI
#17365
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
69283ba
ext/pcre: Refactor php_pcre_replace_func_impl() to not rely on an FCI
Girgias 61c0db9
ext/pcre: Refactor populate_subpat_array() to take subject as a HashT…
Girgias ca2af27
ext/pcre: Refactor php_pcre_replace_func_impl()
Girgias d759628
ext/pcre: Refactor php_pcre_replace_func()
Girgias 0980e45
ext/pcre: Refactor php_replace_in_subject_func()
Girgias f3c981a
ext/pcre: Refactor preg_replace_func_impl()
Girgias 8766b4c
ext/pcre: Add trampoline tests for preg_replace_callback(_array)()
Girgias 10435d2
ext/pcre: Handle trampolines properly for preg_replace_callback(_arra…
Girgias 06a72af
Fix test
Girgias e60ebc0
Revert FCI passing removal
Girgias File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
111 changes: 111 additions & 0 deletions
111
ext/pcre/tests/preg_replace_callback_array_trampoline.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
--TEST-- | ||
preg_replace_callback_array() with a trampoline | ||
--FILE-- | ||
<?php | ||
|
||
class TrampolineTest { | ||
public function __call(string $name, array $arguments): string { | ||
echo 'Trampoline for ', $name, PHP_EOL; | ||
if ($name === 'trampolineThrow') { | ||
throw new Exception('boo'); | ||
} | ||
return "'" . $arguments[0][0] . "'"; | ||
} | ||
} | ||
$o = new TrampolineTest(); | ||
$callback = [$o, 'trampoline']; | ||
$callbackThrow = [$o, 'trampolineThrow']; | ||
|
||
$regexesToTest = [ | ||
[ | ||
'@\b\w{1,2}\b@' => $callback, | ||
'~\A.~' => $callback, | ||
], | ||
[ | ||
'@\b\w{1,2}\b@' => $callback, | ||
'~\A.~' => $trampolineThrow, | ||
], | ||
[ | ||
'@\b\w{1,2}\b@' => $callback, | ||
'~\A.~' => new stdClass(), | ||
], | ||
]; | ||
|
||
$subjectsToTest = [ | ||
[ | ||
'a b3 bcd', | ||
'v' => 'aksfjk', | ||
12 => 'aa bb', | ||
['xyz'], | ||
], | ||
'a b3 bcd', | ||
[ | ||
new stdClass(), | ||
], | ||
new stdClass(), | ||
]; | ||
|
||
foreach ($regexesToTest as $regex) { | ||
foreach ($subjectsToTest as $subject) { | ||
try { | ||
$matches = preg_replace_callback_array($regex, $subject); | ||
var_dump($matches); | ||
} catch (Throwable $e) { | ||
echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
} | ||
} | ||
} | ||
|
||
?> | ||
--EXPECTF-- | ||
Warning: Undefined variable $trampolineThrow in %s on line %d | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
Girgias marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
array(4) { | ||
[0]=> | ||
string(14) "'''a' 'b3' bcd" | ||
["v"]=> | ||
string(8) "'a'ksfjk" | ||
[12]=> | ||
string(11) "'''aa' 'bb'" | ||
[13]=> | ||
string(7) "'A'rray" | ||
} | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
string(14) "'''a' 'b3' bcd" | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback_array(): Argument #2 ($subject) must be of type array|string, stdClass given | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
TypeError: preg_replace_callback_array(): Argument #1 ($pattern) must contain only valid callbacks | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
TypeError: preg_replace_callback_array(): Argument #1 ($pattern) must contain only valid callbacks | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback_array(): Argument #2 ($subject) must be of type array|string, stdClass given | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
TypeError: preg_replace_callback_array(): Argument #1 ($pattern) must contain only valid callbacks | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
TypeError: preg_replace_callback_array(): Argument #1 ($pattern) must contain only valid callbacks | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback_array(): Argument #2 ($subject) must be of type array|string, stdClass given |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
--TEST-- | ||
preg_replace_callback() with a trampoline | ||
--FILE-- | ||
<?php | ||
|
||
class TrampolineTest { | ||
public function __call(string $name, array $arguments): string { | ||
echo 'Trampoline for ', $name, PHP_EOL; | ||
if ($name === 'trampolineThrow') { | ||
throw new Exception('boo'); | ||
} | ||
return "'" . $arguments[0][0] . "'"; | ||
} | ||
} | ||
$o = new TrampolineTest(); | ||
$callback = [$o, 'trampoline']; | ||
$callbackThrow = [$o, 'trampolineThrow']; | ||
|
||
$regexesToTest = [ | ||
[ | ||
'@\b\w{1,2}\b@', | ||
'~\A.~', | ||
], | ||
'@\b\w{1,2}\b@', | ||
[ | ||
new stdClass(), | ||
], | ||
]; | ||
|
||
$subjectsToTest = [ | ||
[ | ||
'a b3 bcd', | ||
'v' => 'aksfjk', | ||
12 => 'aa bb', | ||
['xyz'], | ||
], | ||
'a b3 bcd', | ||
[ | ||
new stdClass(), | ||
], | ||
new stdClass(), | ||
]; | ||
|
||
foreach ([$callback, $callbackThrow] as $fn) { | ||
foreach ($regexesToTest as $regex) { | ||
foreach ($subjectsToTest as $subject) { | ||
try { | ||
$matches = preg_replace_callback($regex, $fn, $subject); | ||
var_dump($matches); | ||
} catch (Throwable $e) { | ||
echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
} | ||
} | ||
} | ||
} | ||
|
||
?> | ||
--EXPECTF-- | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
Trampoline for trampoline | ||
array(4) { | ||
[0]=> | ||
string(14) "'''a' 'b3' bcd" | ||
["v"]=> | ||
string(8) "'a'ksfjk" | ||
[12]=> | ||
string(11) "'''aa' 'bb'" | ||
[13]=> | ||
string(7) "'A'rray" | ||
} | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
string(14) "'''a' 'b3' bcd" | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback(): Argument #3 ($subject) must be of type array|string, stdClass given | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
array(4) { | ||
[0]=> | ||
string(12) "'a' 'b3' bcd" | ||
["v"]=> | ||
string(6) "aksfjk" | ||
[12]=> | ||
string(9) "'aa' 'bb'" | ||
[13]=> | ||
string(5) "Array" | ||
} | ||
Trampoline for trampoline | ||
Trampoline for trampoline | ||
string(12) "'a' 'b3' bcd" | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback(): Argument #3 ($subject) must be of type array|string, stdClass given | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
Error: Object of class stdClass could not be converted to string | ||
Error: Object of class stdClass could not be converted to string | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback(): Argument #3 ($subject) must be of type array|string, stdClass given | ||
Trampoline for trampolineThrow | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
Exception: boo | ||
Trampoline for trampolineThrow | ||
Exception: boo | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback(): Argument #3 ($subject) must be of type array|string, stdClass given | ||
Trampoline for trampolineThrow | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
Exception: boo | ||
Trampoline for trampolineThrow | ||
Exception: boo | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback(): Argument #3 ($subject) must be of type array|string, stdClass given | ||
|
||
Warning: Array to string conversion in %s on line %d | ||
Error: Object of class stdClass could not be converted to string | ||
Error: Object of class stdClass could not be converted to string | ||
Error: Object of class stdClass could not be converted to string | ||
TypeError: preg_replace_callback(): Argument #3 ($subject) must be of type array|string, stdClass given |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.