Skip to content

Commit 607ec30

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [DomCrawler] Clarify the ways to add contents [HttpFoundation] Fix IpUtils example
2 parents 35d498f + a370d63 commit 607ec30

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

components/dom_crawler.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,9 @@ context of the crawler::
269269
Adding the Content
270270
~~~~~~~~~~~~~~~~~~
271271

272-
The crawler supports multiple ways of adding the content::
272+
The crawler supports multiple ways of adding the content, but they are mutually
273+
exclusive, so you can only use one of them to add content (e.g. if you pass the
274+
content to the ``Crawler`` constructor, you can't call ``addContent()`` later)::
273275

274276
$crawler = new Crawler('<html><body/></html>');
275277

components/http_foundation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,11 +346,11 @@ analysis purposes. Use the ``anonymize()`` method from the
346346
use Symfony\Component\HttpFoundation\IpUtils;
347347

348348
$ipv4 = '123.234.235.236';
349-
$anonymousIpv4 = IPUtils::anonymize($ipv4);
349+
$anonymousIpv4 = IpUtils::anonymize($ipv4);
350350
// $anonymousIpv4 = '123.234.235.0'
351351

352352
$ipv6 = '2a01:198:603:10:396e:4789:8e99:890f';
353-
$anonymousIpv6 = IPUtils::anonymize($ipv6);
353+
$anonymousIpv6 = IpUtils::anonymize($ipv6);
354354
// $anonymousIpv6 = '2a01:198:603:10::'
355355

356356
Accessing other Data

0 commit comments

Comments
 (0)