Skip to content

Merge upstream #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alkarex merged 3 commits into from
Jun 11, 2026
Merged

Merge upstream #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51a716f
IRI: Fix null warning on PHP 8.5 (#979)
Alkarex Jun 11, 2026
26903c4
utils/PHPStan: Fix `phpstanApi.instanceofType` (#969)
jtojnar Jun 11, 2026
9373c68
Merge branch 'master' into merge-upstream
Alkarex Jun 11, 2026
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
2 changes: 1 addition & 1 deletion src/IRI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ public function get_iri()
}
if ($this->ipath !== '') {
$iri .= $this->ipath;
} elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '') {
} elseif ($this->scheme !== null && !empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '') {
$iri .= $this->normalization[$this->scheme]['ipath'];
}
if ($this->iquery !== null) {
Expand Down
26 changes: 16 additions & 10 deletions utils/PHPStan/RegistryCallMethodReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
use PHPStan\Type\Type;
use PHPStan\Reflection\ReflectionProvider;
use PhpParser\Node\Expr\MethodCall;
use PHPStan\Type\Constant\ConstantStringType;
use PHPStan\Type\Constant\ConstantArrayType;
use PHPStan\Type\ArrayType;
use PHPStan\Type\MixedType;

/**
Expand Down Expand Up @@ -58,19 +55,21 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method

$classType = $scope->getType($classNameArg);
$methodType = $scope->getType($methodNameArg);
$classStrings = $classType->getConstantStrings();
$methodStrings = $methodType->getConstantStrings();

if (!$classType instanceof ConstantStringType || !$methodType instanceof ConstantStringType) {
if (count($classStrings) !== 1 || count($methodStrings) !== 1) {
return new MixedType();
}

$className = $classType->getValue();
$className = $classStrings[0]->getValue();
if (!$this->reflectionProvider->hasClass($className)) {
return new MixedType();
}

$classReflection = $this->reflectionProvider->getClass($className);

$methodName = $methodType->getValue();
$methodName = $methodStrings[0]->getValue();
if (!$classReflection->hasMethod($methodName)) {
return new MixedType();
}
Expand All @@ -81,10 +80,17 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
if ($argumentsArg !== null) {
$argumentsType = $scope->getType($argumentsArg);

if ($argumentsType instanceof ConstantArrayType) {
$argumentTypes = $argumentsType->getValueTypes();
} elseif ($argumentsType instanceof ArrayType) {
$argumentTypes = [$argumentsType->getItemType()];
if ($argumentsType->isArray()->yes()) {
$constantArrays = $argumentsType->getConstantArrays();

if (count($constantArrays) === 0) {
$argumentTypes = [$argumentsType->getIterableValueType()];
} elseif (count($constantArrays) === 1) {
$constantArray = $constantArrays[0];
$argumentTypes = $constantArray->getValueTypes();
} else {
return new MixedType();
}
} else {
return new MixedType();
}
Expand Down
Loading