Skip to content

Commit 9adceab

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Testing] [PHPUnit Bridge] Fix link text Updating ICU documentation link. [HttpClient] Mention `extra.trace_content` option
2 parents d2fc0d0 + 1f0a475 commit 9adceab

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

components/phpunit_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Installation
4848
always use its very latest stable major version to get the most accurate
4949
deprecation report.
5050

51-
If you plan to :ref:`write-assertions-about-deprecations` and use the regular
51+
If you plan to :ref:`write assertions about deprecations <write-assertions-about-deprecations>` and use the regular
5252
PHPUnit script (not the modified PHPUnit script provided by Symfony), you have
5353
to register a new `test listener`_ called ``SymfonyTestsListener``:
5454

http_client.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,6 +798,25 @@ ensure local networks are made inaccessible to the HTTP client::
798798
// but all the other requests, including other internal networks, will be allowed
799799
$client = new NoPrivateNetworkHttpClient(HttpClient::create(), ['104.26.14.0/23']);
800800

801+
Profiling
802+
~~~~~~~~~
803+
804+
When you are using the :class:`Symfony\\Component\\HttpClient\\TraceableHttpClient`,
805+
responses content will be kept in memory and may exhaust it.
806+
807+
You can disable this behavior by setting the ``extra.trace_content`` option to ``false``
808+
in your requests::
809+
810+
$response = $client->request('GET', 'https://...', [
811+
'extra' => ['trace_content' => false],
812+
]);
813+
814+
This setting won’t affect other clients.
815+
816+
.. versionadded:: 5.2
817+
818+
The ``extra.trace_content`` option was introduced in Symfony 5.2.
819+
801820
Performance
802821
-----------
803822

reference/constraints/Locale.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,6 @@ Parameter Description
124124

125125
.. include:: /reference/constraints/_payload-option.rst.inc
126126

127-
.. _`ICU format locale IDs`: http://userguide.icu-project.org/locale
127+
.. _`ICU format locale IDs`: https://unicode-org.github.io/icu/userguide/locale/
128128
.. _`ISO 639-1`: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
129129
.. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes

0 commit comments

Comments
 (0)