Repository navigation
fix(psalm): resolve remaining type issues flagged by Psalm 7 - #14014
Merged
Merged
Conversation
DerDreschner
approved these changes
Nov 2, 2026
Follow-up to #13932 and #13933: re-ran the open Psalm v7 bump (#13243) after both of those merged to see what was left. Two things slipped through the first two batches. - The three FeatureExtraction classes each had a second array access (flaggedMessages/readMessages/repliedMessages) using the same possibly-null $email key as the one already suppressed; only the first access per file got a suppression comment. - MessageMapper (Db) had a second, different possibly-null argument: $recipient->getLabel() passed into mb_strcut() when building recipient rows. Address's own fromRaw() already treats "no label" as "fall back to the email", so this does the same instead of suppressing. Assisted-by: Claude:claude-sonnet-5 Signed-off-by: Christoph Wurst <1374172+ChristophWurst@users.noreply.github.com>
ChristophWurst
force-pushed
the
fix/psalm-v7-prep-3
branch
from
November 2, 2026 18:46
f3d2e60 to
aa098e5
Compare
ChristophWurst
enabled auto-merge (squash)
November 2, 2026 18:46
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.
Follow-up to #13932 and #13933. After both merged, I rebased the open Psalm v7 bump (#13243) to see what was left, and two things had slipped through the first two batches, both because they were a second occurrence of a pattern already fixed once in the same file.
The three FeatureExtraction classes (Important/Read/Replied) each have two array accesses keyed by the same possibly-null $email, and only the first one in each file got the suppression comment in #13932 - the second (reading flaggedMessages/readMessages/repliedMessages) was missed. MessageMapper (Db) had a second, different possibly-null argument from the one fixed in #13932: $recipient->getLabel() going into mb_strcut() when writing recipient rows. Address's own fromRaw() already treats a missing label as "use the email instead", so this does the same rather than suppressing.
Ran the full unit test suite and composer cs:check locally, both clean.
Assisted-by: Claude:claude-sonnet-5