Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita297099

Browse files
committed
Merge branch '2.8' into 3.0
2 parents230b4f6 +01133fd commita297099

File tree

3 files changed

+40
-39
lines changed

3 files changed

+40
-39
lines changed

‎cookbook/bundles/configuration.rst‎

Lines changed: 4 additions & 4 deletions
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-
<twitterclient-id="123"client-secret="$ecret" />
91+
<twitterclient-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
)

‎cookbook/controller/error_pages.rst‎

Lines changed: 2 additions & 2 deletions
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

‎reference/forms/types/entity.rst‎

Lines changed: 34 additions & 33 deletions
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
|||
@@ -117,15 +117,6 @@ then you can supply the ``choices`` option directly::
117117
Field Options
118118
-------------
119119

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

@@ -175,16 +166,14 @@ more detais, see the main :ref:`choice_label <reference-form-choice-label>` docu
175166
'choice_label' => 'translations[en].name',
176167
));
177168

178-
query_builder
179-
~~~~~~~~~~~~~
169+
class
170+
~~~~~
180171

181-
**type**: ``Doctrine\ORM\QueryBuilder``or a Closure
172+
**type**: ``string``**required**
182173

183-
If specified, this is used to query the subset of options (and their
184-
order) that should be used for the field. The value of this option can
185-
either be a ``QueryBuilder`` object or a Closure. If using a Closure,
186-
it should take a single argument, which is the ``EntityRepository`` of
187-
the entity and return an instance of ``QueryBuilder``.
174+
The class of your entity (e.g. ``AppBundle:Category``). This can be
175+
a fully-qualified class name (e.g. ``AppBundle\Entity\Category``)
176+
or the short alias name (as shown prior).
188177

189178
em
190179
~~
@@ -194,6 +183,17 @@ em
194183
If specified, this entity manager will be used to load the choices
195184
instead of the ``default`` entity manager.
196185

186+
query_builder
187+
~~~~~~~~~~~~~
188+
189+
**type**: ``Doctrine\ORM\QueryBuilder`` or a Closure
190+
191+
If specified, this is used to query the subset of options (and their
192+
order) that should be used for the field. The value of this option can
193+
either be a ``QueryBuilder`` object or a Closure. If using a Closure,
194+
it should take a single argument, which is the ``EntityRepository`` of
195+
the entity and return an instance of ``QueryBuilder``.
196+
197197
Overridden Options
198198
------------------
199199

@@ -219,20 +219,18 @@ Inherited Options
219219

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

222-
..include::/reference/forms/types/options/choice_value.rst.inc
223-
224-
..include::/reference/forms/types/options/choice_name.rst.inc
225-
226222
..include::/reference/forms/types/options/choice_attr.rst.inc
227223

228-
..include::/reference/forms/types/options/placeholder.rst.inc
224+
..include::/reference/forms/types/options/choice_name.rst.inc
229225

230226
..include::/reference/forms/types/options/choice_translation_domain.rst.inc
231227

232-
..include::/reference/forms/types/options/choice_type_translation_domain.rst.inc
228+
..include::/reference/forms/types/options/choice_value.rst.inc
233229

234230
..include::/reference/forms/types/options/expanded.rst.inc
235231

232+
..include::/reference/forms/types/options/group_by.rst.inc
233+
236234
..include::/reference/forms/types/options/multiple.rst.inc
237235

238236
..note::
@@ -243,7 +241,7 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
243241
is a complete example in the cookbook article
244242
:doc:`/cookbook/form/form_collections`.
245243

246-
..include::/reference/forms/types/options/group_by.rst.inc
244+
..include::/reference/forms/types/options/placeholder.rst.inc
247245

248246
..include::/reference/forms/types/options/preferred_choices.rst.inc
249247

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

255-
These options inherit from the:doc:`FormType</reference/forms/types/form>`:
253+
..include::/reference/forms/types/options/choice_type_translation_domain.rst.inc
254+
255+
These options inherit from the:doc:`form</reference/forms/types/form>`
256+
type:
256257

257258
..include::/reference/forms/types/options/data.rst.inc
258259

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp