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

[Yaml] parse references on merge keys #24417

Merged
merged 1 commit into from Oct 5, 2017

Conversation

Projects
None yet
4 participants
@xabbuh
Member

xabbuh commented Oct 3, 2017

Q A
Branch? 2.7
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #23587
License MIT
Doc PR
@javiereguiluz

Very nice! Thanks.

@fabpot

fabpot approved these changes Oct 5, 2017

@fabpot

This comment has been minimized.

Show comment
Hide comment
@fabpot

fabpot Oct 5, 2017

Member

Thank you @xabbuh.

Member

fabpot commented Oct 5, 2017

Thank you @xabbuh.

@fabpot fabpot merged commit dab72ab into symfony:2.7 Oct 5, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
fabbot.io Your code looks good.
Details

fabpot added a commit that referenced this pull request Oct 5, 2017

bug #24417 [Yaml] parse references on merge keys (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Yaml] parse references on merge keys

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

Commits
-------

dab72ab [Yaml] parse references on merge keys

@xabbuh xabbuh deleted the xabbuh:issue-23587 branch Oct 5, 2017

This was referenced Oct 5, 2017

fabpot added a commit that referenced this pull request Oct 6, 2017

bug #24462 [Yaml] parse references on merge keys with objects (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[Yaml] parse references on merge keys with objects

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #23587, #24417
| License       | MIT
| Doc PR        |

Applies necessary changes on the `3.3` branch to make #24417 work with the `PARSE_OBJECT_FOR_MAP` flag.

Commits
-------

ce10f35 parse references on merge keys with objects
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment