Skip to content

Revert "minor #6479 Update php.rst (carlos-granados)"#6490

Merged
wouterj merged 1 commit intosymfony:2.3from
wouterj:fix_merge_23
Apr 19, 2016
Merged

Revert "minor #6479 Update php.rst (carlos-granados)"#6490
wouterj merged 1 commit intosymfony:2.3from
wouterj:fix_merge_23

Conversation

@wouterj
Copy link
Copy Markdown
Member

@wouterj wouterj commented Apr 19, 2016

This reverts commit fefc8a0, reversing
changes made to 7819f9e.

I messed up badly yesterday evening. This should make things good again. Please review if you have time (I'll merge it later this afternoon).

This reverts commit fefc8a0, reversing
changes made to 7819f9e.
@HeahDude
Copy link
Copy Markdown
Contributor

@wouterj is this related to #6487 somehow? Because actually the reference of CollectionType is not among that diff.

@wouterj
Copy link
Copy Markdown
Member Author

wouterj commented Apr 19, 2016

@HeahDude yes, this fixes #6487 and #6486 The change is in the diff, but not the complete diff is shown on GitHub.

@HeahDude
Copy link
Copy Markdown
Contributor

Alright, thanks @wouterj, I've closed #6488 though.

@wouterj
Copy link
Copy Markdown
Member Author

wouterj commented Apr 19, 2016

I'll merge this now to avoid more troubles for the readers. If someone spots something wrong in the diff of this PR, please comment.

@wouterj wouterj merged commit 5adc91c into symfony:2.3 Apr 19, 2016
wouterj added a commit that referenced this pull request Apr 19, 2016
…erJ)

This PR was merged into the 2.3 branch.

Discussion
----------

Revert "minor #6479 Update php.rst (carlos-granados)"

This reverts commit fefc8a0, reversing
changes made to 7819f9e.

I messed up badly yesterday evening. This should make things good again. Please review if you have time (I'll merge it later this afternoon).

Commits
-------

5adc91c Revert "minor #6479 Update php.rst (carlos-granados)"
@wouterj wouterj deleted the fix_merge_23 branch April 19, 2016 18:10
wouterj added a commit to wouterj/symfony-docs that referenced this pull request Apr 20, 2016
…"request" service (gerryvdm)" (WouterJ)

This PR was merged into the 2.7 branch.

Discussion
----------

Revert "minor symfony#6478 Replace reference to the "request" service (gerryvdm)"

This reverts commit 139e2e7, reversing
changes made to 351f796.

Similair to symfony#6490 but then for 2.7

Commits
-------

8da5a30 Revert "minor symfony#6478 Replace reference to the "request" service (gerryvdm)"
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.

2 participants