From a6299f62c8fa0c581c2223227a3062ed2ffb3a8e Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Fri, 3 Feb 2023 11:54:57 +0100
Subject: [PATCH] Use DOCtor-RST 1.38.2

---
 .doctor-rst.yaml                   |  2 +-
 .github/workflows/ci.yaml          |  2 +-
 frontend/encore/simple-example.rst |  4 ++--
 frontend/ux.rst                    |  2 +-
 mercure.rst                        | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.doctor-rst.yaml b/.doctor-rst.yaml
index 9247ed41dfe..3cebb1a12f8 100644
--- a/.doctor-rst.yaml
+++ b/.doctor-rst.yaml
@@ -54,6 +54,7 @@ rules:
     versionadded_directive_should_have_version: ~
     yaml_instead_of_yml_suffix: ~
     yarn_dev_option_at_the_end: ~
+    no_merge_conflict:
 
     #   master
     versionadded_directive_major_version:
@@ -88,7 +89,6 @@ whitelist:
         - '"foo",' # assertion for var_dumper - components/var_dumper.rst
         - '$var .= "Because of this `\xE9` octet (\\xE9),\n";'
         - '.. versionadded:: 0.2' # MercureBundle
-        - '.. code-block:: twig'
         - '.. versionadded:: 3.6' # MonologBundle
         - '.. versionadded:: 3.8' # MonologBundle
         - '// bin/console'
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 48fc477767a..e42b78e849c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -73,7 +73,7 @@ jobs:
                     key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
 
             -   name: "Run DOCtor-RST"
-                uses: docker://oskarstark/doctor-rst:1.35.1
+                uses: docker://oskarstark/doctor-rst:1.38.2
                 with:
                     args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
 
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
index c2fc50289a5..d41da8daf84 100644
--- a/frontend/encore/simple-example.rst
+++ b/frontend/encore/simple-example.rst
@@ -75,7 +75,7 @@ To build the assets, run the following if you use the Yarn package manager:
     $ yarn dev-server
     # or
     $ npm run dev-server
-    
+
     # compile assets once
     $ yarn dev
     # or
@@ -229,7 +229,7 @@ to initialize Stimulus and automatically load any "controllers" from the
 
 Let's look at a simple Stimulus example. In a Twig template, suppose you have:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     <div {{ stimulus_controller('say-hello') }}>
         <input type="text" {{ stimulus_target('say-hello', 'name') }}>
diff --git a/frontend/ux.rst b/frontend/ux.rst
index 86fddf852bc..1396a28a582 100644
--- a/frontend/ux.rst
+++ b/frontend/ux.rst
@@ -100,7 +100,7 @@ controller available! In this example, it's called
 into the ``{{ stimulus_controller() }}`` function from WebpackEncoreBundle, and
 it will normalize it:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     <div {{ stimulus_controller('@symfony/ux-chartjs/chart') }}>
 
diff --git a/mercure.rst b/mercure.rst
index 3bbdb38dce9..a5c2823df5b 100644
--- a/mercure.rst
+++ b/mercure.rst
@@ -261,7 +261,7 @@ Subscribing
 
 Subscribing to updates in JavaScript from a Twig template is straightforward:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     <script>
     const eventSource = new EventSource("{{ mercure('https://example.com/books/1')|escape('js') }}");
@@ -278,7 +278,7 @@ parameters corresponding to the topics passed as first argument.
 If you want to access to this URL from an external JavaScript file, generate the
 URL in a dedicated HTML element:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     <script type="application/json" id="mercure-url">
     {{ mercure('https://example.com/books/1')|json_encode(constant('JSON_UNESCAPED_SLASHES') b-or constant('JSON_HEX_TAG'))|raw }}
@@ -296,7 +296,7 @@ Mercure also allows subscribing to several topics,
 and to use URI Templates or the special value ``*`` (matched by all topics)
 as patterns:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     <script>
     {# Subscribe to updates of several Book resources and to all Review resources matching the given pattern #}
@@ -427,7 +427,7 @@ passed by the browsers to the Mercure hub if the ``withCredentials`` attribute
 of the ``EventSource`` class is set to ``true``. Then, the Hub verifies the
 validity of the provided JWT, and extract the topic selectors from it.
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     <script>
     const eventSource = new EventSource("{{ mercure('https://example.com/books/1', { subscribe: 'https://example.com/books/1' })|escape('js') }}", {
@@ -455,7 +455,7 @@ is the way to go.
     The native implementation of EventSource doesn't allow specifying headers.
     For example, authorization using a Bearer token. In order to achieve that, use `a polyfill`_
 
-    .. code-block:: twig
+    .. code-block:: html+twig
 
         <script>
         const es = new EventSourcePolyfill("{{ mercure('https://example.com/books/1') }}", {