Skip to content

[Form] Add entity manager instance support for em option #4336

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 13, 2014
Merged

[Form] Add entity manager instance support for em option #4336

merged 1 commit into from
Nov 13, 2014

Conversation

egeloen
Copy link

@egeloen egeloen commented Oct 18, 2014

This PR documents symfony/symfony#12251

@egeloen egeloen mentioned this pull request Oct 18, 2014
Merged
wouterj
wouterj reviewed Oct 18, 2014
View reviewed changes
reference/forms/types/entity.rst
@@ -117,7 +117,7 @@ or the short alias name (as shown prior).
em
~~

**type**: ``string`` **default**: the default entity manager
**type**: ``string`` || ``Doctrine\Common\Persistence\ObjectManager`` **default**: the default entity manager
Copy link
Member

Choose a reason for hiding this comment

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

you should use | instead of ||

Copy link
Author

Choose a reason for hiding this comment

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

@wouterj I have used the same syntax than the choices option. Should I change it too?

Copy link
Author

Choose a reason for hiding this comment

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

ping @wouterj

Copy link
Member

Choose a reason for hiding this comment

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

Sorry for the delay, @egeloen. Yes, please update the other too.

Copy link
Author

Choose a reason for hiding this comment

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

Fixed

fabpot added a commit to symfony/symfony that referenced this pull request Oct 20, 2014
@fabpot
feature #12251 [Bridge][Doctrine][Form] Add entity manager instance s…
269e27f 
…upport for em option (egeloen)

This PR was merged into the 2.6-dev branch.

Discussion
----------

[Bridge][Doctrine][Form] Add entity manager instance support for em option

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10157
| License       | MIT
| Doc PR        | symfony/symfony-docs#4336

This PR allows to pass an explicit entity manager instance as em option.

Commits
-------

d84e3a8 [Bridge][Doctrine][Form] Add entity manager instance support for em option
@wouterj
Copy link
Member

wouterj commented Nov 9, 2014

Thank you @egeloen! @weaverryan will merge it when he has some time

@weaverryan
Copy link
Member

Looks great, thanks!

@weaverryan weaverryan merged commit 09a6fd7 into symfony:master Nov 13, 2014
weaverryan added a commit that referenced this pull request Nov 13, 2014
@weaverryan
feature #4336 [Form] Add entity manager instance support for em optio…
9caea6f 
…n (egeloen)

This PR was merged into the master branch.

Discussion
----------

[Form] Add entity manager instance support for em option

This PR documents symfony/symfony#12251

Commits
-------

