fix: env() TypeError for non-string $_SERVER values + esc() fixes#10305
Open
gr8man wants to merge 6 commits into
Open
fix: env() TypeError for non-string $_SERVER values + esc() fixes#10305gr8man wants to merge 6 commits into
gr8man wants to merge 6 commits into
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
gr8man
force-pushed
the
fix/common-env-typeerror-esc-leak
branch
from
53a365d to
449dbae
Compare
michalsn
requested changes
Jun 12, 2026
michalsn
left a comment
michalsn
left a comment
Member
There was a problem hiding this comment.
Please send one change per PR.
This needs a changelog entry.
michalsn
added
the
bug
michalsn
reviewed
Jun 12, 2026
Co-authored-by: Michal Sniatala <michal@sniatala.pl>
Co-authored-by: Michal Sniatala <michal@sniatala.pl>
Co-authored-by: Michal Sniatala <michal@sniatala.pl>
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
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
Comment on lines
+323
to
+330
| public function testEscapeWithChangingEncodingRecursive(): void | ||
| { | ||
| $data = ['<x']; | ||
|
|
||
| $this->assertSame(['<x'], esc($data, 'html', 'utf-8')); | ||
| $this->assertSame(['<x'], esc($data, 'html', 'iso-8859-1')); | ||
| $this->assertSame(['<x'], esc($data, 'html', 'utf-8')); | ||
| } |
Member
There was a problem hiding this comment.
Please use data that will allow us to see the difference and make sure this is working as expected.
Suggested change
| public function testEscapeWithChangingEncodingRecursive(): void | |
| { | |
| $data = ['<x']; | |
| $this->assertSame(['<x'], esc($data, 'html', 'utf-8')); | |
| $this->assertSame(['<x'], esc($data, 'html', 'iso-8859-1')); | |
| $this->assertSame(['<x'], esc($data, 'html', 'utf-8')); | |
| } | |
| public function testEscapeWithChangingArrayEncoding(): void | |
| { | |
| $data = [hex2bin('E9')]; | |
| $this->assertSame(['é'], esc($data, 'attr', 'iso-8859-1')); | |
| $this->assertSame(['й'], esc($data, 'attr', 'windows-1251')); | |
| $this->assertSame(['é'], esc($data, 'attr', 'iso-8859-1')); | |
| } |
|
|
||
| ### Fixed Bugs | ||
|
|
||
| * fix: env() TypeError for non-string values and esc() encoding propagation with reference leak prevention |
Member
There was a problem hiding this comment.
I meant the changelog in the user guide, just like you did in other PRs.
https://github.com/codeigniter4/CodeIgniter4/blob/develop/user_guide_src/source/changelogs/v4.7.4.rst
Also, please make it more accurate to the current PR state.
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
2 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