Allow Config::merge to accept a basic array. #13830
Conversation
Codecov Report
@@ Coverage Diff @@
## 4.0.x #13830 +/- ##
==========================================
+ Coverage 66.24% 66.24% +<.01%
==========================================
Files 450 450
Lines 89628 89644 +16
==========================================
+ Hits 59375 59388 +13
- Misses 30253 30256 +3
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
@dschissler This is solid. Can you please write a test and update the changelog?
This comment was marked as abuse.
This comment was marked as abuse.
phalcon/config.zep
Outdated
| let config = configParam; | ||
| break; | ||
| default: | ||
| throw new \Exception("Invalid data type for merge."); |
There was a problem hiding this comment.
Phalcon\Config\Exception
There was a problem hiding this comment.
Yes and this one! Sorry missed it
This comment was marked as abuse.
This comment was marked as abuse.
This comment was marked as abuse.
This comment was marked as abuse.
|
Thank you @dschissler |
This comment was marked as abuse.
This comment was marked as abuse.
|
@dschissler As a general rule (self imposed) we use the squash and merge option when merging. |
This comment was marked as abuse.
This comment was marked as abuse.
|
@dschissler Honestly I still haven't sat down to read how to squash stuff on my local repo, so I do it here on github. ;) |
I created a new clean PR with the alternate option that I presented in the last PR. This will sit here for a few days until I have time to do the change log and to see about augmenting the tests.
ps. I wrote a metric shit load of zephir code today.