Skip to content

Switch HasMethodType/HasPropertyType from ObjectTypeTrait to MaybeObjectTypeTrait #5605

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

Open
phpstan-bot wants to merge 13 commits into
base: 2.1.x
Choose a base branch
from
Open

Switch HasMethodType/HasPropertyType from ObjectTypeTrait to MaybeObjectTypeTrait #5605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ff42ae6
Do not let `method_exists()` check fall through to general logic when…
VincentLanglet May 6, 2026
e35b4fa
Add test cases for method_exists with mixed and object types
phpstan-bot May 6, 2026
6d56134
Fix at type system level: override hasMethod() on TemplateMixedType t…
phpstan-bot May 6, 2026
03a02e2
Move fix from TemplateMixedType::hasMethod() to ImpossibleCheckTypeHe…
phpstan-bot May 6, 2026
559769e
Fix HasMethodType::isSuperTypeOf() to delegate to isSubTypeOf() for C…
phpstan-bot May 6, 2026
0d41982
Fix HasPropertyType::isSuperTypeOf() to delegate to isSubTypeOf() for…
phpstan-bot May 7, 2026
c34ef49
Simplify HasMethodType/HasPropertyType::isSuperTypeOf() CompoundType …
phpstan-bot May 7, 2026
5732696
Fall back to hasMethod()/hasProperty() when CompoundType::isSubTypeOf…
phpstan-bot May 7, 2026
56412dd
Override string/scalar type queries on HasMethodType/HasPropertyType …
phpstan-bot May 7, 2026
f54febd
Simplify HasMethodType/HasPropertyType::isSuperTypeOf() CompoundType …
phpstan-bot May 7, 2026
d84bea2
Extract MaybeStringTypeTrait from HasOffsetType/HasOffsetValueType
phpstan-bot May 7, 2026
967d2ef
Switch HasMethodType/HasPropertyType from ObjectTypeTrait to MaybeObj…
phpstan-bot May 7, 2026
e729d86
Address review: deduplicate via MaybeStringTypeTrait, remove redundan…
phpstan-bot May 7, 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
135 changes: 128 additions & 7 deletions src/Type/Accessory/HasMethodType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,39 @@
namespace PHPStan\Type\Accessory;

use Closure;
use PHPStan\Php\PhpVersion;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Reflection\ClassMemberAccessAnswerer;
use PHPStan\Reflection\Dummy\DummyMethodReflection;
use PHPStan\Reflection\ExtendedMethodReflection;
use PHPStan\Reflection\TrivialParametersAcceptor;
use PHPStan\Reflection\Type\CallbackUnresolvedMethodPrototypeReflection;
use PHPStan\Reflection\Type\UnresolvedMethodPrototypeReflection;
use PHPStan\TrinaryLogic;
use PHPStan\Type\AcceptsResult;
use PHPStan\Type\BooleanType;
use PHPStan\Type\CompoundType;
use PHPStan\Type\Enum\EnumCaseObjectType;
use PHPStan\Type\ErrorType;
use PHPStan\Type\Generic\GenericClassStringType;
use PHPStan\Type\IntersectionType;
use PHPStan\Type\IsSuperTypeOfResult;
use PHPStan\Type\MixedType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\StringType;
use PHPStan\Type\Traits\MaybeCallableTypeTrait;
use PHPStan\Type\Traits\MaybeIterableTypeTrait;
use PHPStan\Type\Traits\MaybeObjectTypeTrait;
use PHPStan\Type\Traits\MaybeOffsetAccessibleTypeTrait;
use PHPStan\Type\Traits\MaybeStringTypeTrait;
use PHPStan\Type\Traits\NonArrayTypeTrait;
use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
use PHPStan\Type\Traits\NonGenericTypeTrait;
use PHPStan\Type\Traits\NonRemoveableTypeTrait;
use PHPStan\Type\Traits\ObjectTypeTrait;
use PHPStan\Type\Traits\TruthyBooleanTypeTrait;
use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use PHPStan\Type\UnionType;
use PHPStan\Type\VerbosityLevel;
use function sprintf;
Expand All @@ -35,7 +44,13 @@
class HasMethodType implements AccessoryType, CompoundType
{

use ObjectTypeTrait;
use MaybeCallableTypeTrait;
use MaybeIterableTypeTrait;
use MaybeObjectTypeTrait;
use MaybeOffsetAccessibleTypeTrait;
use MaybeStringTypeTrait;
use NonArrayTypeTrait;
use TruthyBooleanTypeTrait;
use NonGenericTypeTrait;
use UndecidedComparisonCompoundTypeTrait;
use NonRemoveableTypeTrait;
Expand Down Expand Up @@ -82,6 +97,10 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult

public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
{
if ($type instanceof CompoundType) {
return $type->isSubTypeOf($this);
}
Comment on lines +100 to +102
Copy link
Copy Markdown
Contributor

@VincentLanglet VincentLanglet May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a proof this works, the implementation should now be

if ($type instanceof CompoundType) {
			return $type->isSubTypeOf($this);
		}

Copy link
Copy Markdown
Collaborator Author

@phpstan-bot phpstan-bot May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Simplified the isSuperTypeOf() CompoundType delegation in both HasMethodType and HasPropertyType to unconditionally return $type->isSubTypeOf($this) — the fallback-on-No guard is no longer needed since the string/scalar Maybe overrides now ensure correct results through the delegation path. All 11,997 tests pass and make phpstan reports no errors.


return new IsSuperTypeOfResult($type->hasMethod($this->methodName), []);
}

Expand Down Expand Up @@ -158,6 +177,86 @@ public function isCallable(): TrinaryLogic
return TrinaryLogic::createMaybe();
}

