From 50d07ff28c9e91f310bf6145b657fccd17b09bec Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 30 Mar 2020 16:06:41 +0200 Subject: mb_detect_encoding(): Use proper array|string parameter Needed to add support for nullabiltiy in some places. --- scripts/dev/gen_stub.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/dev/gen_stub.php b/scripts/dev/gen_stub.php index 253c188b2a..f3a9a492b0 100755 --- a/scripts/dev/gen_stub.php +++ b/scripts/dev/gen_stub.php @@ -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; -- cgit v1.2.1