Skip to content

Commit 9b0dccf

Browse files
wouterjwouterj
committed
Merge branch '2.8' into 3.0
Conflicts: components/http_foundation/introduction.rst reference/forms/types/choice.rst reference/twig_reference.rst
2 parents 7874bd0 + 778a7f9 commit 9b0dccf

34 files changed

+932
-618
lines changed

‎book/forms.rst‎

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

260260
#. When the user submits the form, :method:`Symfony\\Component\\Form\\FormInterface::handleRequest`
261261
recognizes this and immediately writes the submitted data back into the
262262
``task`` and ``dueDate`` properties of the ``$task`` object. Then this object
263263
is validated. If it is invalid (validation is covered in the next section),
264-
:method:`Symfony\\Component\\Form\\FormInterface::isValid` returns ``false``
265-
again, so the form is rendered together with all validation errors;
266-
267-
.. note::
268-
269-
You can use the method :method:`Symfony\\Component\\Form\\FormInterface::isSubmitted`
270-
to check whether a form was submitted, regardless of whether or not the
271-
submitted data is actually valid.
264+
:method:`Symfony\\Component\\Form\\FormInterface::isValid` returns
265+
``false``, so the form is rendered together with all validation errors;
272266

273267
#. When the user submits the form with valid data, the submitted data is again
274268
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
@@ -1550,7 +1550,7 @@ Generating Absolute URLs
15501550
~~~~~~~~~~~~~~~~~~~~~~~~
15511551

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

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

‎book/templating.rst‎

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

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

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

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

‎changelog.rst‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,93 @@ 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+
* `#6032 <https://github.com/symfony/symfony-docs/pull/6032>`_ [DependencyInjection] Autowiring doc (dunglas)
25+
* `#6233 <https://github.com/symfony/symfony-docs/pull/6233>`_ Document translation_domain for choice fields (merorafael, WouterJ)
26+
* `#5655 <https://github.com/symfony/symfony-docs/pull/5655>`_ Added doc about Homestead's Symfony integration (WouterJ)
27+
* `#5886 <https://github.com/symfony/symfony-docs/pull/5886>`_ [2.8] Add "How to Use Multiple Guard Authenticators" cookbook documentation (mheki)
28+
* `#6072 <https://github.com/symfony/symfony-docs/pull/6072>`_ Add browserkit component documentation (yamiko, yamiko-ninja, robert Parker, javiereguiluz)
29+
* `#6243 <https://github.com/symfony/symfony-docs/pull/6243>`_ Add missing getBoolean() method (bocharsky-bw)
30+
* `#6231 <https://github.com/symfony/symfony-docs/pull/6231>`_ Use hash_equals instead of StringUtils::equals (WouterJ)
31+
* `#5530 <https://github.com/symfony/symfony-docs/pull/5530>`_ [Cookbook, Security] Added user_checkers.rst (iltar)
32+
* `#5920 <https://github.com/symfony/symfony-docs/pull/5920>`_ Document automatic registration of extension compiler passes (WouterJ)
33+
* `#5724 <https://github.com/symfony/symfony-docs/pull/5724>`_ Describe configuration behaviour with multiple mailers (xelan)
34+
* `#6077 <https://github.com/symfony/symfony-docs/pull/6077>`_ fixes #5971 (vincentaubert)
35+
* `#5483 <https://github.com/symfony/symfony-docs/pull/5483>`_ [FrameworkBundle] Name converter of Serializer (dunglas)
36+
* `#6156 <https://github.com/symfony/symfony-docs/pull/6156>`_ [reference] [form] [options] fix #6153 (HeahDude)
37+
* `#6104 <https://github.com/symfony/symfony-docs/pull/6104>`_ Fix #6103 (zsturgess)
38+
* `#6058 <https://github.com/symfony/symfony-docs/pull/6058>`_ Update Testing Form Types article for 2.8 refactorings (WouterJ)
39+
* `#5856 <https://github.com/symfony/symfony-docs/pull/5856>`_ Reworded the "How to use Gmail" cookbook article (javiereguiluz)
40+
* `#6230 <https://github.com/symfony/symfony-docs/pull/6230>`_ Add annotation to glossary (rebased) (DerStoffel)
41+
* `#5642 <https://github.com/symfony/symfony-docs/pull/5642>`_ Documented label_format option (WouterJ)
42+
43+
Fixed Documentation
44+
~~~~~~~~~~~~~~~~~~~
45+
46+
* `#5995 <https://github.com/symfony/symfony-docs/pull/5995>`_ Update dev_environment.rst (gonzalovilaseca)
47+
* `#6240 <https://github.com/symfony/symfony-docs/pull/6240>`_ [#6224] some tweaks (xabbuh)
48+
* `#5513 <https://github.com/symfony/symfony-docs/pull/5513>`_ [load_balancer_reverse_proxy ] Always use 127.0.0.1 as a trusted proxy (ruudk)
49+
* `#6124 <https://github.com/symfony/symfony-docs/pull/6124>`_ [cookbook] Add annotations block and fix regex (peterkokot)
50+
51+
Minor Documentation Changes
52+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
53+
54+
* `#6308 <https://github.com/symfony/symfony-docs/pull/6308>`_ fix literal syntax (xabbuh)
55+
* `#6298 <https://github.com/symfony/symfony-docs/pull/6298>`_ Update dependency_injection.rst because it has an error. (joserprieto)
56+
* `#6263 <https://github.com/symfony/symfony-docs/pull/6263>`_ [Cookbook][Debugging] reflect behavior changes in cache generation (xabbuh)
57+
* `#6251 <https://github.com/symfony/symfony-docs/pull/6251>`_ To use annotations, files must be removed (pbowyer)
58+
* `#6288 <https://github.com/symfony/symfony-docs/pull/6288>`_ Update factories.rst (velikanov)
59+
* `#6278 <https://github.com/symfony/symfony-docs/pull/6278>`_ [HttpFoundation] Fix typo for ParameterBag getters (rendler-denis)
60+
* `#6280 <https://github.com/symfony/symfony-docs/pull/6280>`_ Fix syntax of Company class example (cakper)
61+
* `#6284 <https://github.com/symfony/symfony-docs/pull/6284>`_ [Book] [Routing] Fix third param true to UrlGeneratorInterface::ABSOLUTE_URI (eriwin)
62+
* `#6269 <https://github.com/symfony/symfony-docs/pull/6269>`_ [Cookbook][Bundles]fix yaml syntax (mhor)
63+
* `#6277 <https://github.com/symfony/symfony-docs/pull/6277>`_ remove dot in front of colon (xabbuh)
64+
* `#6255 <https://github.com/symfony/symfony-docs/pull/6255>`_ [Cookbook][Doctrine] some tweaks to the Doctrine registration article (xabbuh)
65+
* `#6229 <https://github.com/symfony/symfony-docs/pull/6229>`_ Rewrite EventDispatcher introduction (WouterJ)
66+
* `#6260 <https://github.com/symfony/symfony-docs/pull/6260>`_ add missing options `choice_value`, `choice_name` and `choice_attr` to `EntityType` (HeahDude)
67+
* `#6262 <https://github.com/symfony/symfony-docs/pull/6262>`_ [Form] reorder options in choice types references (HeahDude)
68+
* `#6256 <https://github.com/symfony/symfony-docs/pull/6256>`_ Fixed code example (twifty)
69+
* `#6253 <https://github.com/symfony/symfony-docs/pull/6253>`_ [Security] Include guard firewall configuration sample. (calinpristavu)
70+
* `#6250 <https://github.com/symfony/symfony-docs/pull/6250>`_ [Cookbook][Console] remove note about memory spool handling on CLI (xabbuh)
71+
* `#6249 <https://github.com/symfony/symfony-docs/pull/6249>`_ [Cookbook][Serializer] fix wording (xabbuh)
72+
* `#6246 <https://github.com/symfony/symfony-docs/pull/6246>`_ removed duplicate lines (seferov)
73+
* `#6222 <https://github.com/symfony/symfony-docs/pull/6222>`_ Updated "Learn more from the Cookbook" section (sfdumi)
74+
* `#6245 <https://github.com/symfony/symfony-docs/pull/6245>`_ [Cookbook][Console] change API doc class name (xabbuh)
75+
* `#6223 <https://github.com/symfony/symfony-docs/pull/6223>`_ Improveme the apache/mod_php configuration example (gnat42)
76+
* `#6234 <https://github.com/symfony/symfony-docs/pull/6234>`_ File System Security Issue in Custom Auth Article (finished) (mattjanssen, WouterJ)
77+
* `#4773 <https://github.com/symfony/symfony-docs/pull/4773>`_ [Cookbook] Make registration_form follow best practices (xelaris)
78+
* `#5630 <https://github.com/symfony/symfony-docs/pull/5630>`_ Add a caution about logout when using http-basic authenticated firewall (rmed19)
79+
* `#6215 <https://github.com/symfony/symfony-docs/pull/6215>`_ Added a caution about failing cache warmers (javiereguiluz)
80+
* `#6239 <https://github.com/symfony/symfony-docs/pull/6239>`_ Remove app_dev as build-in server is used (rmed19, WouterJ)
81+
* `#6241 <https://github.com/symfony/symfony-docs/pull/6241>`_ [ExpressionLanguage] Add caution about backslash handling (zerustech, WouterJ)
82+
* `#6235 <https://github.com/symfony/symfony-docs/pull/6235>`_ #6232 update forms as services section (backbone87)
83+
* `#6236 <https://github.com/symfony/symfony-docs/pull/6236>`_ fix some minor typos (xabbuh)
84+
* `#6237 <https://github.com/symfony/symfony-docs/pull/6237>`_ use literals for external class names (xabbuh)
85+
* `#6206 <https://github.com/symfony/symfony-docs/pull/6206>`_ add separate placeholder examples for birthday, datetime and time type (snoek09)
86+
* `#6238 <https://github.com/symfony/symfony-docs/pull/6238>`_ fix directive name (xabbuh)
87+
* `#6224 <https://github.com/symfony/symfony-docs/pull/6224>`_ Note to create a service if you extend ExceptionController (pamuche)
88+
* `#5958 <https://github.com/symfony/symfony-docs/pull/5958>`_ Update security.rst (mpaquet)
89+
* `#6092 <https://github.com/symfony/symfony-docs/pull/6092>`_ Updated information about testing code coverage. (roga)
90+
* `#6051 <https://github.com/symfony/symfony-docs/pull/6051>`_ Mention HautelookAliceBundle in best practices (theofidry, WouterJ)
91+
* `#6044 <https://github.com/symfony/symfony-docs/pull/6044>`_ Added note about the hash_equals polyfill (WouterJ)
92+
* `#6213 <https://github.com/symfony/symfony-docs/pull/6213>`_ Update form_collections.rst (insekticid)
93+
* `#6220 <https://github.com/symfony/symfony-docs/pull/6220>`_ [book] fixes typo about redirect status codes in the controller chapter. (hhamon)
94+
* `#6227 <https://github.com/symfony/symfony-docs/pull/6227>`_ Update testing.rst (dvapelnik)
95+
* `#6228 <https://github.com/symfony/symfony-docs/pull/6228>`_ removed unnecessary exception from repository (gondo)
96+
* `#6212 <https://github.com/symfony/symfony-docs/pull/6212>`_ Typo in default session save_path (DerekRoth)
97+
* `#6208 <https://github.com/symfony/symfony-docs/pull/6208>`_ Replace references of PSR-0 with PSR-4 (opdavies)
98+
* `#6170 <https://github.com/symfony/symfony-docs/pull/6170>`_ change translation getMessages() to getCatalogue() (snoek09)
99+
* `#6225 <https://github.com/symfony/symfony-docs/pull/6225>`_ [Reference][Forms] add versionadded directive for range type (xabbuh)
100+
* `#6190 <https://github.com/symfony/symfony-docs/pull/6190>`_ Fix redundant command line sample (sylozof)
101+
102+
16103
January, 2016
17104
-------------
18105

‎components/dependency_injection/autowiring.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.. index::
22
single: DependencyInjection; Autowiring
33

4-
Defining Services Dependencies Automatically
5-
============================================
4+
Defining Services Dependencies Automatically (Autowiring)
5+
=========================================================
66

77
.. versionadded:: 2.8
88
Support for autowiring services was introduced in Symfony 2.8.
@@ -76,7 +76,7 @@ service is marked as autowired:
7676
<services>
7777
<service id="twitter_client" class="AppBundle\TwitterClient" autowire="true" />
7878
</services>
79-
</services>
79+
</container>
8080
8181
.. code-block:: php
8282
@@ -191,7 +191,7 @@ And update ``TwitterClient`` to depend of this new interface::
191191
}
192192

193193
Finally the service definition must be updated because, obviously, the autowiring
194-
subsystem isn't able to find itself the interface implementation to register::
194+
subsystem isn't able to find itself the interface implementation to register:
195195

196196
.. configuration-block::
197197

@@ -218,7 +218,7 @@ subsystem isn't able to find itself the interface implementation to register::
218218
<service id="rot13_transformer" class="AppBundle\Rot13Transformer" />
219219
<service id="twitter_client" class="AppBundle\TwitterClient" autowire="true" />
220220
</services>
221-
</services>
221+
</container>
222222
223223
.. code-block:: php
224224
@@ -314,7 +314,7 @@ transformer::
314314
}
315315

316316
The last step is to update service definitions to register this new implementation
317-
and a Twitter client using it::
317+
and a Twitter client using it:
318318

319319
.. configuration-block::
320320

@@ -356,7 +356,7 @@ and a Twitter client using it::
356356
<argument type="service" id="uppercase_rot13_transformer" />
357357
</service>
358358
</services>
359-
</services>
359+
</container>
360360
361361
.. code-block:: php
362362

‎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)