public function isNull(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function isConstantValue(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function isConstantScalarValue(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function getConstantScalarTypes(): array
{
return [];
}

public function getConstantScalarValues(): array
{
return [];
}

public function isTrue(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function isFalse(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function isBoolean(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function isFloat(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function isInteger(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function getClassStringObjectType(): Type
{
return $this;
}

public function getObjectTypeOrClassStringObjectType(): Type
{
return $this;
Copy link
Copy Markdown
Contributor

@VincentLanglet VincentLanglet May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should maybe return ObjectWithoutClassType

}

public function isVoid(): TrinaryLogic
{
return TrinaryLogic::createNo();
}

public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
{
return new BooleanType();
}

public function toNumber(): Type
{
return new ErrorType();
}

public function toAbsoluteNumber(): Type
{
return new ErrorType();
}

public function toString(): Type
{
if ($this->getCanonicalMethodName() === '__tostring') {
Expand All @@ -167,11 +266,33 @@ public function toString(): Type
return new ErrorType();
}

public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope): array
public function toInteger(): Type
{
return [
new TrivialParametersAcceptor(),
];
return new ErrorType();
}

public function toFloat(): Type
{
return new ErrorType();
}

public function toArray(): Type
{
return new MixedType();
}

public function toArrayKey(): Type
{
return new ErrorType();
}

public function toCoercedArgumentType(bool $strictTypes): Type
{
if (!$strictTypes) {
return TypeCombinator::union($this, $this->toString());
}

return $this;
}

public function getEnumCases(): array
Expand Down
52 changes: 2 additions & 50 deletions src/Type/Accessory/HasOffsetType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use PHPStan\Type\Traits\MaybeCallableTypeTrait;
use PHPStan\Type\Traits\MaybeIterableTypeTrait;
use PHPStan\Type\Traits\MaybeObjectTypeTrait;
use PHPStan\Type\Traits\MaybeStringTypeTrait;
use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
use PHPStan\Type\Traits\NonGenericTypeTrait;
use PHPStan\Type\Traits\NonRemoveableTypeTrait;
Expand All @@ -40,6 +41,7 @@ class HasOffsetType implements CompoundType, AccessoryType
use MaybeCallableTypeTrait;
use MaybeIterableTypeTrait;
use MaybeObjectTypeTrait;
use MaybeStringTypeTrait;
use TruthyBooleanTypeTrait;
use NonGenericTypeTrait;
use UndecidedComparisonCompoundTypeTrait;
Expand Down Expand Up @@ -73,11 +75,6 @@ public function getObjectClassReflections(): array
return [];
}

public function getConstantStrings(): array
{
return [];
}

public function accepts(Type $type, bool $strictTypes): AcceptsResult
{
if ($type instanceof CompoundType) {
Expand Down Expand Up @@ -285,46 +282,6 @@ public function isInteger(): TrinaryLogic
return TrinaryLogic::createNo();
}

public function isString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNumericString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonEmptyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonFalsyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLiteralString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLowercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isClassString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isUppercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function getClassStringObjectType(): Type
{
return new ObjectWithoutClassType();
Expand All @@ -340,11 +297,6 @@ public function isVoid(): TrinaryLogic
return TrinaryLogic::createNo();
}

public function isScalar(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
{
return new BooleanType();
Expand Down
52 changes: 2 additions & 50 deletions src/Type/Accessory/HasOffsetValueType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use PHPStan\Type\Traits\MaybeCallableTypeTrait;
use PHPStan\Type\Traits\MaybeIterableTypeTrait;
use PHPStan\Type\Traits\MaybeObjectTypeTrait;
use PHPStan\Type\Traits\MaybeStringTypeTrait;
use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
use PHPStan\Type\Traits\NonGenericTypeTrait;
use PHPStan\Type\Traits\NonRemoveableTypeTrait;
Expand All @@ -44,6 +45,7 @@ class HasOffsetValueType implements CompoundType, AccessoryType
use MaybeCallableTypeTrait;
use MaybeIterableTypeTrait;
use MaybeObjectTypeTrait;
use MaybeStringTypeTrait;
use TruthyBooleanTypeTrait;
use NonGenericTypeTrait;
use UndecidedComparisonCompoundTypeTrait;
Expand Down Expand Up @@ -79,11 +81,6 @@ public function getObjectClassReflections(): array
return [];
}

public function getConstantStrings(): array
{
return [];
}

public function accepts(Type $type, bool $strictTypes): AcceptsResult
{
if ($type instanceof CompoundType) {
Expand Down Expand Up @@ -373,46 +370,6 @@ public function isInteger(): TrinaryLogic
return TrinaryLogic::createNo();
}

public function isString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNumericString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonEmptyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isNonFalsyString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLiteralString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isLowercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isUppercaseString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function isClassString(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function getClassStringObjectType(): Type
{
return new ObjectWithoutClassType();
Expand All @@ -428,11 +385,6 @@ public function isVoid(): TrinaryLogic
return TrinaryLogic::createNo();
}

public function isScalar(): TrinaryLogic
{
return TrinaryLogic::createMaybe();
}

public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
{
return new BooleanType();
Expand Down
Loading
Loading