Skip to content

Commit bd6f7b4

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Fix incorrect PHP example to exclude HTTP code with Monolog [Migration guide] Change Strangler App to Strangler Fig App doc: update tip about authenticator-based Security [HttpClient] Import ServerSentEvent class
2 parents 30adacd + 12d52ea commit bd6f7b4

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

http_client.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,8 @@ Symfony's HTTP client provides an EventSource implementation to consume these
12701270
server-sent events. Use the :class:`Symfony\\Component\\HttpClient\\EventSourceHttpClient`
12711271
to wrap your HTTP client, open a connection to a server that responds with a
12721272
``text/event-stream`` content type and consume the stream as follows::
1273-
1273+
1274+
use Symfony\Component\HttpClient\Chunk\ServerSentEvent;
12741275
use Symfony\Component\HttpClient\EventSourceHttpClient;
12751276

12761277
// the second optional argument is the reconnection time in seconds (default = 10)

logging/monolog_exclude_http_codes.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,14 @@ logging these HTTP codes based on the MonologBundle configuration:
5252
use Symfony\Config\MonologConfig;
5353
5454
return static function (MonologConfig $monolog) {
55-
$monolog->handler('main')
55+
$mainHandler = $monolog->handler('main')
5656
// ...
5757
->type('fingers_crossed')
5858
->handler(...)
59-
->excludedHttpCode([403, 404])
6059
;
60+
61+
$mainHandler->excludedHttpCode()->code(403);
62+
$mainHandler->excludedHttpCode()->code(404);
6163
};
6264
6365
.. caution::

migration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Migrating an Existing Application to Symfony
77
When you have an existing application that was not built with Symfony,
88
you might want to move over parts of that application without rewriting
99
the existing logic completely. For those cases there is a pattern called
10-
`Strangler Application`_. The basic idea of this pattern is to create a
10+
`Strangler Fig Application`_. The basic idea of this pattern is to create a
1111
new application that gradually takes over functionality from an existing
1212
application. This migration approach can be implemented with Symfony in
1313
various ways and has some benefits over a rewrite such as being able
@@ -464,7 +464,7 @@ chance to use Symfony's event lifecycle. For instance, this allows you to
464464
transition the authentication and authorization of the legacy application over
465465
to the Symfony application using the Security component and its firewalls.
466466

467-
.. _`Strangler Application`: https://martinfowler.com/bliki/StranglerFigApplication.html
467+
.. _`Strangler Fig Application`: https://martinfowler.com/bliki/StranglerFigApplication.html
468468
.. _`autoload`: https://getcomposer.org/doc/04-schema.md#autoload
469469
.. _`Modernizing with Symfony`: https://youtu.be/YzyiZNY9htQ
470470
.. _`Symfony Panther`: https://github.com/symfony/panther

security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ install the security feature before using it:
4141
.. tip::
4242

4343
A :doc:`new authenticator-based Security </security/authenticator_manager>`
44-
was introduced in Symfony 5.1, which will eventually replace security in
44+
was introduced in Symfony 5.1, which will replace security in
4545
Symfony 6.0. This system is almost fully backwards compatible with the
4646
current Symfony security, add this line to your security configuration to start
4747
using it:

0 commit comments

Comments
 (0)