Skip to content

Commit 85f51aa

Browse files
committed
Merge branch '4.4'
* 4.4: Edit comment Replace deprecated configuration key Add versionadded directive. refs #12525 Documented $response->getInfo('canceled') Changing my e-mail MoneyType: explain why the divisor option is useful Fix Doctrine Entity Listeners event class Delete apostrophe in custom-transport.rst
2 parents 9de9910 + 3dde3f9 commit 85f51aa

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

components/http_client.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,13 @@ Or throw an exception from a progress callback::
405405
The exception will be wrapped in an instance of ``TransportExceptionInterface``
406406
and will abort the request.
407407

408+
In case the response was canceled using ``$response->cancel()``,
409+
``$response->getInfo('canceled')`` will return ``true``.
410+
411+
.. versionadded:: 4.4
412+
413+
The possibility to get information about canceled or not was introduced in Symfony 4.4.
414+
408415
Handling Exceptions
409416
~~~~~~~~~~~~~~~~~~~
410417

contributing/code_of_conduct/care_team.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ of them at once by emailing **care@symfony.com**:
3131

3232
* **Michelle Sanver**
3333

34-
* *E-mail*: hello [at] michellesanver.com
34+
* *E-mail*: michelle [at] liip.ch
3535
* *Twitter*: `@michellesanver <https://twitter.com/michellesanver>`_
3636
* *SymfonyConnect*: `michellesanver <https://connect.symfony.com/profile/michellesanver>`_
3737

doctrine/events.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ define a listener for the ``postUpdate`` Doctrine event::
233233
namespace App\EventListener;
234234

235235
use App\Entity\User;
236-
use Doctrine\ORM\Event\PreUpdateEventArgs;
236+
use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
237237

238238
class UserChangedNotifier
239239
{
240240
// the entity listener methods receive two arguments:
241241
// the entity instance and the lifecycle event
242-
public function postUpdate(User $user, PreUpdateEventArgs $event)
242+
public function postUpdate(User $user, LifecycleEventArgs $event)
243243
{
244244
// ... do something to notify the changes
245245
}

messenger/custom-transport.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Here is a simplified example of a database transport::
6161
$row = $this->db->createQuery(
6262
'SELECT *
6363
FROM my_queue
64-
WHERE (delivered_at IS NULL OR delivered_at < :redeliver_timeout')
64+
WHERE (delivered_at IS NULL OR delivered_at < :redeliver_timeout)
6565
AND handled = FALSE'
6666
)
6767
->setParameter('redeliver_timeout', new DateTimeImmutable('-5minutes'))

reference/forms/types/money.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ divisor
6969

7070
**type**: ``integer`` **default**: ``1``
7171

72-
If, for some reason, you need to divide your starting value by a number
72+
If you need to divide your starting value by a number
7373
before rendering it to the user, you can use the ``divisor`` option.
74-
For example::
74+
For example if you store prices as integer in order to avoid `rounding errors`_,
75+
you can transform values in cents automatically::
7576

7677
use Symfony\Component\Form\Extension\Core\Type\MoneyType;
7778
// ...
@@ -159,3 +160,4 @@ money_pattern ``string`` The format to use to display the money, including the
159160
============= ========== ===============================================================
160161

161162
.. _`3 letter ISO 4217 code`: https://en.wikipedia.org/wiki/ISO_4217
163+
.. _`rounding errors`: https://0.30000000000000004.com/

workflow.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ As configured, the following property is used by the marking store::
185185
.. tip::
186186

187187
The ``marking_store.type`` (the default value depends on the ``type`` value)
188-
and ``arguments`` (default value ``['marking']``) attributes of the
188+
and ``property`` (default value ``['marking']``) attributes of the
189189
``marking_store`` option are optional. If omitted, their default values will
190190
be used. It's highly recommenced to use the default value.
191191

0 commit comments

Comments
 (0)