09a6fd7 [Form] Add entity manager instance support for em option
weaverryan added a commit that referenced this pull request Nov 13, 2014
@weaverryan
[#4336] Backporting minor syntax fix
8c2d837
@egeloen egeloen deleted the form-entity-em-option branch November 13, 2014 17:03
@xabbuh
Copy link
Member

xabbuh commented Nov 13, 2014

@weaverryan This was merged into the Symfony master branch before the 2.6 branch was created. So this should be backported to the 2.6 and 2.7 branches, shouldn't it?

@weaverryan
Copy link
Member

@xabbuh bah, yes. In fact, I think I just did this with a few other things. I completely forgot about the branch changes. Thanks for catching me!

@weaverryan
Copy link
Member

I've patched this one into the 2.6 branch at sha: cd182f2. Thanks again @xabbuh!

@xabbuh
Copy link
Member

xabbuh commented Nov 13, 2014

@weaverryan I think the only other pull request that has to be taken care of is #4424.

@weaverryan
Copy link
Member

@xabbuh That's what I think too - I just fixed that one up :)

weaverryan added a commit that referenced this pull request Nov 13, 2014
@weaverryan
Merge branch '2.3' into 2.5
46167a6 
* 2.3:
  [#4336] Backporting minor syntax fix
  Included a bunch of fixes suggested by the awesome Symfony doc reviewers
  Added a bunch of fixes suggested by @xabbuh
  Fixed a RST formatting issue
  Revamped the Quick Start tutorial
  tweaks to #4427
  Updated first code-block:: bash

Conflicts:
	quick_tour/the_big_picture.rst
weaverryan added a commit that referenced this pull request Nov 13, 2014
@weaverryan
Merge branch '2.5' into 2.6
1122ee7 
* 2.5:
  [#4336] Backporting minor syntax fix
  Included a bunch of fixes suggested by the awesome Symfony doc reviewers
  Added a bunch of fixes suggested by @xabbuh
  Fixed a RST formatting issue
  Revamped the Quick Start tutorial
  tweaks to #4427
  Updated first code-block:: bash

Conflicts:
	quick_tour/the_big_picture.rst
weaverryan added a commit that referenced this pull request Nov 13, 2014
@weaverryan
Merge branch '2.7'
0d5cb0d 
* 2.7:
  typos in the var-dumper component
  [#4243] Tweaks to the new var-dumper component
  [Form] Add entity manager instance support for em option
  [#4336] Backporting minor syntax fix
  Included a bunch of fixes suggested by the awesome Symfony doc reviewers
  Added a bunch of fixes suggested by @xabbuh
  Fixed a RST formatting issue
  Revamped the Quick Start tutorial
  tweaks to #4427
  Updated first code-block:: bash
@xabbuh
Copy link
Member

xabbuh commented Nov 13, 2014

@weaverryan Thank you! All other pull requests have been merged into 2.3 or 2.5 this week.

wouterj added a commit that referenced this pull request Feb 14, 2015
@wouterj
minor #4977 Unnecessary comma (edsonmedina)
ed80100 
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #4977).

Discussion
----------

Unnecessary comma

Commits
-------

8a2f0ba Wrong comma
81e8c13 Merge branch '2.7'
ef39a01 Remove diff
8d56ad7 Merge branch '2.7'
6fd286b Added January changelog
ad97700 Merge branch '2.7'
c0f9f67 Merge branch '2.7'
87eb36c Merge branch '2.7'
714f630 Merge branch '2.7'
99e2996 Merge branch '2.7'
c33b371 Merge branch '2.7'
6c498d4 feature #4805 added documentation for the new absolute_url() and relative_path() Twig functions (fabpot)
e4d22f0 added documentation for the new absolute_url() and relative_path() Twig functions
907ee0d Merge branch '2.7'
a17bdd7 Merge branch '2.7'
ca3b4c8 feature #4753 bump Symfony requirements to PHP 5.5 (xabbuh)
9919bca Revert "Fixed markup"
c859790 Fixed markup
032a6b4 Merge branch '2.7'
92b10b1 bug #4758 [Components][Yaml] don't describe removed usage of Yaml::parse() (xabbuh)
42d2b15 Merge branch '2.7'
6f9832d Merge branch '2.7'
d33b78b don't describe removed usage of Yaml::parse()
bcab77b bump Symfony requirements to PHP 5.5
6ef6a04 Merge branch '2.7'
fcfea43 Merge branch '2.7'
353995e Merge branch '2.7'
27296ad Merge branch '2.7'
56db7af Merge branch '2.7'
9e5fc6c Merge branch '2.7'
cb6f846 Merge branch '2.7'
8131844 Merge branch '2.7'
2fcebc1 Merge branch '2.7'
07aa543 Merge branch '2.7'
4056218 Merge branch '2.7'
0906e0c Merge branch '2.7'
e539bd1 Merge branch '2.7'
2d1c336 Merge branch '2.7'
d30dc9e Merge remote-tracking branch 'origin/master'
3454883 Merge branch '2.7'
f0ac8bb Merge branch '2.7'
d921dcd Merge branch '2.7'
486baf8 Merge branch '2.7'
8099ac1 Merge branch '2.7'
6b73990 Merge branch '2.7'
0fb81cc Merge branch '2.7'
d969e8b Merge branch '2.7'
f24b645 Merge branch '2.7'
d6ce29f Merge branch '2.7'
51224e9 Merge branch '2.7'
0c92fab Merge branch '2.7'
0d5cb0d Merge branch '2.7'
3329bd2 feature #4424 [#4243] Tweaks to the new var-dumper component (weaverryan, nicolas-grekas)
9caea6f feature #4336 [Form] Add entity manager instance support for em option (egeloen)
1a29f24 typos in the var-dumper component
09a6fd7 [Form] Add entity manager instance support for em option
265604b [#4243] Tweaks to the new var-dumper component
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Status: Reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@egeloen @wouterj @weaverryan @xabbuh @GeLoLabs