Skip to content

Commit 4705d75

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: [Notifier] Add better example for Slack DSN Update events.rst A method call is reversed Update event_dispatcher.rst
2 parents 0a02d3f + 1b6b814 commit 4705d75

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

components/console/helpers/progressbar.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ placeholder before displaying the progress bar::
348348
$progressBar->start();
349349
// 0/100 -- Start
350350

351-
$progressBar->advance();
352351
$progressBar->setMessage('Task is in progress...');
352+
$progressBar->advance();
353353
// 1/100 -- Task is in progress...
354354

355355
Messages can be combined with custom placeholders too. In this example, the

doctrine/events.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on other common tasks (e.g. ``loadClassMetadata``, ``onClear``).
1616

1717
There are different ways to listen to these Doctrine events:
1818

19-
* **Lifecycle callbacks**, they are defined as methods on the entity classes and
19+
* **Lifecycle callbacks**, they are defined as public methods on the entity classes and
2020
they are called when the events are triggered;
2121
* **Lifecycle listeners and subscribers**, they are classes with callback
2222
methods for one or more events and they are called for all entities;
@@ -46,7 +46,7 @@ to learn everything about them.
4646
Doctrine Lifecycle Callbacks
4747
----------------------------
4848

49-
Lifecycle callbacks are defined as methods inside the entity you want to modify.
49+
Lifecycle callbacks are defined as public methods inside the entity you want to modify.
5050
For example, suppose you want to set a ``createdAt`` date column to the current
5151
date, but only when the entity is first persisted (i.e. inserted). To do so,
5252
define a callback for the ``prePersist`` Doctrine event:

event_dispatcher.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ using a special "tag":
108108
$services = $configurator->services();
109109
110110
$services->set(ExceptionListener::class)
111-
->addTag('kernel.event_listener', ['event' => 'kernel.exception'])
111+
->tag('kernel.event_listener', ['event' => 'kernel.exception'])
112112
;
113113
};
114114

notifier.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ Chatters are configured using the ``chatter_transports`` setting:
166166
167167
# .env
168168
SLACK_DSN=slack://default/ID
169+
# If your slack webhook looks like "https://hooks.slack.com/services/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX" then use:
170+
SLACK_DSN=slack://default/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX
169171
170172
.. configuration-block::
171173

0 commit comments

Comments
 (0)