Fixed Phalcon\Config::merge being inconsistent #14186
Merged
Conversation
This file contains 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
Removed __set_state method `Phalcon/Config` now extends `ArrayObject` Merging is done properly Assignment works as expected _all_ the time
CameronHall
changed the title
niden
requested changes
Jun 18, 2019
pathDelimiter is no longer static
How do I keep missing these - CTRL + F >> Static
…ameronHall/cphalcon into bugfix/merge-typecasted-keys * 'bugfix/merge-typecasted-keys' of github.com:CameronHall/cphalcon: Removed set state and fixed segfault
niden
previously approved these changes
Jun 19, 2019
Codecov Report
@@ Coverage Diff @@
## 4.0.x #14186 +/- ##
==========================================
- Coverage 74.75% 74.73% -0.02%
==========================================
Files 455 454 -1
Lines 94463 94193 -270
==========================================
- Hits 70615 70396 -219
+ Misses 23848 23797 -51
Continue to review full report at Codecov.
|
niden
previously approved these changes
Jun 19, 2019
|
This is solid. Will wait for @sergeyklay to give us any ideas on why the windows build fails. If something is wrong and we cannot fix it immediately we can always extend the |
niden
previously approved these changes
Jun 20, 2019
|
Thank you @CameronHall |
This was referenced Jun 20, 2019
Closed
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.
Hello!
In raising this pull request, I confirm the following:
Small description of change:
Phalcon/Confignow extendsPhalcon\Collection\CollectionIt is worth noting that in #13768 it talks about correctly interpreting integers defined as strings. This is simply not possible given that PHP will cast strings that look like integers to integers.
We also need to maintain our own merge functionality because the native PHP
array_merge_recusivewill merge values together into an array if they have the same string keys.array_replace_recursivecreated its own issues whereby it would replace keys with the same numeric index instead of appending to array itself.Thanks