Skip to content

Commit 8e08e35

Browse files
wouterjwouterj
committed
Merge branch '2.7' into 2.8
Conflicts: components/form/introduction.rst reference/forms/types/choice.rst
2 parents 0f32eef + 29567b1 commit 8e08e35

32 files changed

+932
-675
lines changed

‎book/forms.rst‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -273,21 +273,15 @@ possible paths:
273273
#. When initially loading the page in a browser, the form is simply created and
274274
rendered. :method:`Symfony\\Component\\Form\\FormInterface::handleRequest`
275275
recognizes that the form was not submitted and does nothing.
276-
:method:`Symfony\\Component\\Form\\FormInterface::isValid` returns ``false``
276+
:method:`Symfony\\Component\\Form\\FormInterface::isSubmitted` returns ``false``
277277
if the form was not submitted.
278278

279279
#. When the user submits the form, :method:`Symfony\\Component\\Form\\FormInterface::handleRequest`
280280
recognizes this and immediately writes the submitted data back into the
281281
``task`` and ``dueDate`` properties of the ``$task`` object. Then this object
282282
is validated. If it is invalid (validation is covered in the next section),
283-
:method:`Symfony\\Component\\Form\\FormInterface::isValid` returns ``false``
284-
again, so the form is rendered together with all validation errors;
285-
286-
.. note::
287-
288-
You can use the method :method:`Symfony\\Component\\Form\\FormInterface::isSubmitted`
289-
to check whether a form was submitted, regardless of whether or not the
290-
submitted data is actually valid.
283+
:method:`Symfony\\Component\\Form\\FormInterface::isValid` returns
284+
``false``, so the form is rendered together with all validation errors;
291285

292286
#. When the user submits the form with valid data, the submitted data is again
293287
written into the form, but this time :method:`Symfony\\Component\\Form\\FormInterface::isValid`

‎book/routing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@ Generating Absolute URLs
15541554
~~~~~~~~~~~~~~~~~~~~~~~~
15551555

15561556
By default, the router will generate relative URLs (e.g. ``/blog``). From
1557-
a controller, simply pass ``true`` to the third argument of the ``generateUrl()``
1557+
a controller, simply pass ``UrlGeneratorInterface::ABSOLUTE_URL`` to the third argument of the ``generateUrl()``
15581558
method::
15591559

15601560
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;

‎book/templating.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ being used and generating the correct paths accordingly.
10711071
Additionally, if you use the ``asset`` function, Symfony can automatically
10721072
append a query string to your asset, in order to guarantee that updated static
10731073
assets won't be cached when deployed. For example, ``/images/logo.png`` might
1074-
look like ``/images/logo.png?v2``. For more information, see the :ref:`ref-framework-assets-version`
1074+
look like ``/images/logo.png?v2``. For more information, see the :ref:`reference-framework-assets-version`
10751075
configuration option.
10761076

10771077
.. _`book-templating-version-by-asset`:
@@ -1095,7 +1095,7 @@ if you are using Twig (or the fourth argument if you are using PHP) to the desir
10951095
) ?>" alt="Symfony!" />
10961096

10971097
If you don't give a version or pass ``null``, the default package version
1098-
(from :ref:`ref-framework-assets-version`) will be used. If you pass ``false``,
1098+
(from :ref:`reference-framework-assets-version`) will be used. If you pass ``false``,
10991099
versioned URL will be deactivated for this asset.
11001100

11011101
If you need absolute URLs for assets, you can use the ``absolute_url`` function

