Skip to content

Commit 01133fd

Browse files
wouterjwouterj
committed
Merge branch '2.7' into 2.8
Conflicts: reference/forms/types/entity.rst
2 parents d85f13a + 60cd462 commit 01133fd

File tree

3 files changed

+40
-39
lines changed

3 files changed

+40
-39
lines changed

Diff for: ‎cookbook/bundles/configuration.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ bundle configuration would look like:
7575
acme_social:
7676
twitter:
7777
client_id: 123
78-
client_secret: $ecret
78+
client_secret: your_secret
7979
8080
.. code-block:: xml
8181
@@ -88,7 +88,7 @@ bundle configuration would look like:
8888
http://symfony.com/schema/dic/services/services-1.0.xsd">
8989
9090
<acme-social:config>
91-
<twitter client-id="123" client-secret="$ecret" />
91+
<twitter client-id="123" client-secret="your_secret" />
9292
</acme-social:config>
9393
9494
<!-- ... -->
@@ -99,7 +99,7 @@ bundle configuration would look like:
9999
// app/config/config.php
100100
$container->loadFromExtension('acme_social', array(
101101
'client_id' => 123,
102-
'client_secret' => '$ecret',
102+
'client_secret' => 'your_secret',
103103
));
104104
105105
.. seealso::
@@ -139,7 +139,7 @@ For the configuration example in the previous section, the array passed to your
139139
array(
140140
'twitter' => array(
141141
'client_id' => 123,
142-
'client_secret' => '$ecret',
142+
'client_secret' => '$secret',
143143
),
144144
),
145145
)

Diff for: ‎cookbook/controller/error_pages.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ In that case, you might want to override one or both of the ``showAction()`` and
267267
# app/config/services.yml
268268
services:
269269
app.exception_controller:
270-
class: AppBundle\Controller\CustomExceptionController
271-
arguments: ['@twig', '%kernel.debug%']
270+
class: AppBundle\Controller\CustomExceptionController
271+
arguments: ['@twig', '%kernel.debug%']
272272
273273
.. code-block:: xml
274274

Diff for: ‎reference/forms/types/entity.rst

+34-33
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ objects from the database.
1212
+-------------+------------------------------------------------------------------+
1313
| Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) |
1414
+-------------+------------------------------------------------------------------+
15-
| Options | - `class`_ |
16-
| | - `choice_label`_ |
17-
| | - `query_builder`_ |
15+
| Options | - `choice_label`_ |
16+
| | - `class`_ |
1817
| | - `em`_ |
18+
| | - `query_builder`_ |
1919
+-------------+------------------------------------------------------------------+
2020
| Overridden | - `choices`_ |
2121
| options | - `data_class`_ |
2222
+-------------+------------------------------------------------------------------+
2323
| Inherited | from the :doc:`ChoiceType </reference/forms/types/choice>`: |
2424
| options | |
25-
| | - `choice_value`_ |
26-
| | - `choice_name`_ |
2725
| | - `choice_attr`_ |
28-
| | - `placeholder`_ |
26+
| | - `choice_name`_ |
2927
| | - `choice_translation_domain`_ |
30-
| | - `translation_domain`_ |
28+
| | - `choice_value`_ |
3129
| | - `expanded`_ |
30+
| | - `group_by`_ |
3231
| | - `multiple`_ |
32+
| | - `placeholder`_ |
3333
| | - `preferred_choices`_ |
34-
| | - `group_by`_ |
34+
| | - `translation_domain`_ |
3535
| | |
3636
| | from the :doc:`FormType </reference/forms/types/form>`: |
3737
| | |
@@ -118,15 +118,6 @@ then you can supply the ``choices`` option directly::
118118
Field Options
119119
-------------
120120

