From: Tyson Andre Date: Fri, 27 Nov 2020 17:21:54 +0000 (-0500) Subject: Remove duplicate str_split check, fix test expectation X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74f4586540fc8452438172b8eda45ba23cfcba95;p=php Remove duplicate str_split check, fix test expectation --- diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c index 973c1763e3..203816489f 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -812,7 +812,6 @@ static zend_bool can_ct_eval_func_call(zend_string *name, uint32_t num_args, zva || zend_string_equals_literal(name, "str_contains") || zend_string_equals_literal(name, "str_ends_with") || zend_string_equals_literal(name, "str_split") - || zend_string_equals_literal(name, "str_split") || zend_string_equals_literal(name, "str_starts_with") || zend_string_equals_literal(name, "strpos") || zend_string_equals_literal(name, "substr") diff --git a/ext/opcache/tests/opt/sccp_exception2.phpt b/ext/opcache/tests/opt/sccp_exception2.phpt index 1485de52e6..9cff2b0dc2 100644 --- a/ext/opcache/tests/opt/sccp_exception2.phpt +++ b/ext/opcache/tests/opt/sccp_exception2.phpt @@ -8,6 +8,6 @@ require __DIR__ . '/sccp_exception2.inc'; Fatal error: Uncaught ValueError: version_compare(): Argument #3 ($operator) must be a valid comparison operator in %s:%d Stack trace: #0 %s(%d): version_compare('1.2', '2.1', '??') -#1 %s(%d): require('/home/nikic/php...') +#1 %s(%d): require('%s') #2 {main} thrown in %s on line %d