archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

mb_detect_encoding(): Use proper array|string parameter

Browse source 
Needed to add support for nullabiltiy in some places.
This commit is contained in:
Nikita Popov 2020-03-30 16:06:41 +02:00
parent 47ddd95836
commit 50d07ff28c
5 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/dev/gen_stub.php
View file

@ -373,9 +373,10 @@ function parseFunctionLike(string $name, Node\FunctionLike $func, ?string $cond)
throw new Exception("Error in function $name: only the last parameter can be variadic");
}
$type = $param->type ? Type::fromNode($param->type) : null;
if ($param->default instanceof Expr\ConstFetch &&
$param->default->name->toLowerString() === "null" &&
$param->type && !($param->type instanceof Node\NullableType)
$type && !$type->isNullable()
) {
throw new Exception(
"Parameter $varName of function $name has null default, but is not nullable");
@ -387,7 +388,7 @@ function parseFunctionLike(string $name, Node\FunctionLike $func, ?string $cond)
$varName,
$sendBy,
$param->variadic,
$param->type ? Type::fromNode($param->type) : null
$type
);
if (!$param->default && !$param->variadic) {
$numRequiredArgs = $i + 1;