Skip to content

Fix phpstan/phpstan#11776: Union type of not detected in getter #5357

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 1 commit into
base: 2.1.x
Choose a base branch
from
+48 −0
Open

Fix phpstan/phpstan#11776: Union type of not detected in getter #5357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions src/Type/Generic/TemplateTypeHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,22 @@

$callSiteVariance = $callSiteVariances->getVariance($type->getName());
if ($callSiteVariance === null || $callSiteVariance->invariant()) {
if (
$newType instanceof TemplateType
&& $newType->getName() === $type->getName()
&& $newType->getScope()->equals($type->getScope())
&& !$type->getBound()->equals($newType->getBound())
&& $newType->getBound()->isSuperTypeOf($type->getBound())->yes()

Check warning on line 62 in src/Type/Generic/TemplateTypeHelper.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 						&& $newType->getName() === $type->getName()
 						&& $newType->getScope()->equals($type->getScope())
 						&& !$type->getBound()->equals($newType->getBound())
-						&& $newType->getBound()->isSuperTypeOf($type->getBound())->yes()
+						&& !$newType->getBound()->isSuperTypeOf($type->getBound())->no()
 					) {
 						return TemplateTypeFactory::create(
 							$newType->getScope(),

Check warning on line 62 in src/Type/Generic/TemplateTypeHelper.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.3, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 						&& $newType->getName() === $type->getName()
 						&& $newType->getScope()->equals($type->getScope())
 						&& !$type->getBound()->equals($newType->getBound())
-						&& $newType->getBound()->isSuperTypeOf($type->getBound())->yes()
+						&& $type->getBound()->isSuperTypeOf($newType->getBound())->yes()
 					) {
 						return TemplateTypeFactory::create(
 							$newType->getScope(),

Check warning on line 62 in src/Type/Generic/TemplateTypeHelper.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\TrinaryLogicMutator":

@@ @@
 						&& $newType->getName() === $type->getName()
 						&& $newType->getScope()->equals($type->getScope())
 						&& !$type->getBound()->equals($newType->getBound())
-						&& $newType->getBound()->isSuperTypeOf($type->getBound())->yes()
+						&& !$newType->getBound()->isSuperTypeOf($type->getBound())->no()
 					) {
 						return TemplateTypeFactory::create(
 							$newType->getScope(),

Check warning on line 62 in src/Type/Generic/TemplateTypeHelper.php

View workflow job for this annotation

GitHub Actions / Mutation Testing (8.4, ubuntu-latest) 

Escaped Mutant for Mutator "PHPStan\Infection\IsSuperTypeOfCalleeAndArgumentMutator":

@@ @@
 						&& $newType->getName() === $type->getName()
 						&& $newType->getScope()->equals($type->getScope())
 						&& !$type->getBound()->equals($newType->getBound())
-						&& $newType->getBound()->isSuperTypeOf($type->getBound())->yes()
+						&& $type->getBound()->isSuperTypeOf($newType->getBound())->yes()
 					) {
 						return TemplateTypeFactory::create(
 							$newType->getScope(),
) {
return TemplateTypeFactory::create(
$newType->getScope(),
$newType->getName(),
$type->getBound(),
$newType->getVariance(),
$newType->getStrategy(),
$newType->getDefault(),
);
}
return $newType;
}

Expand Down
32 changes: 32 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-11776.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php // lint >= 8.2

declare(strict_types=1);

namespace Bug11776;

use function PHPStan\Testing\assertType;

/**
* @template TOperation of int|string
*/
interface EnumAsFilterInterface {}

/**
* @template TOperation of scalar
*/
final readonly class ScalarableChoice
{
/**
* @param class-string<EnumAsFilterInterface<(int|string)&TOperation>> $choiceClassName
*/
public function __construct(private string $choiceClassName) {}

/**
* @return class-string<EnumAsFilterInterface<(int|string)&TOperation>>
*/
public function getChoiceClassName(): string
{
assertType('class-string<Bug11776\EnumAsFilterInterface<TOperation of int|string (class Bug11776\ScalarableChoice, argument)>>', $this->choiceClassName);
return $this->choiceClassName;
}
}
Loading