Skip to content

Fix MixedType->equals(ErrorType) #3934

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
wants to merge 13 commits into
base: 2.1.x
Choose a base branch
from
Open

Fix MixedType->equals(ErrorType) #3934

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
1518e16
Fix MixedType->equals(ErrorType)
staabm Apr 13, 2025
281b7ef
Update MixedType.php
staabm Apr 13, 2025
ea37e86
simplify
staabm Apr 13, 2025
f466508
cs
staabm Apr 13, 2025
8eb3998
Update MixedTypeTest.php
staabm Apr 14, 2025
19b4e1c
Support arrays in fast-path
staabm Apr 14, 2025
ea5d27c
Update conditional-vars.php
staabm Apr 15, 2025
1f3405d
fix
staabm May 13, 2025
d031d13
Update MutatingScope.php
staabm May 14, 2025
4b9e217
Update MutatingScope.php
staabm May 14, 2025
492a7b6
Update MutatingScope.php
staabm May 14, 2025
f478da8
Update MutatingScope.php
staabm May 14, 2025
2944a83
Discard changes to src/Analyser/MutatingScope.php
staabm May 16, 2025
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
3 changes: 2 additions & 1 deletion src/Type/MixedType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
use PHPStan\Type\Traits\NonGenericTypeTrait;
use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
use function get_class;
use function sprintf;

/** @api */
Expand Down Expand Up @@ -310,7 +311,7 @@ public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope)

public function equals(Type $type): bool
{
if (!$type instanceof self) {
if (get_class($type) !== static::class) {
return false;
}

Expand Down
7 changes: 6 additions & 1 deletion tests/PHPStan/Generics/TemplateTypeFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ public function dataCreate(): array
null,
TemplateTypeVariance::createInvariant(),
),
new MixedType(),
TemplateTypeFactory::create(
TemplateTypeScope::createWithFunction('a'),
'U',
null,
TemplateTypeVariance::createInvariant(),
),
],
[
new UnionType([
Expand Down
46 changes: 46 additions & 0 deletions tests/PHPStan/Type/MixedTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,4 +1164,50 @@ public function testSubtractedHasOffsetValueType(MixedType $mixedType, Type $typ
);
}

/** @dataProvider dataEquals */
public function testEquals(MixedType $mixedType, Type $typeToCompare, bool $expectedResult): void
{
$this->assertSame(
$expectedResult,
$mixedType->equals($typeToCompare),
sprintf('%s -> equals(%s)', $mixedType->describe(VerbosityLevel::precise()), $typeToCompare->describe(VerbosityLevel::precise())),
);
}

public function dataEquals(): array
{
return [
[
new MixedType(),
new MixedType(),
true,
],
[
new MixedType(true),
new MixedType(),
true,
],
[
new MixedType(),
new MixedType(true),
true,
],
[
new MixedType(),
new MixedType(true, new IntegerType()),
false,
],
[
new MixedType(),
new ErrorType(),
false,
],
[
new MixedType(true),
new ErrorType(),
false,
],
];
}

}
Loading