8000 Merge branch '2.8' into 3.0 · symfony/symfony-docs@d380d37 · GitHub
[go: up one dir, main page]
Skip to content

Commit d380d37

Browse files
wouterjwouterj
committed
Merge branch '2.8' into 3.0
Conflicts: cookbook/form/direct_submit.rst
2 parents fe40a49 + 501c208 commit d380d37

File tree

6 files changed

+84
-9
lines changed

6 files changed

+84
-9
lines changed

‎book/controller.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ to ``$name``. Just make sure they the name of the placeholder is the
260260
same as the name of the argument variable.
261261

262262
Take the following more-interesting example, where the controller has two
263-
arguments::
263+
arguments:
264264

265265
.. configuration-block::
266266

@@ -681,7 +681,7 @@ read any flash messages from the session:
681681

682682
.. code-block:: html+twig
683683

684-
{% for flash_message in app.session.flashbag.get('notice') %}
684+
{% for flash_message in app.session.flashBag.get('notice') %}
685685
<div class="flash-notice">
686686
{{ flash_message }}
687687
</div>
@@ -714,7 +714,7 @@ The Request and Response Object
714714
-------------------------------
715715

716716
As mentioned :ref:`earlier <book-controller-request-argument>`, the framework will
717-
pass the ``Request`` object to any controller argument taht is type-hinted with
717+
pass the ``Request`` object to any controller argument that is type-hinted with
718718
the ``Request`` class::
719719

720720
use Symfony\Component\HttpFoundation\Request;

