Skip to content

Commit a352a48

Browse files
committed
Merge branch '7.3' into 7.4
* 7.3: Update advanced-config.rst framework.rst: fixed `cookie_samesite` default value [DomCrawler] Remove useless note about useHtml5Parser argument clarify that "placeholder" is an input attribute to configure
2 parents e4f629c + 35ea6df commit a352a48

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

components/dom_crawler.rst

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -649,23 +649,8 @@ another given base URI::
649649
UriResolver::resolve('?a=b', 'http://localhost/bar#foo'); // http://localhost/bar?a=b
650650
UriResolver::resolve('../../', 'http://localhost/'); // http://localhost/
651651

652-
Using a HTML5 Parser
653-
~~~~~~~~~~~~~~~~~~~~
654-
655-
If you need the :class:`Symfony\\Component\\DomCrawler\\Crawler` to use an HTML5
656-
parser, set its ``useHtml5Parser`` constructor argument to ``true``::
657-
658-
use Symfony\Component\DomCrawler\Crawler;
659-
660-
$crawler = new Crawler(null, $uri, useHtml5Parser: true);
661-
662-
By doing so, the crawler will use the HTML5 parser provided by the `masterminds/html5`_
663-
library to parse the documents.
664-
665652
Learn more
666653
----------
667654

668655
* :doc:`/testing`
669656
* :doc:`/components/css_selector`
670-
671-
.. _`masterminds/html5`: https://packagist.org/packages/masterminds/html5

frontend/encore/advanced-config.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Use the following command to find the right service:
165165

166166
.. code-block:: terminal
167167
168-
$ php bin/console console debug:container entrypoint_lookup
168+
$ php bin/console debug:container entrypoint_lookup
169169
170170
# You will see a result similar to this:
171171
Select one of the following services to display its information:

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3040,7 +3040,7 @@ If not set, ``php.ini``'s `session.cookie_path`_ directive will be relied on.
30403040
cookie_samesite
30413041
...............
30423042

3043-
**type**: ``string`` or ``null`` **default**: ``null``
3043+
**type**: ``string`` or ``null`` **default**: ``'lax'``
30443044

30453045
It controls the way cookies are sent when the HTTP request did not originate
30463046
from the same domain that is associated with the cookies. Setting this option is

reference/forms/types/options/empty_data_description.rst.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ when no value is selected, you can do it like this::
1212
]);
1313

1414
This will still render an empty text box, but upon submission the ``John Doe``
15-
value will be set. Use the ``data`` or ``placeholder`` options to show this
16-
initial value in the rendered form.
15+
value will be set. Use the ``data`` option or the ``placeholder`` key of the
16+
``attr`` option to show this initial value in the rendered form.
1717

1818
.. note::
1919

0 commit comments

Comments
 (0)