Uh oh!
There was an error while loading. Please reload this page.
fix: env() TypeError for non-string $_SERVER values + esc() fixes - #10305
Merged
paulbalandan merged 11 commits intoJun 15, 2026
Merged
Conversation
- env(): guard non-string values (int argc, array argv in CLI) before strtolower() to prevent TypeError under declare(strict_types=1) - esc(): propagate $encoding in recursive array calls (was ignored before), add early return after array processing, replace single static $escaper with static $escapers[] cache keyed by encoding - tests: data-provider test for env() non-string types, three tests for esc() foreach reference leak
gr8manforce-pushed
the
fix/common-env-typeerror-esc-leak
branch
from
June 11, 2026 21:43
53a365d to
449dbaeComparemichalsn
requested changes
Jun 12, 2026
michalsn
left a comment
Member
There was a problem hiding this comment.
Please send one change per PR.
This needs a changelog entry.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Co-authored-by: Michal Sniatala <michal@sniatala.pl>
Co-authored-by: Michal Sniatala <michal@sniatala.pl>
Co-authored-by: Michal Sniatala <michal@sniatala.pl>
michalsn
commented
Jun 12, 2026
Member
Apart from the changelog entry, we also need some tests to prove the fixed |
michalsn
requested changes
Jun 12, 2026
michalsn
left a comment
Member
There was a problem hiding this comment.
We still need two things - see my previous comment.
michalsn
requested changes
Jun 13, 2026
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Co-authored-by: Michal Sniatala <michal@sniatala.pl>
michalsn
requested changes
Jun 13, 2026
Uh oh!
There was an error while loading. Please reload this page.
This comment was marked as outdated.
This comment was marked as outdated.
michalsn
approved these changes
Jun 14, 2026
env() TypeError for non-string $_SERVER values + esc() fixespaulbalandan
approved these changes
Jun 15, 2026
Uh oh!
There was an error while loading. Please reload this page.
paulbalandan
commented
Jun 15, 2026
Member
Thank you, @gr8man |
maniaba pushed a commit
to maniaba/CodeIgniter4
that referenced
this pull request
Jun 17, 2026
…es (codeigniter4#10305) * fix: env() TypeError for non-string $_SERVER values + esc() fixes - env(): guard non-string values (int argc, array argv in CLI) before strtolower() to prevent TypeError under declare(strict_types=1) - esc(): propagate $encoding in recursive array calls (was ignored before), add early return after array processing, replace single static $escaper with static $escapers[] cache keyed by encoding - tests: data-provider test for env() non-string types, three tests for esc() foreach reference leak * Apply suggestion from @michalsn Co-authored-by: Michal Sniatala <michal@sniatala.pl> * Apply suggestion from @michalsn Co-authored-by: Michal Sniatala <michal@sniatala.pl> * Update system/Common.php Co-authored-by: Michal Sniatala <michal@sniatala.pl> * style: cs-fix * test: add tests for esc() encoding changes and update changelog * Update tests/system/CommonFunctionsTest.php Co-authored-by: Michal Sniatala <michal@sniatala.pl> * docs: move env/esc fix changelog entry to v4.7.4.rst * docs: split Common changelog entry --------- Co-authored-by: Michal Sniatala <michal@sniatala.pl>
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fix:
env()TypeError in CLI +esc()improvementsWhat
Fixes two bugs in
system/Common.php.env()— In CLI,$_SERVERcontains non-string values (argcisint,argvisarray). Passing them tostrtolower()threw aTypeErrorunderdeclare(strict_types=1). Added anis_string()guard before thematchexpression; non-string values are returned as-is.esc()— Three fixes applied together:foreach ($data as &$value)left a dangling reference after the loop; addedunset($value)to prevent silent mutation of the last array element in the calling scope$encodingwas not propagated in recursive array callsstatic $escaperwithstatic $escapers[]keyed by encoding for correct per-encoding cachingTests
Added a data-provider test for
env()covering non-string$_SERVER/$_ENVvalues (int, array, float), and three tests verifying theesc()reference leak is gone.Files changed
system/Common.phptests/system/CommonFunctionsTest.php