Skip to content

Commit 87dcae4

Browse files
committed
Merge remote-tracking branch 'upstream/master' into upstream_rfc/scoped_rng_for_pr
2 parents 279227c + 63912b5 commit 87dcae4

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

Zend/Optimizer/zend_func_infos.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ static const func_info_t func_infos[] = {
572572
F1("str_rot13", MAY_BE_STRING),
573573
F1("str_shuffle", MAY_BE_STRING),
574574
F1("str_word_count", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_LONG),
575-
F1("str_split", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
575+
FN("str_split", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
576576
F1("strpbrk", MAY_BE_STRING|MAY_BE_FALSE),
577577
F1("utf8_encode", MAY_BE_STRING),
578578
F1("utf8_decode", MAY_BE_STRING),

ext/standard/basic_functions.stub.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,6 @@ function str_word_count(string $string, int $format = 0, ?string $characters = n
996996

997997
/**
998998
* @return array<int, string>
999-
* @refcount 1
1000999
* @compile-time-eval
10011000
*/
10021001
function str_split(string $string, int $length = 1): array {}

ext/standard/basic_functions_arginfo.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)