Skip to content

Commit 1e104b5

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: Minor tweaks Recommend registering the error handler in prod validator: comparison constraints value Minor fixes in the Doctrine listeners article
2 parents 585f3ed + 99a8323 commit 1e104b5

File tree

10 files changed

+17
-14
lines changed

10 files changed

+17
-14
lines changed

components/debug.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ tools.
3737

3838
.. caution::
3939

40-
You should never enable the debug tools in a production environment as
41-
they might disclose sensitive information to the user.
40+
You should never enable the debug tools, except for the error handler, in a
41+
production environment as they might disclose sensitive information to the user.
4242

4343
Enabling the Error Handler
4444
--------------------------
@@ -52,6 +52,9 @@ fatal errors)::
5252

5353
ErrorHandler::register();
5454

55+
This error handler is enabled by default in the production environment when the
56+
application uses the FrameworkBundle because it generates better error logs.
57+
5558
Enabling the Exception Handler
5659
------------------------------
5760

doctrine/event_listeners_subscribers.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ entity), you should check for the entity's class type in your method
129129

130130
In Doctrine 2.4, a feature called Entity Listeners was introduced.
131131
It is a lifecycle listener class used for an entity. You can read
132-
about it in `the Doctrine Documentation`_.
132+
about it in `the DoctrineBundle documentation`_.
133133

134134
Creating the Subscriber Class
135135
-----------------------------
@@ -240,9 +240,6 @@ to the tag like so:
240240
  Marking an event listener as ``lazy`` has nothing to do with lazy service
241241
definitions which are described :doc:`in their own article </service_container/lazy_services>`
242242

243-
.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
244-
.. _`the Doctrine Documentation`: https://symfony.com/doc/current/bundles/DoctrineBundle/entity-listeners.html
245-
246243
Priorities for Event Listeners
247244
------------------------------
248245

@@ -297,3 +294,6 @@ numbers mean that listeners are invoked earlier.
297294
->autowire(MyLowPriorityListener::class)
298295
->addTag('doctrine.event_listener', ['event' => 'postPersist', 'priority' => 1])
299296
;
297+
298+
.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
299+
.. _`the DoctrineBundle documentation`: https://symfony.com/doc/current/bundles/DoctrineBundle/entity-listeners.html

reference/constraints/EqualTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ and that the ``age`` is ``20``, you could do the following:
7575
<class name="App\Entity\Person">
7676
<property name="firstName">
7777
<constraint name="EqualTo">
78-
<value>Mary</value>
78+
Mary
7979
</constraint>
8080
</property>
8181
<property name="age">

reference/constraints/GreaterThan.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following constraints ensure that:
7474
<class name="App\Entity\Person">
7575
<property name="siblings">
7676
<constraint name="GreaterThan">
77-
<value>5</value>
77+
5
7878
</constraint>
7979
</property>
8080
<property name="age">

reference/constraints/GreaterThanOrEqual.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The following constraints ensure that:
7272
<class name="App\Entity\Person">
7373
<property name="siblings">
7474
<constraint name="GreaterThanOrEqual">
75-
<value>5</value>
75+
5
7676
</constraint>
7777
</property>
7878
<property name="age">

reference/constraints/IdenticalTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The following constraints ensure that:
7878
<class name="App\Entity\Person">
7979
<property name="firstName">
8080
<constraint name="IdenticalTo">
81-
<value>Mary</value>
81+
Mary
8282
</constraint>
8383
</property>
8484
<property name="age">

reference/constraints/LessThan.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following constraints ensure that:
7474
<class name="App\Entity\Person">
7575
<property name="siblings">
7676
<constraint name="LessThan">
77-
<value>5</value>
77+
5
7878
</constraint>
7979
</property>
8080
<property name="age">

reference/constraints/LessThanOrEqual.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The following constraints ensure that:
7272
<class name="App\Entity\Person">
7373
<property name="siblings">
7474
<constraint name="LessThanOrEqual">
75-
<value>5</value>
75+
5
7676
</constraint>
7777
</property>
7878
<property name="age">

reference/constraints/NotEqualTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ the following:
7777
<class name="App\Entity\Person">
7878
<property name="firstName">
7979
<constraint name="NotEqualTo">
80-
<value>Mary</value>
80+
Mary
8181
</constraint>
8282
</property>
8383
<property name="age">

reference/constraints/NotIdenticalTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The following constraints ensure that:
7878
<class name="App\Entity\Person">
7979
<property name="firstName">
8080
<constraint name="NotIdenticalTo">
81-
<value>Mary</value>
81+
Mary
8282
</constraint>
8383
</property>
8484
<property name="age">

0 commit comments

Comments
 (0)