Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/BuiltinParamNames.php
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,15 @@ public static function forFunction(string $name): ?array
return ['string', 'start', 'width', 'trimmarker', 'encoding'];
case 'mb_convert_encoding':
return ['string', 'to_encoding', 'from_encoding'];
// php-src ext/mbstring/mbstring.stub.php — Reflection had empty params (#23291)
case 'mb_chr':
return ['codepoint', 'encoding'];
case 'mb_ord':
return ['string', 'encoding'];
case 'mb_scrub':
return ['string', 'encoding'];
case 'mb_str_split':
return ['string', 'length', 'encoding'];
case 'mb_trim':
case 'mb_ltrim':
case 'mb_rtrim':
Expand Down
2 changes: 1 addition & 1 deletion prelinked/bootstrap-gen0/.m3_compiler_lib_sidecar.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7b1884f9ccd8797602e3db7a9461a56f58d70a72
32e122fc45eae93276634011bfdb7ff1ba8c8911
23 changes: 23 additions & 0 deletions test/compliance/cases/mbstring/named_args_mb_chr_ord.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
mb_chr/mb_ord named arguments (VM, issue #23291)
--FILE--
<?php
var_export(mb_chr(codepoint: 0x41));
echo PHP_EOL;
var_export(mb_ord(string: 'A'));
echo PHP_EOL;
$rf = new ReflectionFunction('mb_chr');
foreach ($rf->getParameters() as $p) {
echo $p->getName(), PHP_EOL;
}
$rf = new ReflectionFunction('mb_ord');
foreach ($rf->getParameters() as $p) {
echo $p->getName(), PHP_EOL;
}
--EXPECT--
'A'
65
codepoint
encoding
string
encoding
21 changes: 21 additions & 0 deletions test/repro/issue_23291_mb_chr_ord_named_params.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php
// Repro #23291 — mb_chr/mb_ord Zend stub named parameters
$chrNames = [];
foreach ((new ReflectionFunction('mb_chr'))->getParameters() as $p) {
$chrNames[] = $p->getName();
}
$ordNames = [];
foreach ((new ReflectionFunction('mb_ord'))->getParameters() as $p) {
$ordNames[] = $p->getName();
}
$namedChr = mb_chr(codepoint: 0x41);
$namedOrd = mb_ord(string: 'A');
$positionalChr = mb_chr(0x41);
$positionalOrd = mb_ord('A');
$ok = ['codepoint', 'encoding'] === $chrNames
&& ['string', 'encoding'] === $ordNames
&& 'A' === $namedChr
&& 65 === $namedOrd
&& $namedChr === $positionalChr
&& $namedOrd === $positionalOrd;
echo $ok ? "ok\n" : "fail\n";
1 change: 1 addition & 0 deletions test/selfhost/compiler_lib_spine_smoke/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -4362,6 +4362,7 @@
require_once __DIR__.'/../../../ext/xsl/XslExtensionPolicy.php';
require_once __DIR__.'/../../../ext/xsl/XsltClassMethod.php';
require_once __DIR__.'/../../../ext/xsl/XsltHostBridge.php';
require_once __DIR__.'/../../../ext/xsl/XsltPhpFunctionBridge.php';
require_once __DIR__.'/../../../ext/xsl/XsltProcessorConstruct.php';
require_once __DIR__.'/../../../ext/xsl/XsltProcessorGetParameter.php';
require_once __DIR__.'/../../../ext/xsl/XsltProcessorGetSecurityPrefs.php';
Expand Down
24 changes: 24 additions & 0 deletions test/unit/BuiltinParamNamesAliasTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,30 @@ public function testChrZendStubNamedParams(): void
self::assertFalse(BuiltinParamNames::lookupNamedParamIndex($names, 'ascii', 'chr'));
}

/** @covers issue #23291 */
public function testMbChrOrdZendStubNamedParams(): void
{
$chr = BuiltinParamNames::forFunction('mb_chr');
self::assertSame(['codepoint', 'encoding'], $chr);
self::assertSame(0, BuiltinParamNames::lookupNamedParamIndex($chr, 'codepoint', 'mb_chr'));
self::assertSame(1, BuiltinParamNames::lookupNamedParamIndex($chr, 'encoding', 'mb_chr'));

$ord = BuiltinParamNames::forFunction('mb_ord');
self::assertSame(['string', 'encoding'], $ord);
self::assertSame(0, BuiltinParamNames::lookupNamedParamIndex($ord, 'string', 'mb_ord'));
self::assertSame(1, BuiltinParamNames::lookupNamedParamIndex($ord, 'encoding', 'mb_ord'));

$scrub = BuiltinParamNames::forFunction('mb_scrub');
self::assertSame(['string', 'encoding'], $scrub);
self::assertSame(0, BuiltinParamNames::lookupNamedParamIndex($scrub, 'string', 'mb_scrub'));

$split = BuiltinParamNames::forFunction('mb_str_split');
self::assertSame(['string', 'length', 'encoding'], $split);
self::assertSame(0, BuiltinParamNames::lookupNamedParamIndex($split, 'string', 'mb_str_split'));
self::assertSame(1, BuiltinParamNames::lookupNamedParamIndex($split, 'length', 'mb_str_split'));
self::assertSame(2, BuiltinParamNames::lookupNamedParamIndex($split, 'encoding', 'mb_str_split'));
}

/** @covers issue #23205 */
public function testHashEqualsZendStubNamedParams(): void
{
Expand Down
Loading