121-
class
122-
~~~~~
123-
124-
**type**: ``string`` **required**
125-
126-
The class of your entity (e.g. ``AppBundle:Category``). This can be
127-
a fully-qualified class name (e.g. ``AppBundle\Entity\Category``)
128-
or the short alias name (as shown prior).
129-
130121
choice_label
131122
~~~~~~~~~~~~
132123

@@ -180,16 +171,14 @@ more detais, see the main :ref:`choice_label <reference-form-choice-label>` docu
180171
'choice_label' => 'translations[en].name',
181172
));
182173

183-
query_builder
184-
~~~~~~~~~~~~~
174+
class
175+
~~~~~
185176

186-
**type**: ``Doctrine\ORM\QueryBuilder`` or a Closure
177+
**type**: ``string`` **required**
187178

188-
If specified, this is used to query the subset of options (and their
189-
order) that should be used for the field. The value of this option can
190-
either be a ``QueryBuilder`` object or a Closure. If using a Closure,
191-
it should take a single argument, which is the ``EntityRepository`` of
192-
the entity and return an instance of ``QueryBuilder``.
179+
The class of your entity (e.g. ``AppBundle:Category``). This can be
180+
a fully-qualified class name (e.g. ``AppBundle\Entity\Category``)
181+
or the short alias name (as shown prior).
193182

194183
em
195184
~~
@@ -199,6 +188,17 @@ em
199188
If specified, this entity manager will be used to load the choices
200189
instead of the ``default`` entity manager.
201190

191+
query_builder
192+
~~~~~~~~~~~~~
193+
194+
**type**: ``Doctrine\ORM\QueryBuilder`` or a Closure
195+
196+
If specified, this is used to query the subset of options (and their
197+
order) that should be used for the field. The value of this option can
198+
either be a ``QueryBuilder`` object or a Closure. If using a Closure,
199+
it should take a single argument, which is the ``EntityRepository`` of
200+
the entity and return an instance of ``QueryBuilder``.
201+
202202
Overridden Options
203203
------------------
204204

@@ -224,20 +224,18 @@ Inherited Options
224224

225225
These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`:
226226

227-
.. include:: /reference/forms/types/options/choice_value.rst.inc
228-
229-
.. include:: /reference/forms/types/options/choice_name.rst.inc
230-
231227
.. include:: /reference/forms/types/options/choice_attr.rst.inc
232228

233-
.. include:: /reference/forms/types/options/placeholder.rst.inc
229+
.. include:: /reference/forms/types/options/choice_name.rst.inc
234230

235231
.. include:: /reference/forms/types/options/choice_translation_domain.rst.inc
236232

237-
.. include:: /reference/forms/types/options/choice_type_translation_domain.rst.inc
233+
.. include:: /reference/forms/types/options/choice_value.rst.inc
238234

239235
.. include:: /reference/forms/types/options/expanded.rst.inc
240236

237+
.. include:: /reference/forms/types/options/group_by.rst.inc
238+
241239
.. include:: /reference/forms/types/options/multiple.rst.inc
242240

243241
.. note::
@@ -248,7 +246,7 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
248246
is a complete example in the cookbook article
249247
:doc:`/cookbook/form/form_collections`.
250248

251-
.. include:: /reference/forms/types/options/group_by.rst.inc
249+
.. include:: /reference/forms/types/options/placeholder.rst.inc
252250

253251
.. include:: /reference/forms/types/options/preferred_choices.rst.inc
254252

@@ -257,7 +255,10 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
257255
This option expects an array of entity objects (that's actually the same as with
258256
the ``ChoiceType`` field, whichs requires an array of the preferred "values").
259257

260-
These options inherit from the :doc:`FormType </reference/forms/types/form>`:
258+
.. include:: /reference/forms/types/options/choice_type_translation_domain.rst.inc
259+
260+
These options inherit from the :doc:`form </reference/forms/types/form>`
261+
type:
261262

262263
.. include:: /reference/forms/types/options/data.rst.inc
263264

0 commit comments

Comments
 (0)