Skip to content

Commit 35ea6df

Browse files
committed
Merge branch '6.4' into 7.3
* 6.4: Update advanced-config.rst [DomCrawler] Remove useless note about useHtml5Parser argument clarify that "placeholder" is an input attribute to configure
2 parents 06fe160 + ee0672a commit 35ea6df

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
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/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)