Skip to content

[Yaml] parse references on merge keys #24417

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

Merged
merged 1 commit into from
Oct 5, 2017
Merged

Conversation

xabbuh
Copy link
Member

@xabbuh 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

Copy link
Member

@javiereguiluz javiereguiluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice! Thanks.

@fabpot
Copy link
Member

fabpot commented Oct 5, 2017

Thank you @xabbuh.

@fabpot fabpot merged commit dab72ab into symfony:2.7 Oct 5, 2017
fabpot added a commit that referenced this pull request Oct 5, 2017
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 issue-23587 branch October 5, 2017 12:46
This was referenced Oct 5, 2017
fabpot added a commit that referenced this pull request Oct 6, 2017
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants