Skip to content

Commit d38f9c9

Browse files
committed
minor #17858 Use DOCtor-RST 1.38.2 (OskarStark)
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- Use DOCtor-RST 1.38.2 ⚠️ Please don't merge! Thanks! Commits ------- a6299f6 Use DOCtor-RST 1.38.2
2 parents 6210895 + a6299f6 commit d38f9c9

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.doctor-rst.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ rules:
5454
versionadded_directive_should_have_version: ~
5555
yaml_instead_of_yml_suffix: ~
5656
yarn_dev_option_at_the_end: ~
57+
no_merge_conflict:
5758

5859
# master
5960
versionadded_directive_major_version:
@@ -88,7 +89,6 @@ whitelist:
8889
- '"foo",' # assertion for var_dumper - components/var_dumper.rst
8990
- '$var .= "Because of this `\xE9` octet (\\xE9),\n";'
9091
- '.. versionadded:: 0.2' # MercureBundle
91-
- '.. code-block:: twig'
9292
- '.. versionadded:: 3.6' # MonologBundle
9393
- '.. versionadded:: 3.8' # MonologBundle
9494
- '// bin/console'

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
7474

7575
- name: "Run DOCtor-RST"
76-
uses: docker://oskarstark/doctor-rst:1.35.1
76+
uses: docker://oskarstark/doctor-rst:1.38.2
7777
with:
7878
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache
7979

frontend/encore/simple-example.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ To build the assets, run the following if you use the Yarn package manager:
7575
$ yarn dev-server
7676
# or
7777
$ npm run dev-server
78-
78+
7979
# compile assets once
8080
$ yarn dev
8181
# or
@@ -229,7 +229,7 @@ to initialize Stimulus and automatically load any "controllers" from the
229229

230230
Let's look at a simple Stimulus example. In a Twig template, suppose you have:
231231

232-
.. code-block:: twig
232+
.. code-block:: html+twig
233233

234234
<div {{ stimulus_controller('say-hello') }}>
235235
<input type="text" {{ stimulus_target('say-hello', 'name') }}>

frontend/ux.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ controller available! In this example, it's called
100100
into the ``{{ stimulus_controller() }}`` function from WebpackEncoreBundle, and
101101
it will normalize it:
102102

103-
.. code-block:: twig
103+
.. code-block:: html+twig
104104

105105
<div {{ stimulus_controller('@symfony/ux-chartjs/chart') }}>
106106

mercure.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ Subscribing
261261

262262
Subscribing to updates in JavaScript from a Twig template is straightforward:
263263

264-
.. code-block:: twig
264+
.. code-block:: html+twig
265265

266266
<script>
267267
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.
278278
If you want to access to this URL from an external JavaScript file, generate the
279279
URL in a dedicated HTML element:
280280

281-
.. code-block:: twig
281+
.. code-block:: html+twig
282282

283283
<script type="application/json" id="mercure-url">
284284
{{ 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,
296296
and to use URI Templates or the special value ``*`` (matched by all topics)
297297
as patterns:
298298

299-
.. code-block:: twig
299+
.. code-block:: html+twig
300300

301301
<script>
302302
{# 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
427427
of the ``EventSource`` class is set to ``true``. Then, the Hub verifies the
428428
validity of the provided JWT, and extract the topic selectors from it.
429429

430-
.. code-block:: twig
430+
.. code-block:: html+twig
431431

432432
<script>
433433
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.
455455
The native implementation of EventSource doesn't allow specifying headers.
456456
For example, authorization using a Bearer token. In order to achieve that, use `a polyfill`_
457457

458-
.. code-block:: twig
458+
.. code-block:: html+twig
459459

460460
<script>
461461
const es = new EventSourcePolyfill("{{ mercure('https://example.com/books/1') }}", {

0 commit comments

Comments
 (0)