refactor: replace type mixed with more specific types#10345
Merged
paulbalandan merged 2 commits intoJun 30, 2026
Conversation
mixed with more specific types`
mixed with more specific types`mixed with more specific types`
mixed with more specific types`mixed with more specific types
This comment was marked as resolved.
This comment was marked as resolved.
7df5bf1 to
a5648a3
Compare
michalsn
approved these changes
Jun 29, 2026
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.
Description
Fixes #6310.
Reviews every
mixedPHPDoc (and its long-form spellingarray|bool|float|int|object|string|null) acrosssystem/, and for each one decides whethermixedis appropriate, narrows it when the runtime type is provable, or collapses the verbose union to a plainmixedwhen the value is genuinely any type. Where the chosen type containsarray, key/value information is added (array<int|string, mixed>) instead of a barearray. Split into two commits:1. Narrowing + array refinements
mixedto deducible types.arraytoarray<key, value>in kept narrower unions.@param mixed $conditioninConditionalTrait(the@template-typed tag remains).mixed, and kept PSR-3 / PHPUnit contract params asmixedto honor those interfaces.2. Collapsing verbose unions
array|bool|float|int|object|string|nullunions (genuinely any-type) to baremixed, mostly inValidation/StrictRules, plusCommon,Databaseescape/magic methods,Entity/CastInterface,HTTPrequest accessors, the array helpers,Model, andView\Parser.mixedunions: thejson_decodestdClassshapes andParser::objectToArray()'s return, which provably excludesobject.treatPhpDocTypesAsCertain: falsewere made explicit with!== null.Checklist: