Skip to content

Commit 3b557a0

Browse files
committed
Fixed the formatting of several lists to avoid problems when
rendering the documentation on the website
1 parent 2deb5d7 commit 3b557a0

File tree

3 files changed

+59
-59
lines changed

3 files changed

+59
-59
lines changed

components/http_kernel/introduction.rst

+37-37
Original file line numberDiff line numberDiff line change
@@ -241,23 +241,23 @@ will be called after another event - ``kernel.controller`` - is dispatched.
241241
information is typically placed on the ``Request`` via the ``RouterListener``).
242242
This string is then transformed into a PHP callable by doing the following:
243243

244-
a) The ``AcmeDemoBundle:Default:index`` format of the ``_controller`` key
245-
is changed to another string that contains the full class and method
246-
name of the controller by following the convention used in Symfony2 - e.g.
247-
``Acme\DemoBundle\Controller\DefaultController::indexAction``. This transformation
248-
is specific to the :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver`
249-
sub-class used by the Symfony2 Framework.
244+
#. The ``AcmeDemoBundle:Default:index`` format of the ``_controller`` key
245+
is changed to another string that contains the full class and method
246+
name of the controller by following the convention used in Symfony2 - e.g.
247+
``Acme\DemoBundle\Controller\DefaultController::indexAction``. This transformation
248+
is specific to the :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver`
249+
sub-class used by the Symfony2 Framework.
250250

251-
b) A new instance of your controller class is instantiated with no
252-
constructor arguments.
251+
#. A new instance of your controller class is instantiated with no
252+
constructor arguments.
253253

254-
c) If the controller implements :class:`Symfony\\Component\\DependencyInjection\\ContainerAwareInterface`,
255-
``setContainer`` is called on the controller object and the container
256-
is passed to it. This step is also specific to the :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver`
257-
sub-class used by the Symfony2 Framework.
254+
#. If the controller implements :class:`Symfony\\Component\\DependencyInjection\\ContainerAwareInterface`,
255+
``setContainer`` is called on the controller object and the container
256+
is passed to it. This step is also specific to the :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver`
257+
sub-class used by the Symfony2 Framework.
258258

259-
There are also a few other variations on the above process (e.g. if
260-
you're registering your controllers as services).
259+
There are also a few other variations on the above process (e.g. if
260+
you're registering your controllers as services).
261261

262262
.. _component-http-kernel-kernel-controller:
263263

@@ -324,15 +324,15 @@ of arguments that should be passed when executing that callable.
324324
It then iterates over each of these arguments and uses the following tricks
325325
to determine which value should be passed for each argument:
326326

327-
a) If the ``Request`` attributes bag contains a key that matches the name
328-
of the argument, that value is used. For example, if the first argument
329-
to a controller is ``$slug``, and there is a ``slug`` key in the ``Request``
330-
``attributes`` bag, that value is used (and typically this value came
331-
from the ``RouterListener``).
327+
#. If the ``Request`` attributes bag contains a key that matches the name
328+
of the argument, that value is used. For example, if the first argument
329+
to a controller is ``$slug``, and there is a ``slug`` key in the ``Request``
330+
``attributes`` bag, that value is used (and typically this value came
331+
from the ``RouterListener``).
332332

333-
b) If the argument in the controller is type-hinted with Symfony's
334-
:class:`Symfony\\Component\\HttpFoundation\\Request` object, then the
335-
``Request`` is passed in as the value.
333+
#. If the argument in the controller is type-hinted with Symfony's
334+
:class:`Symfony\\Component\\HttpFoundation\\Request` object, then the
335+
``Request`` is passed in as the value.
336336

337337
.. _component-http-kernel-calling-controller:
338338

@@ -527,21 +527,21 @@ below for more details).
527527
and is called :class:`Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener`.
528528
The listener has several goals:
529529

