Remove duplicate str_split check, fix test expectation

diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c
index 973c1763e363a8e3db1cc5ba56bbd0efcec5ba2f..203816489fc789b093a8fbbd94d043eeda2a56ea 100644 (file)
--- 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 1485de52e6a0d63116aadae51ac21656fdcd23d0..9cff2b0dc2be0f9721754dcc7cea801d5cbd7aa6 100644 (file)
--- 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