Skip to content

Commit aab4044

Browse files
committed
Merge branch '2.4' into 2.5
* 2.4: Fix xml route configuration for routing condition Remove "Controllers extends ContainerAware" best practice Fixed the format of one letter-based list Fixed bad indenting (the list was treated as a blockquote)
2 parents 99932cf + 1eec58b commit aab4044

File tree

4 files changed

+13
-33
lines changed

4 files changed

+13
-33
lines changed

book/routing.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -747,11 +747,9 @@ can be extended to have an almost infinite flexibility using ``conditions``:
747747
xsi:schemaLocation="http://symfony.com/schema/routing
748748
http://symfony.com/schema/routing/routing-1.0.xsd">
749749
750-
<route id="contact"
751-
path="/contact"
752-
condition="context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
753-
>
750+
<route id="contact" path="/contact">
754751
<default key="_controller">AcmeDemoBundle:Main:contact</default>
752+
<condition>context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'</condition>
755753
</route>
756754
</routes>
757755

cookbook/bundles/best_practices.rst

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -194,23 +194,6 @@ Extensive documentation should also be provided in the
194194
the ``Resources/doc/`` directory; the ``Resources/doc/index.rst`` file is
195195
the only mandatory file and must be the entry point for the documentation.
196196

197-
Controllers
198-
-----------
199-
200-
As a best practice, controllers in a bundle that's meant to be distributed
201-
to others must not extend the
202-
:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` base class.
203-
They can implement
204-
:class:`Symfony\\Component\\DependencyInjection\\ContainerAwareInterface` or
205-
extend :class:`Symfony\\Component\\DependencyInjection\\ContainerAware`
206-
instead.
207-
208-
.. note::
209-
210-
If you have a look at
211-
:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` methods,
212-
you will see that they are only nice shortcuts to ease the learning curve.
213-
214197
Routing
215198
-------
216199

cookbook/email/cloud.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,17 @@ And that's it, you're ready to start sending emails through the cloud!
101101

102102
If you intend to use Amazon SES, please note the following:
103103

104-
* You have to sign up to `Amazon Web Services (AWS)`_;
104+
* You have to sign up to `Amazon Web Services (AWS)`_;
105105

106-
* Every sender address used in the ``From`` or ``Return-Path`` (bounce
107-
address) header needs to be confirmed by the owner. You can also
108-
confirm an entire domain;
106+
* Every sender address used in the ``From`` or ``Return-Path`` (bounce
107+
address) header needs to be confirmed by the owner. You can also
108+
confirm an entire domain;
109109

110-
* Initially you are in a restricted sandbox mode. You need to request
111-
production access before being allowed to send to arbitrary
112-
recipients;
110+
* Initially you are in a restricted sandbox mode. You need to request
111+
production access before being allowed to send to arbitrary
112+
recipients;
113113

114-
* SES may be subject to a charge.
114+
* SES may be subject to a charge.
115115

116116
.. _`Amazon's Simple Email Service (SES)`: http://aws.amazon.com/ses
117117
.. _`SES console`: https://console.aws.amazon.com/ses

reference/constraints/Expression.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ properties::
5353

5454
To validate the object, you have some special requirements:
5555

56-
* A) If ``isTechnicalPost`` is true, then ``category`` must be either ``php``
57-
or ``symfony``;
58-
59-
* B) If ``isTechnicalPost`` is false, then ``category`` can be anything.
56+
A) If ``isTechnicalPost`` is true, then ``category`` must be either ``php``
57+
or ``symfony``;
58+
B) If ``isTechnicalPost`` is false, then ``category`` can be anything.
6059

6160
One way to accomplish this is with the Expression constraint:
6261

0 commit comments

Comments
 (0)