‎changelog.rst‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,77 @@ 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+
February, 2016
17+
--------------
18+
19+
New Documentation
20+
~~~~~~~~~~~~~~~~~
21+
22+
* `#6172 <https://github.com/symfony/symfony-docs/pull/6172>`_ move assets options from templating to assets section and add base_path documentation (snoek09)
23+
* `#6021 <https://github.com/symfony/symfony-docs/pull/6021>`_ mention routing from the database (dbu)
24+
* `#6233 <https://github.com/symfony/symfony-docs/pull/6233>`_ Document translation_domain for choice fields (merorafael, WouterJ)
25+
* `#5655 <https://github.com/symfony/symfony-docs/pull/5655>`_ Added doc about Homestead's Symfony integration (WouterJ)
26+
* `#6072 <https://github.com/symfony/symfony-docs/pull/6072>`_ Add browserkit component documentation (yamiko, yamiko-ninja, robert Parker, javiereguiluz)
27+
* `#6243 <https://github.com/symfony/symfony-docs/pull/6243>`_ Add missing getBoolean() method (bocharsky-bw)
28+
* `#6231 <https://github.com/symfony/symfony-docs/pull/6231>`_ Use hash_equals instead of StringUtils::equals (WouterJ)
29+
* `#5724 <https://github.com/symfony/symfony-docs/pull/5724>`_ Describe configuration behaviour with multiple mailers (xelan)
30+
* `#6077 <https://github.com/symfony/symfony-docs/pull/6077>`_ fixes #5971 (vincentaubert)
31+
* `#6156 <https://github.com/symfony/symfony-docs/pull/6156>`_ [reference] [form] [options] fix #6153 (HeahDude)
32+
* `#6104 <https://github.com/symfony/symfony-docs/pull/6104>`_ Fix #6103 (zsturgess)
33+
* `#5856 <https://github.com/symfony/symfony-docs/pull/5856>`_ Reworded the "How to use Gmail" cookbook article (javiereguiluz)
34+
* `#6230 <https://github.com/symfony/symfony-docs/pull/6230>`_ Add annotation to glossary (rebased) (DerStoffel)
35+
* `#5642 <https://github.com/symfony/symfony-docs/pull/5642>`_ Documented label_format option (WouterJ)
36+
37+
Fixed Documentation
38+
~~~~~~~~~~~~~~~~~~~
39+
40+
* `#5995 <https://github.com/symfony/symfony-docs/pull/5995>`_ Update dev_environment.rst (gonzalovilaseca)
41+
* `#6240 <https://github.com/symfony/symfony-docs/pull/6240>`_ [#6224] some tweaks (xabbuh)
42+
* `#5513 <https://github.com/symfony/symfony-docs/pull/5513>`_ [load_balancer_reverse_proxy ] Always use 127.0.0.1 as a trusted proxy (ruudk)
43+
* `#6124 <https://github.com/symfony/symfony-docs/pull/6124>`_ [cookbook] Add annotations block and fix regex (peterkokot)
44+
45+
Minor Documentation Changes
46+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
47+
48+
* `#6308 <https://github.com/symfony/symfony-docs/pull/6308>`_ fix literal syntax (xabbuh)
49+
* `#6251 <https://github.com/symfony/symfony-docs/pull/6251>`_ To use annotations, files must be removed (pbowyer)
50+
* `#6288 <https://github.com/symfony/symfony-docs/pull/6288>`_ Update factories.rst (velikanov)
51+
* `#6278 <https://github.com/symfony/symfony-docs/pull/6278>`_ [HttpFoundation] Fix typo for ParameterBag getters (rendler-denis)
52+
* `#6280 <https://github.com/symfony/symfony-docs/pull/6280>`_ Fix syntax of Company class example (cakper)
53+
* `#6284 <https://github.com/symfony/symfony-docs/pull/6284>`_ [Book] [Routing] Fix third param true to UrlGeneratorInterface::ABSOLUTE_URI (eriwin)
54+
* `#6269 <https://github.com/symfony/symfony-docs/pull/6269>`_ [Cookbook][Bundles]fix yaml syntax (mhor)
55+
* `#6255 <https://github.com/symfony/symfony-docs/pull/6255>`_ [Cookbook][Doctrine] some tweaks to the Doctrine registration article (xabbuh)
56+
* `#6229 <https://github.com/symfony/symfony-docs/pull/6229>`_ Rewrite EventDispatcher introduction (WouterJ)
57+
* `#6260 <https://github.com/symfony/symfony-docs/pull/6260>`_ add missing options `choice_value`, `choice_name` and `choice_attr` to `EntityType` (HeahDude)
58+
* `#6262 <https://github.com/symfony/symfony-docs/pull/6262>`_ [Form] reorder options in choice types references (HeahDude)
59+
* `#6256 <https://github.com/symfony/symfony-docs/pull/6256>`_ Fixed code example (twifty)
60+
* `#6250 <https://github.com/symfony/symfony-docs/pull/6250>`_ [Cookbook][Console] remove note about memory spool handling on CLI (xabbuh)
61+
* `#6249 <https://github.com/symfony/symfony-docs/pull/6249>`_ [Cookbook][Serializer] fix wording (xabbuh)
62+
* `#6246 <https://github.com/symfony/symfony-docs/pull/6246>`_ removed duplicate lines (seferov)
63+
* `#6222 <https://github.com/symfony/symfony-docs/pull/6222>`_ Updated "Learn more from the Cookbook" section (sfdumi)
64+
* `#6245 <https://github.com/symfony/symfony-docs/pull/6245>`_ [Cookbook][Console] change API doc class name (xabbuh)
65+
* `#6223 <https://github.com/symfony/symfony-docs/pull/6223>`_ Improveme the apache/mod_php configuration example (gnat42)
66+
* `#6234 <https://github.com/symfony/symfony-docs/pull/6234>`_ File System Security Issue in Custom Auth Article (finished) (mattjanssen, WouterJ)
67+
* `#4773 <https://github.com/symfony/symfony-docs/pull/4773>`_ [Cookbook] Make registration_form follow best practices (xelaris)
68+
* `#5630 <https://github.com/symfony/symfony-docs/pull/5630>`_ Add a caution about logout when using http-basic authenticated firewall (rmed19)
69+
* `#6215 <https://github.com/symfony/symfony-docs/pull/6215>`_ Added a caution about failing cache warmers (javiereguiluz)
70+
* `#6239 <https://github.com/symfony/symfony-docs/pull/6239>`_ Remove app_dev as build-in server is used (rmed19, WouterJ)
71+
* `#6241 <https://github.com/symfony/symfony-docs/pull/6241>`_ [ExpressionLanguage] Add caution about backslash handling (zerustech, WouterJ)
72+
* `#6236 <https://github.com/symfony/symfony-docs/pull/6236>`_ fix some minor typos (xabbuh)
73+
* `#6237 <https://github.com/symfony/symfony-docs/pull/6237>`_ use literals for external class names (xabbuh)
74+
* `#6206 <https://github.com/symfony/symfony-docs/pull/6206>`_ add separate placeholder examples for birthday, datetime and time type (snoek09)
75+
* `#6238 <https://github.com/symfony/symfony-docs/pull/6238>`_ fix directive name (xabbuh)
76+
* `#6224 <https://github.com/symfony/symfony-docs/pull/6224>`_ Note to create a service if you extend ExceptionController (pamuche)
77+
* `#5958 <https://github.com/symfony/symfony-docs/pull/5958>`_ Update security.rst (mpaquet)
78+
* `#6092 <https://github.com/symfony/symfony-docs/pull/6092>`_ Updated information about testing code coverage. (roga)
79+
* `#6051 <https://github.com/symfony/symfony-docs/pull/6051>`_ Mention HautelookAliceBundle in best practices (theofidry, WouterJ)
80+
* `#6220 <https://github.com/symfony/symfony-docs/pull/6220>`_ [book] fixes typo about redirect status codes in the controller chapter. (hhamon)
81+
* `#6227 <https://github.com/symfony/symfony-docs/pull/6227>`_ Update testing.rst (dvapelnik)
82+
* `#6212 <https://github.com/symfony/symfony-docs/pull/6212>`_ Typo in default session save_path (DerekRoth)
83+
* `#6208 <https://github.com/symfony/symfony-docs/pull/6208>`_ Replace references of PSR-0 with PSR-4 (opdavies)
84+
* `#6190 <https://github.com/symfony/symfony-docs/pull/6190>`_ Fix redundant command line sample (sylozof)
85+
86+
1687
January, 2016
1788
-------------
1889

‎components/dependency_injection/factories.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ configure the service container to use the
5252
<factory class="NewsletterManagerFactory" method="createNewsletterManager" />
5353
</service>
5454
</services>
55-
</services>
55+
</container>
5656
5757
.. code-block:: php
5858

0 commit comments

Comments
 (0)