Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix phpstan/phpstan#11073: Nullsafe operator chaining #5407

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
VincentLanglet merged 17 commits into from
Apr 7, 2026
Merged

Fix phpstan/phpstan#11073: Nullsafe operator chaining #5407

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2bedf83
Fix phpstan/phpstan#11073: Nullsafe operator chaining false positive
VincentLanglet Apr 5, 2026
20a8328
Remove redundant containsNull check before removeNull
phpstan-bot Apr 5, 2026
d7ab184
Add assertType for nullsafe modify call in date-format test
phpstan-bot Apr 5, 2026
97f0294
Add assertType for modify() on union DateTimeImmutable subclasses
phpstan-bot Apr 6, 2026
ed3922a
Separate nullsafe modify assertion into its own function
phpstan-bot Apr 6, 2026
3240d14
Add failing test
VincentLanglet Apr 6, 2026
1ede898
Filter caller type to DateTimeInterface subtypes in DateTimeModifyRet…
phpstan-bot Apr 6, 2026
35c0fd3
Include native return types for union members not handled by dynamic …
phpstan-bot Apr 6, 2026
53a43c1
Use filtered remaining type instead of new ObjectType for unhandled c…
phpstan-bot Apr 6, 2026
4579639
Simplify DateTimeModifyReturnTypeExtension to use TypeCombinator::int…
phpstan-bot Apr 6, 2026
c94bf83
Improvements
VincentLanglet Apr 6, 2026
dc65ae7
Remove unnecessary array_unique call from getObjectClassNames()
phpstan-bot Apr 6, 2026
ea795df
Add tests for MethodCallReturnTypeHelper fallback on static calls
phpstan-bot Apr 6, 2026
1e9c190
Fix and tests
VincentLanglet Apr 6, 2026
904c51c
Fix
VincentLanglet Apr 6, 2026
d2b04a7
Fix
VincentLanglet Apr 6, 2026
68cc394
Fix cs
VincentLanglet Apr 6, 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
Prev Previous commit
Next Next commit
Fix
  • Loading branch information
@VincentLanglet
VincentLanglet committed Apr 7, 2026
commit 904c51ce0f9fd8338271e694a632dab7926f7e95
17 changes: 14 additions & 3 deletions src/Type/Php/DateTimeModifyReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use PHPStan\Type\Constant\ConstantBooleanType;
use PHPStan\Type\DynamicMethodReturnTypeExtension;
use PHPStan\Type\NeverType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use Throwable;
Expand Down Expand Up @@ -41,7 +42,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
{
$args = $methodCall->getArgs();
if (count($methodCall->getArgs()) < 1) {
if (count($args) < 1) {
return null;
}

Expand Down Expand Up @@ -79,9 +80,19 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method

return null;
} elseif ($hasDateTime) {
$variant = ParametersAcceptorSelector::selectFromArgs($scope, $args, $methodReflection->getVariants());
$callerType = $scope->getType($methodCall->var);
Comment thread
VincentLanglet marked this conversation as resolved.

return TypeCombinator::remove($variant->getReturnType(), new ConstantBooleanType(false));
$dateTimeInterfaceType = new ObjectType(DateTimeInterface::class);
if ($dateTimeInterfaceType->isSuperTypeOf($callerType)->yes()) {
return $callerType;
}
foreach ($callerType->getObjectClassNames() as $className) {
if (!$dateTimeInterfaceType->isSuperTypeOf(new ObjectType($className))->yes()) {
$callerType = TypeCombinator::remove($callerType, new ObjectType($className));
}
}

return $callerType;
}

if ($this->phpVersion->hasDateTimeExceptions()) {
Expand Down