Skip to content

Commit 42f127f

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Remove an unused link Update Twig links and change symfony/var-dumper package installation command Fix Markdown code syntax instead of RST Fix link of the package chart js for Symfony UX
2 parents ec845c3 + ad0ebaf commit 42f127f

File tree

12 files changed

+29
-30
lines changed

12 files changed

+29
-30
lines changed

components/form.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,4 +784,4 @@ Learn more
784784
/form/*
785785

786786
.. _Twig: https://twig.symfony.com
787-
.. _`Twig Configuration`: https://twig.symfony.com/doc/2.x/intro.html
787+
.. _`Twig Configuration`: https://twig.symfony.com/doc/3.x/intro.html

contributing/documentation/standards.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ In addition, documentation follows these rules:
191191
* trivial
192192

193193
.. _`the Sphinx documentation`: https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#literal-blocks
194-
.. _`Twig Coding Standards`: https://twig.symfony.com/doc/2.x/coding_standards.html
194+
.. _`Twig Coding Standards`: https://twig.symfony.com/doc/3.x/coding_standards.html
195195
.. _`reserved by the IANA`: https://tools.ietf.org/html/rfc2606#section-3
196196
.. _`American English`: https://en.wikipedia.org/wiki/American_English
197197
.. _`American English Oxford Dictionary`: https://www.lexico.com/definition/american_english

form/form_customization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,4 +443,4 @@ Variable Usage
443443
variables a particular field has, find the source code for the form
444444
field (and its parent fields) and look at the above two functions.
445445

446-
.. _`the Twig documentation`: https://twig.symfony.com/doc/2.x/templates.html#test-operator
446+
.. _`the Twig documentation`: https://twig.symfony.com/doc/3.x/templates.html#test-operator

form/form_themes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,5 +644,5 @@ is a collection of fields (e.g. a whole form), and not just an individual field:
644644
.. _`Foundation CSS framework`: https://get.foundation/
645645
.. _`tailwind_2_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/tailwind_2_layout.html.twig
646646
.. _`Tailwind CSS form plugin`: https://tailwindcss-forms.vercel.app/
647-
.. _`Twig "use" tag`: https://twig.symfony.com/doc/2.x/tags/use.html
648-
.. _`Twig parent() function`: https://twig.symfony.com/doc/2.x/functions/parent.html
647+
.. _`Twig "use" tag`: https://twig.symfony.com/doc/3.x/tags/use.html
648+
.. _`Twig parent() function`: https://twig.symfony.com/doc/3.x/functions/parent.html

frontend/_ux-libraries.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
.. _`ux-turbo`: https://symfony.com/bundles/ux-turbo/current/index.html
1111
.. _`ux-live-component`: https://symfony.com/bundles/ux-live-component/current/index.html
1212
.. _`ux-twig-component`: https://symfony.com/bundles/ux-twig-component/current/index.html
13-
.. _`ux-chartjs`: https://symfony.com/bundles/ux-chart-js/current/index.html
13+
.. _`ux-chartjs`: https://symfony.com/bundles/ux-chartjs/current/index.html
1414
.. _`ux-lazy-image`: https://symfony.com/bundles/ux-lazy-image/current/index.html
1515
.. _`ux-cropperjs`: https://symfony.com/bundles/ux-cropperjs/current/index.html
1616
.. _`ux-dropzone`: https://symfony.com/bundles/ux-dropzone/current/index.html

frontend/encore/installation.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ a system that you'll learn about soon:
188188
And finally, create an ``assets/controllers.json`` file, which also fits into
189189
the Stimulus system:
190190

191-
```json
192-
{
193-
"controllers": [],
194-
"entrypoints": []
195-
}
196-
```
191+
.. code-block:: json
192+
193+
{
194+
"controllers": [],
195+
"entrypoints": []
196+
}
197197
198198
You'll customize and learn more about these files in :doc:`/frontend/encore/simple-example`.
199199
When you execute Encore, it will ask you to install a few more dependencies based

reference/configuration/twig.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,5 +344,5 @@ If set to ``true``, Symfony shows an exception whenever a Twig variable,
344344
attribute or method doesn't exist. If set to ``false`` these errors are ignored
345345
and the non-existing values are replaced by ``null``.
346346

347-
.. _`the optimizer extension`: https://twig.symfony.com/doc/2.x/api.html#optimizer-extension
347+
.. _`the optimizer extension`: https://twig.symfony.com/doc/3.x/api.html#optimizer-extension
348348
.. _`XSS attacks`: https://en.wikipedia.org/wiki/Cross-site_scripting

reference/dic_tags.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,6 +1309,6 @@ Then, tag it with the ``validator.initializer`` tag (it has no options).
13091309
For an example, see the ``DoctrineInitializer`` class inside the Doctrine
13101310
Bridge.
13111311

1312-
.. _`Twig's documentation`: https://twig.symfony.com/doc/2.x/advanced.html#creating-an-extension
1313-
.. _`Twig Loader`: https://twig.symfony.com/doc/2.x/api.html#loaders
1312+
.. _`Twig's documentation`: https://twig.symfony.com/doc/3.x/advanced.html#creating-an-extension
1313+
.. _`Twig Loader`: https://twig.symfony.com/doc/3.x/api.html#loaders
13141314
.. _`PHP class preloading`: https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.preload

reference/forms/types/map.rst.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,5 @@ Base Fields
7575

7676
* :doc:`FormType </reference/forms/types/form>`
7777

78-
.. _`Symfony UX initiative`: https://github.com/symfony/ux#readme
7978
.. _`CropperType`: https://github.com/symfony/ux/tree/2.x/src/Cropperjs#readme
8079
.. _`DropzoneType`: https://github.com/symfony/ux/tree/2.x/src/Dropzone#readme

reference/twig_reference.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,4 +649,4 @@ The ``app`` variable is injected automatically by Symfony in all templates and
649649
provides access to lots of useful application information. Read more about the
650650
:ref:`Twig global app variable <twig-app-variable>`.
651651

652-
.. _`default filters and functions defined by Twig`: https://twig.symfony.com/doc/2.x/#reference
652+
.. _`default filters and functions defined by Twig`: https://twig.symfony.com/doc/3.x/#reference

templates.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ First, make sure that the VarDumper component is installed in the application:
695695

696696
.. code-block:: terminal
697697
698-
$ composer require symfony/var-dumper
698+
$ composer require --dev symfony/var-dumper
699699
700700
Then, use either the ``{% dump %}`` tag or the ``{{ dump() }}`` function
701701
depending on your needs:
@@ -1205,16 +1205,16 @@ Learn more
12051205
/templating/*
12061206

12071207
.. _`Twig`: https://twig.symfony.com
1208-
.. _`tags`: https://twig.symfony.com/doc/2.x/tags/index.html
1209-
.. _`filters`: https://twig.symfony.com/doc/2.x/filters/index.html
1210-
.. _`functions`: https://twig.symfony.com/doc/2.x/functions/index.html
1211-
.. _`with_context`: https://twig.symfony.com/doc/2.x/functions/include.html
1212-
.. _`Twig template loader`: https://twig.symfony.com/doc/2.x/api.html#loaders
1213-
.. _`Twig raw filter`: https://twig.symfony.com/doc/2.x/filters/raw.html
1214-
.. _`Twig output escaping docs`: https://twig.symfony.com/doc/2.x/api.html#escaper-extension
1208+
.. _`tags`: https://twig.symfony.com/doc/3.x/tags/index.html
1209+
.. _`filters`: https://twig.symfony.com/doc/3.x/filters/index.html
1210+
.. _`functions`: https://twig.symfony.com/doc/3.x/functions/index.html
1211+
.. _`with_context`: https://twig.symfony.com/doc/3.x/functions/include.html
1212+
.. _`Twig template loader`: https://twig.symfony.com/doc/3.x/api.html#loaders
1213+
.. _`Twig raw filter`: https://twig.symfony.com/doc/3.x/filters/raw.html
1214+
.. _`Twig output escaping docs`: https://twig.symfony.com/doc/3.x/api.html#escaper-extension
12151215
.. _`snake case`: https://en.wikipedia.org/wiki/Snake_case
1216-
.. _`Twig template inheritance`: https://twig.symfony.com/doc/2.x/tags/extends.html
1217-
.. _`Twig block tag`: https://twig.symfony.com/doc/2.x/tags/block.html
1216+
.. _`Twig template inheritance`: https://twig.symfony.com/doc/3.x/tags/extends.html
1217+
.. _`Twig block tag`: https://twig.symfony.com/doc/3.x/tags/block.html
12181218
.. _`Cross-Site Scripting`: https://en.wikipedia.org/wiki/Cross-site_scripting
12191219
.. _`GitHub Actions`: https://docs.github.com/en/free-pro-team@latest/actions
12201220
.. _`UX Twig Component`: https://symfony.com/bundles/ux-twig-component/current/index.html

templating/twig_extension.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ If you're using the default ``services.yaml`` configuration, this will already
170170
work! Otherwise, :ref:`create a service <service-container-creating-service>`
171171
for this class and :doc:`tag your service </service_container/tags>` with ``twig.runtime``.
172172

173-
.. _`Twig Extensions`: https://twig.symfony.com/doc/2.x/advanced.html#creating-an-extension
174-
.. _`default Twig filters and functions`: https://twig.symfony.com/doc/2.x/#reference
173+
.. _`Twig Extensions`: https://twig.symfony.com/doc/3.x/advanced.html#creating-an-extension
174+
.. _`default Twig filters and functions`: https://twig.symfony.com/doc/3.x/#reference
175175
.. _`official Twig extensions`: https://github.com/twigphp?q=extra
176-
.. _`global variables`: https://twig.symfony.com/doc/2.x/advanced.html#id1
176+
.. _`global variables`: https://twig.symfony.com/doc/3.x/advanced.html#id1

0 commit comments

Comments
 (0)