Repository navigation
Zend: refactor various INI parsing aspects - #23893
Merged
Merged
Conversation
From 112 to 104
From 248 to 232
And use it in _zend_ini_scanner_globals struct
Girgias
force-pushed
the
2026-09-ini-scanning-mode-enum
branch
from
September 24, 2026 18:23
3a1778a to
ad052d7
Compare
And move error handling to the call sites in PHP_FUNCTIONs
It now always returns SUCCESS, and propagate the voidification chain for call sites of init_ini_scanner that now always return SUCCESS.
Girgias
force-pushed
the
2026-09-ini-scanning-mode-enum
branch
from
September 24, 2026 19:22
ad052d7 to
02b210b
Compare
Girgias
marked this pull request as ready for review
September 24, 2026 21:24
arnaud-lb
reviewed
Oct 19, 2026
Comment on lines
+2507
to
+2511
| /* Sanity check */ | ||
| if (UNEXPECTED(scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW && scanner_mode != ZEND_INI_SCANNER_TYPED)) { | ||
| php_error_docref(NULL, E_WARNING, "Invalid scanner mode"); | ||
| RETURN_FALSE; | ||
| } |
Member
There was a problem hiding this comment.
I know this was hoisted from init_ini_scanner(), but this could be turned into an exception as per https://wiki.php.net/rfc/policy-exempt-type-value-error-bc-policy ?
Member
Author
There was a problem hiding this comment.
I was planning to do this as a follow-up PR. :)
I wanted this one to be mainly be refactoring without behavioural changes.
arnaud-lb
approved these changes
Oct 19, 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
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.
Pack struct, define a new C enum for scanner mode, and use this new enum as a type.