530-
1) The thrown exception is converted into a
531-
:class:`Symfony\\Component\\HttpKernel\\Exception\\FlattenException`
532-
object, which contains all the information about the request, but which
533-
can be printed and serialized.
534-
535-
2) If the original exception implements
536-
:class:`Symfony\\Component\\HttpKernel\\Exception\\HttpExceptionInterface`,
537-
then ``getStatusCode`` and ``getHeaders`` are called on the exception
538-
and used to populate the headers and status code of the ``FlattenException``
539-
object. The idea is that these are used in the next step when creating
540-
the final response.
541-
542-
3) A controller is executed and passed the flattened exception. The exact
543-
controller to render is passed as a constructor argument to this listener.
544-
This controller will return the final ``Response`` for this error page.
530+
#. The thrown exception is converted into a
531+
:class:`Symfony\\Component\\HttpKernel\\Exception\\FlattenException`
532+
object, which contains all the information about the request, but which
533+
can be printed and serialized.
534+
535+
#. If the original exception implements
536+
:class:`Symfony\\Component\\HttpKernel\\Exception\\HttpExceptionInterface`,
537+
then ``getStatusCode`` and ``getHeaders`` are called on the exception
538+
and used to populate the headers and status code of the ``FlattenException``
539+
object. The idea is that these are used in the next step when creating
540+
the final response.
541+
542+
#. A controller is executed and passed the flattened exception. The exact
543+
controller to render is passed as a constructor argument to this listener.
544+
This controller will return the final ``Response`` for this error page.
545545

546546
**ExceptionListener in Security**
547547

cookbook/form/data_transformers.rst

+11-11
Original file line numberDiff line numberDiff line change
@@ -189,21 +189,21 @@ types of underlying data.
189189
.. image:: /images/cookbook/form/DataTransformersTypes.png
190190
:align: center
191191

192-
In any form, the 3 different types of data are:
192+
In any form, the three different types of data are:
193193

194-
1) **Model data** - This is the data in the format used in your application
195-
(e.g. an ``Issue`` object). If you call ``Form::getData`` or ``Form::setData``,
196-
you're dealing with the "model" data.
194+
#. **Model data** - This is the data in the format used in your application
195+
(e.g. an ``Issue`` object). If you call ``Form::getData`` or ``Form::setData``,
196+
you're dealing with the "model" data.
197197

198-
2) **Norm Data** - This is a normalized version of your data, and is commonly
199-
the same as your "model" data (though not in our example). It's not commonly
200-
used directly.
198+
#. **Norm Data** - This is a normalized version of your data, and is commonly
199+
the same as your "model" data (though not in our example). It's not commonly
200+
used directly.
201201

202-
3) **View Data** - This is the format that's used to fill in the form fields
203-
themselves. It's also the format in which the user will submit the data. When
204-
you call ``Form::submit($data)``, the ``$data`` is in the "view" data format.
202+
#. **View Data** - This is the format that's used to fill in the form fields
203+
themselves. It's also the format in which the user will submit the data. When
204+
you call ``Form::submit($data)``, the ``$data`` is in the "view" data format.
205205

206-
The 2 different types of transformers help convert to and from each of these
206+
The two different types of transformers help convert to and from each of these
207207
types of data:
208208

209209
**Model transformers**:

cookbook/form/dynamic_form_modification.rst

+11-11
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ How to Dynamically Modify Forms Using Form Events
77
Often times, a form can't be created statically. In this entry, you'll learn
88
how to customize your form based on three common use-cases:
99

10-
1) :ref:`cookbook-form-events-underlying-data`
10+
#. :ref:`cookbook-form-events-underlying-data`
1111

12-
Example: you have a "Product" form and need to modify/add/remove a field
13-
based on the data on the underlying Product being edited.
12+
Example: you have a "Product" form and need to modify/add/remove a field
13+
based on the data on the underlying Product being edited.
1414

15-
2) :ref:`cookbook-form-events-user-data`
15+
#. :ref:`cookbook-form-events-user-data`
1616

17-
Example: you create a "Friend Message" form and need to build a drop-down
18-
that contains only users that are friends with the *current* authenticated
19-
user.
17+
Example: you create a "Friend Message" form and need to build a drop-down
18+
that contains only users that are friends with the *current* authenticated
19+
user.
2020

21-
3) :ref:`cookbook-form-events-submitted-data`
21+
#. :ref:`cookbook-form-events-submitted-data`
2222

23-
Example: on a registration form, you have a "country" field and a "state"
24-
field which should populate dynamically based on the value in the "country"
25-
field.
23+
Example: on a registration form, you have a "country" field and a "state"
24+
field which should populate dynamically based on the value in the "country"
25+
field.
2626

2727
If you wish to learn more about the basics behind form events, you can
2828
take a look at the :doc:`Form Events </components/form/form_events>`

0 commit comments

Comments
 (0)