Repository navigation
Fix TypeError on EXPLAIN FOR CONNECTION without integer ID - #689
Merged
MauricioFauth merged 1 commit intoNov 18, 2026
Merged
MauricioFauth merged 1 commit into
MauricioFauth merged 1 commit into
Conversation
ExplainStatement::parse() assigned the token after `FOR CONNECTION` directly to the `int|null $connectionId` property, so any non-integer token (identifier, float, delimiter, end of query) threw an uncaught TypeError instead of producing a parser error. Report "Unexpected token." in that case, as KillStatement does, and drop the now obsolete phpstan/psalm baseline entries. Refs CVE-2026-121262 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: des1roer <des1roer@gmail.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 6.0.x #689 +/- ##
=========================================
Coverage 96.06% 96.06%
- Complexity 2290 2293 +3
=========================================
Files 89 89
Lines 5085 5088 +3
=========================================
+ Hits 4885 4888 +3
Misses 200 200
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. |
MauricioFauth
added a commit
that referenced
this pull request
Nov 18, 2026
Fix TypeError on EXPLAIN FOR CONNECTION without integer ID [ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
MauricioFauth
added a commit
that referenced
this pull request
Nov 18, 2026
Closes #689 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
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.
ExplainStatement::parse()assigns the token followingFOR CONNECTIONstraight intopublic int|null $connectionId. Any token that is not an integer throws an uncaughtTypeErrorfromnew Parser(...):EXPLAIN FOR CONNECTION 458connectionId = 458connectionId = 458EXPLAIN FOR CONNECTIONTypeError: Cannot assign string ...Unexpected token.EXPLAIN FOR CONNECTION abcTypeError: Cannot assign string ...Unexpected token.EXPLAIN FOR CONNECTION 1.5TypeError: Cannot assign float ...Unexpected token.This is the issue reported as CVE-2026-121262 (6.0.0, 6.0.1). Both static analysers already flagged it, but the findings had been added to the baselines.
Changes:
KillStatementdoes (TokenType::Number+is_int), otherwise reportUnexpected token.;parseExplain15) and three invalid ones (parseExplainErr4–6);connectionId/$nextToken->valueentries fromphpstan-baseline.neonandpsalm-baseline.xml, which no longer match.Verified locally on PHP 8.5:
phpunitpasses (1030 tests),phpstanandpsalmreport nothing new. The remaining findings ($argvintools/*Generator.php, theContextGeneratorpsalm baseline entry, theOPTIONSconstant type hint) were already there before this change.🤖 Generated with Claude Code