Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Config] Add handling for ignored keys in ArrayNode::mergeValues. #33124

Merged
merged 1 commit into from Aug 20, 2019

Conversation

@alex-dev
Copy link

commented Aug 12, 2019

Q A
Branch? 4.3
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #33101
License MIT
Doc PR N/A

Fix case where normalized data accepting and keeping ignored keys is rejected during merge.

@alex-dev

This comment has been minimized.

Copy link
Author

commented Aug 12, 2019

Code styling issues were not fixed to minimize impact.
I've got no idea what is broken in Travis 7.2, looks like Twig Bridge is missing a PSR-13 related class.

@nicolas-grekas nicolas-grekas added this to the 4.3 milestone Aug 13, 2019

@thomaspicquet

This comment has been minimized.

Copy link

commented Aug 14, 2019

tried these changes as I was hitting the same issue and it works with them, can't wait for this PR to go live

@nicolas-grekas

This comment has been minimized.

Copy link
Member

commented Aug 20, 2019

Thank you @alex-dev.

nicolas-grekas added a commit that referenced this pull request Aug 20, 2019

bug #33124 [Config] Add handling for ignored keys in ArrayNode::merge…
…Values. (Alexandre Parent)

This PR was squashed before being merged into the 4.3 branch (closes #33124).

Discussion
----------

[Config] Add handling for ignored keys in ArrayNode::mergeValues.

| Q             | A
| ------------- | ---
| Branch?       | 4.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #33101
| License       | MIT
| Doc PR        | N/A

Fix case where normalized data accepting and keeping ignored keys is rejected during merge.

Commits
-------

311e1c4 [Config] Add handling for ignored keys in ArrayNode::mergeValues.

@nicolas-grekas nicolas-grekas merged commit 311e1c4 into symfony:4.3 Aug 20, 2019

1 of 3 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
fabbot.io Your code looks good.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.