Track $arr[$key] existence across array_key_first/last + !== null#5537
Merged
ondrejmirtes merged 1 commit into2.1.xfrom Apr 26, 2026
Merged
Track $arr[$key] existence across array_key_first/last + !== null#5537ondrejmirtes merged 1 commit into2.1.xfrom
ondrejmirtes merged 1 commit into2.1.xfrom
Conversation
When `$key = array_key_first/last($arr)` runs against an array that might be empty, `$arr[$key]` was only registered in scope if the array was already known non-empty at assignment time. Once the user narrowed `$key` separately with `if ($key !== null)`, AssignHandler's deep-write path couldn't see the dim-fetch and fell back to a lossy `setOffsetValueType`, generalising untouched keys to optional. Attach a conditional holder at assignment time so the dim-fetch lands in scope once `$key` is narrowed, matching what `isset($arr[$key])` already does. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
$key = array_key_first/last($arr)runs against a possibly-empty array, soif ($key !== null)lands$arr[$key]back in scope (matching whatisset($arr[$key])already does).AssignHandler's precisesetExistingOffsetValueTypepath fire on deep writes like$arr[$key]['comment'] = $val, so untouched inner keys stay required instead of being generalised to optional.@phpstan-ignore return.typeworkaround inRichParser::parseIdentifiers()that this exact pattern needed.Test plan
make phpstan(was reportingSealed array shape can only accept a constant arrayonRichParser::parseIdentifiers()'s return; now clean)make tests(no new failures vs2.1.x)make cstests/PHPStan/Analyser/nsrt/array-key-last-existing.phptest.phpnow returns the expected shape on theif (\$key !== null)form🤖 Generated with Claude Code