‎book/forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ the documentation for each type.
662662
:ref:`disable HTML5 validation <book-forms-html5-validation-disable>`
663663
or set the ``required`` option on your field to ``false``::
664664
665-
->add('dueDate', 'date', array(
665+
->add('dueDate', DateType::class, array(
666666
'widget' => 'single_text',
667667
'required' => false
668668
))

‎changelog.rst

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,74 @@ documentation.
1313
Do you also want to participate in the Symfony Documentation? Take a look
1414
at the ":doc:`/contributing/documentation/overview`" article.
1515

16+
March, 2016
17+
-----------
18+
19+
New Documentation
20+
~~~~~~~~~~~~~~~~~
21+
22+
* `#6282 <https://github.com/symfony/symfony-docs/pull/6282>`_ [Form] fix ``choice_label`` values (HeahDude)
23+
* `#5894 <https://github.com/symfony/symfony-docs/pull/5894>`_ [WIP] Added an article to explain how to upgrade third-party bundles to Symfony 3 (javiereguiluz)
24+
* `#6273 <https://github.com/symfony/symfony-docs/pull/6273>`_ [PHPUnit bridge] Add documentation for the component (theofidry)
25+
* `#6291 <https://github.com/symfony/symfony-docs/pull/6291>`_ fortrabbit deployment guide + index listing (ostark)
26+
27+
Fixed Documentation
28+
~~~~~~~~~~~~~~~~~~~
29+
30+
* `#6377 <https://github.com/symfony/symfony-docs/pull/6377>`_ Update "bootstrap.php.cache" to "autoload.php" (guilliamxavier)
31+
* `#6368 <https://github.com/symfony/symfony-docs/pull/6368>`_ [cookbook] Made list of form types more consistent (AAstakhov)
32+
* `#6366 <https://github.com/symfony/symfony-docs/pull/6366>`_ Removed server:stop code block for 2.3 (theyoux)
33+
* `#6347 <https://github.com/symfony/symfony-docs/pull/6347>`_ Add a note about enabling DebugBundle to use VarDumper inside Symfony (martijn80, javiereguiluz)
34+
* `#6320 <https://github.com/symfony/symfony-docs/pull/6320>`_ Fixed typo in path (timhovius)
35+
* `#6334 <https://github.com/symfony/symfony-docs/pull/6334>`_ Fixed yaml configuration of app.exception_controller (AAstakhov)
36+
* `#6322 <https://github.com/symfony/symfony-docs/pull/6322>`_ [DependencyInjection] fix autowiring docs (eXtreme)
37+
* `#6315 <https://github.com/symfony/symfony-docs/pull/6315>`_ Remove third parameter from createFormBuilder call (Hocdoc)
38+
* `#6324 <https://github.com/symfony/symfony-docs/pull/6324>`_ Fixed UserCheckerInterface importing (VIs-a-vis)
39+
40+
Minor Documentation Changes
41+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
42+
43+
* `#6404 <https://github.com/symfony/symfony-docs/pull/6404>`_ fixed a typo (RickieL)
44+
* `#6409 <https://github.com/symfony/symfony-docs/pull/6409>`_ Update 'date' to DateType::class in form.rst (iltar)
45+
* `#6411 <https://github.com/symfony/symfony-docs/pull/6411>`_ Fixed a typo in configuration-block (VarunAgw)
46+
* `#6414 <https://github.com/symfony/symfony-docs/pull/6414>`_ stick to Sphinx 1.3.x for the moment (xabbuh)
47+
* `#6399 <https://github.com/symfony/symfony-docs/pull/6399>`_ Fixed wrong code examples for Isbn constraint (AAstakhov)
48+
* `#6397 <https://github.com/symfony/symfony-docs/pull/6397>`_ Fix typo in SwitchUserListener file name (luxifer)
49+
* `#6390 <https://github.com/symfony/symfony-docs/pull/6390>`_ Reworded the example about $deep param (Oliboy50, javiereguiluz)
50+
* `#6381 <https://github.com/symfony/symfony-docs/pull/6381>`_ [Form] [Cookbook] Correctly setup unit tests with dependencies (corphi)
51+
* `#6382 <https://github.com/symfony/symfony-docs/pull/6382>`_ unused use instructions (bshevchenko)
52+
* `#6365 <https://github.com/symfony/symfony-docs/pull/6365>`_ Removed the PR table example (this is now included by GitHub template) (javiereguiluz)
53+
* `#6363 <https://github.com/symfony/symfony-docs/pull/6363>`_ Removed info about reducing visibility for private (AAstakhov)
54+
* `#6362 <https://github.com/symfony/symfony-docs/pull/6362>`_ [book] Updated link to Translatable Extension (AAstakhov)
55+
* `#6336 <https://github.com/symfony/symfony-docs/pull/6336>`_ Added minor clarification (ThomasLandauer)
56+
* `#6303 <https://github.com/symfony/symfony-docs/pull/6303>`_ Tweaked the Symfony Releases page (javiereguiluz)
57+
* `#6360 <https://github.com/symfony/symfony-docs/pull/6360>`_ Editing the Doctrine section to improve accuracy and readability (natechicago)
58+
* `#6352 <https://github.com/symfony/symfony-docs/pull/6352>`_ [book] controller ch review, part 3 (Talita Kocjan Zager)
59+
* `#6351 <https://github.com/symfony/symfony-docs/pull/6351>`_ [book] controller ch review, part 2 (Talita Kocjan Zager)
60+
* `#6349 <https://github.com/symfony/symfony-docs/pull/6349>`_ [book] controller ch review, part 1 (Talita Kocjan Zager)
61+
* `#6369 <https://github.com/symfony/symfony-docs/pull/6369>`_ Minor corrections (sfdumi)
62+
* `#6370 <https://github.com/symfony/symfony-docs/pull/6370>`_ Fixed typo (tabbi89)
63+
* `#6371 <https://github.com/symfony/symfony-docs/pull/6371>`_ Fix escaping of backtick inside double back-quotes (guilliamxavier)
64+
* `#6364 <https://github.com/symfony/symfony-docs/pull/6364>`_ [reference] [constraints] added missing colon character for Image constraint documentation in YAML format. (hhamon)
65+
* `#6345 <https://github.com/symfony/symfony-docs/pull/6345>`_ Remove link-local IPv6 address (snoek09)
66+
* `#6219 <https://github.com/symfony/symfony-docs/pull/6219>`_ Point that route parameters are also Request attributes (sfdumi)
67+
* `#6348 <https://github.com/symfony/symfony-docs/pull/6348>`_ [best practices] mostly typos (Talita Kocjan Zager)
68+
* `#6275 <https://github.com/symfony/symfony-docs/pull/6275>`_ [quick tour] mostly typos (Talita Kocjan Zager)
69+
* `#6305 <https://github.com/symfony/symfony-docs/pull/6305>`_ Mention IvoryCKEditorBundle in the Symfony Forms doc (javiereguiluz)
70+
* `#6331 <https://github.com/symfony/symfony-docs/pull/6331>`_ Rename DunglasApiBundle to ApiPlatform (sroze)
71+
* `#6328 <https://github.com/symfony/symfony-docs/pull/6328>`_ Update extension.rst - added caution box for people trying to remove the default file with services definitions (Pavel Jurecka)
72+
* `#6343 <https://github.com/symfony/symfony-docs/pull/6343>`_ Replace XLIFF number ids by strings (Triiistan)
73+
* `#6344 <https://github.com/symfony/symfony-docs/pull/6344>`_ Altered single / multiple inheritance sentence (outspaced)
74+
* `#6330 <https://github.com/symfony/symfony-docs/pull/6330>`_ [Form] reorder EntityType options (HeahDude)
75+
* `#6337 <https://github.com/symfony/symfony-docs/pull/6337>`_ Fix configuration.rst typo (gong023)
76+
* `#6295 <https://github.com/symfony/symfony-docs/pull/6295>`_ Update tools.rst (andrewtch)
77+
* `#6323 <https://github.com/symfony/symfony-docs/pull/6323>`_ [DependencyInjection] Add Autowiring keyword (theofidry)
78+
* `#6325 <https://github.com/symfony/symfony-docs/pull/6325>`_ Minor error (ThomasLandauer)
79+
* `#6311 <https://github.com/symfony/symfony-docs/pull/6311>`_ Improved TwigExtension to show default values and optional arguments (javiereguiluz)
80+
* `#6267 <https://github.com/symfony/symfony-docs/pull/6267>`_ [Form] fix 'data_class' option in EntityType (HeahDude)
81+
* `#6281 <https://github.com/symfony/symfony-docs/pull/6281>`_ Change isValid to isSubmitted. (mustafaaloko)
82+
83+
1684
February, 2016
1785
--------------
1886

‎cookbook/form/direct_submit.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,10 @@ method, pass the submitted data directly to
7676
directly on the field::
7777

7878
$form->get('firstName')->submit('Fabien');
79+
80+
.. tip::
81+
82+
When submitting a form via a "PATCH" request, you may want to update only a few
83+
submitted fields. To achieve this, you may pass an optional second boolean
84+
parameter to ``submit()``. Passing ``false`` will remove any missing fields
85+
within the form object. Otherwise, the mising fields will be set to ``null``.

‎cookbook/session/avoid_session_start.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ that a session is *always* started:
1515

1616
.. code-block:: html+twig
1717

18-
{% for flashMessage in app.session.flashbag.get('notice') %}
18+
{% for flashMessage in app.session.flashBag.get('notice') %}
1919
<div class="flash-notice">
2020
{{ flashMessage }}
2121
</div>
2222
{% endfor %}
2323

2424
Even if the user is not logged in and even if you haven't created any flash messages,
25-
just calling the ``get()`` (or even ``has()``) method of the ``flashbag`` will
25+
just calling the ``get()`` (or even ``has()``) method of the ``flashBag`` will
2626
start a session. This may hurt your application performance because all users will
2727
receive a session cookie. To avoid this behavior, add a check before trying to
2828
access the flash messages:
2929

3030
.. code-block:: html+twig
3131

3232
{% if app.request.hasPreviousSession %}
33-
{% for flashMessage in app.session.flashbag.get('notice') %}
33+
{% for flashMessage in app.session.flashBag.get('notice') %}
3434
<div class="flash-notice">
3535
{{ flashMessage }}
3636
</div>

‎quick_tour/the_controller.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ And you can display the flash message in the template like this:
331331

332332
.. code-block:: html+twig
333333

334-
{% for flashMessage in app.session.flashbag.get('notice') %}
334+
{% for flashMessage in app.session.flashBag.get('notice') %}
335335
<div class="flash-notice">
336336
{{ flashMessage }}
337337
</div>
@@ -344,4 +344,4 @@ That's all there is to it and I'm not even sure you'll have spent the full
344344
10 minutes. You were briefly introduced to bundles in the first part and
345345
all the features you've learned about so far are part of the core FrameworkBundle.
346346
But thanks to bundles, everything in Symfony can be extended or replaced.
347-
That's the topic of the :doc:`next part of this tutorial <the_architecture>`.
347+
That's the topic of the :doc:`next part of this tutorial <the_architecture>`.

0 commit comments

Comments
 (0)
0