Skip to content

Commit 395539c

Browse files
wouterjwouterj
committed
Merge branch '5.4' into 6.3
* 5.4: Fix all diagram paths
2 parents 8693fee + 57dcfd0 commit 395539c

16 files changed

+27
-27
lines changed

‎_images/sources/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Use the following snippet to embed the diagram in the docs:
3939
```
4040
.. raw:: html
4141
42-
<object data="../_images/<folder-name>/<diagram-file-name>.svg" type="image/svg+xml"
42+
<object data="/_images/<folder-name>/<diagram-file-name>.svg" type="image/svg+xml"
4343
alt="<alt description>"
4444
></object>
4545
```

‎components/http_kernel.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ and ends with a :class:`Symfony\\Component\\HttpFoundation\\Response`.
7272

7373
.. raw:: html
7474

75-
<object data="../_images/components/http_kernel/http-workflow.svg" type="image/svg+xml"
75+
<object data="/_images/components/http_kernel/http-workflow.svg" type="image/svg+xml"
7676
alt="A flow diagram showing all HTTP Kernel events in the Request-Response lifecycle. Each event is numbered 1 to 8 and described in detail in the following subsections."
7777
></object>
7878

@@ -518,7 +518,7 @@ to the exception.
518518

519519
.. raw:: html
520520

521-
<object data="../_images/components/http_kernel/http-workflow-exception.svg" type="image/svg+xml"
521+
<object data="/_images/components/http_kernel/http-workflow-exception.svg" type="image/svg+xml"
522522
alt="The HTTP KErnel flow diagram showing how exceptions bypass all further steps and are directly transformed to responses."
523523
></object>
524524

@@ -679,7 +679,7 @@ your controller).
679679

680680
.. raw:: html
681681

682-
<object data="../_images/components/http_kernel/http-workflow-subrequest.svg" type="image/svg+xml"
682+
<object data="/_images/components/http_kernel/http-workflow-subrequest.svg" type="image/svg+xml"
683683
alt="The HTTP Kernel flow diagram with a sub request from a controller starting the lifecycle at step 1 again and feeding the sub Response content back into the controller."
684684
></object>
685685

‎components/messenger.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Concepts
2727

2828
.. raw:: html
2929

30-
<object data="../_images/components/messenger/overview.svg" type="image/svg+xml"
30+
<object data="/_images/components/messenger/overview.svg" type="image/svg+xml"
3131
alt="A flow diagram visualizing how each concept relates to eachother. Each concept is described in the subsequent text."
3232
></object>
3333

‎components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ In order to do so, the Serializer component follows the following schema.
88

99
.. raw:: html
1010

11-
<object data="../_images/components/serializer/serializer_workflow.svg" type="image/svg+xml"
11+
<object data="/_images/components/serializer/serializer_workflow.svg" type="image/svg+xml"
1212
alt="A flow diagram showing how objects are serialized/deserialized. This is described in the subsequent paragraph."
1313
></object>
1414

‎contributing/documentation/standards.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ Images and Diagrams
166166

167167
.. code-block:: text
168168
169-
.. image:: _images/example-screenshot.png
169+
.. image:: /_images/example-screenshot.png
170170
:alt: Some concise description of the screenshot.
171171
172172
.. raw:: html
173173
174-
<object data="_images/example-diagram.svg" type="image/svg+xml"
174+
<object data="/_images/example-diagram.svg" type="image/svg+xml"
175175
alt="Some concise description."
176176
></object>
177177

‎doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ the ``#[ORM\Column(...)]`` comments that you see above each property:
187187

188188
.. raw:: html
189189

190-
<object data="../_images/doctrine/mapping_single_entity.svg" type="image/svg+xml"
190+
<object data="/_images/doctrine/mapping_single_entity.svg" type="image/svg+xml"
191191
alt="Doctrine mapping between properties of a Product PHP object and the data in the product database table"
192192
></object>
193193

‎doctrine/associations.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ relationship for you:
348348

349349
.. raw:: html
350350

351-
<object data="../_images/doctrine/mapping_relations.svg" type="image/svg+xml"
351+
<object data="/_images/doctrine/mapping_relations.svg" type="image/svg+xml"
352352
alt="Doctrine mapping associated Product and Category entities to a product and category database table"
353353
></object>
354354

@@ -398,7 +398,7 @@ you.
398398

399399
.. raw:: html
400400

401-
<object data="../_images/doctrine/mapping_relations_proxy.svg" type="image/svg+xml"
401+
<object data="/_images/doctrine/mapping_relations_proxy.svg" type="image/svg+xml"
402402
alt="Doctrine only querying Category data when needed"
403403
></object>
404404

‎form/create_custom_field_type.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ following set of fields as the "postal address":
9494

9595
.. raw:: html
9696

97-
<object data="../_images/form/form-custom-type-postal-address.svg" type="image/svg+xml"
97+
<object data="/_images/form/form-custom-type-postal-address.svg" type="image/svg+xml"
9898
alt="A wireframe of the custom field type, showing five text inputs: two address lines, the City, the State and the ZIP code."
9999
></object>
100100

@@ -437,7 +437,7 @@ are some examples of Twig block names for the postal address type:
437437

438438
.. raw:: html
439439

440-
<object data="../_images/form/form-custom-type-postal-address-fragment-names.svg" type="image/svg+xml"
440+
<object data="/_images/form/form-custom-type-postal-address-fragment-names.svg" type="image/svg+xml"
441441
alt="The wireframe with some block names highlighted, these are also listed below the image."
442442
></object>
443443

‎form/data_transformers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ types of underlying data.
439439

440440
.. raw:: html
441441

442-
<object data="../_images/form/data-transformer-types.svg" type="image/svg+xml"
442+
<object data="/_images/form/data-transformer-types.svg" type="image/svg+xml"
443443
alt="Flow diagram with the Model transformer between Model and Norm data, and the View transformer between Norm and View data. This is described in detail below the diagram."
444444
></object>
445445

‎form/events.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ be updated:
3838

3939
.. raw:: html
4040

41-
<object data="../_images/form/form_workflow.svg" type="image/svg+xml"
41+
<object data="/_images/form/form_workflow.svg" type="image/svg+xml"
4242
alt="A generic flow diagram showing the two phases. These are
4343
described in the next subsections."
4444
></object>
@@ -48,7 +48,7 @@ be updated:
4848

4949
.. raw:: html
5050

51-
<object data="../_images/form/form_prepopulation_workflow.svg" type="image/svg+xml"
51+
<object data="/_images/form/form_prepopulation_workflow.svg" type="image/svg+xml"
5252
alt="A flow diagram showing the two events that are dispatched during pre-population."
5353
></object>
5454

@@ -123,7 +123,7 @@ View data Normalized data transformed using a view transformer
123123

124124
.. raw:: html
125125

126-
<object data="../_images/form/form_submission_workflow.svg" type="image/svg+xml"
126+
<object data="/_images/form/form_submission_workflow.svg" type="image/svg+xml"
127127
alt="A flow diagram showing the three events that are dispatched when handling form submissions."
128128
></object>
129129

‎form/form_customization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ customized using other Twig functions, as illustrated in the following diagram:
5151

5252
.. raw:: html
5353

54-
<object data="../_images/form/form-field-parts.svg" type="image/svg+xml"
54+
<object data="/_images/form/form-field-parts.svg" type="image/svg+xml"
5555
alt="Wireframe showing all functions in a form row, which are mentioned directly below."
5656
></object>
5757

‎form/form_themes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ In both cases, the ``field-part`` can be any of these valid form field parts:
239239

240240
.. raw:: html
241241

242-
<object data="../_images/form/form-field-parts.svg" type="image/svg+xml"
242+
<object data="/_images/form/form-field-parts.svg" type="image/svg+xml"
243243
alt="A wireframe showing all form field parts: form_row, form_label, form_widget, form_help and form_errors."
244244
></object>
245245

‎introduction/from_flat_php_to_symfony.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ It's a beautiful thing.
657657

658658
.. raw:: html
659659

660-
<object data="../_images/http/request-flow.svg" type="image/svg+xml"
660+
<object data="/_images/http/request-flow.svg" type="image/svg+xml"
661661
alt="A flow diagram visualizing the previously described process from front controller to response."
662662
></object>
663663

‎introduction/http_fundamentals.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ to communicate with each other. For example, when checking for the latest
1919

2020
.. raw:: html
2121

22-
<object data="../_images/http/xkcd-full.svg" type="image/svg+xml"
22+
<object data="/_images/http/xkcd-full.svg" type="image/svg+xml"
2323
alt="A sequence diagram showing the browser sending &quot;Can I see today's comic?&quot; to the xkcd server. The server prepares the page's HTML and sents it back to the browser."
2424
></object>
2525

@@ -43,7 +43,7 @@ browser and the xkcd web server:
4343

4444
.. raw:: html
4545

46-
<object data="../_images/http/xkcd-request.svg" type="image/svg+xml"
46+
<object data="/_images/http/xkcd-request.svg" type="image/svg+xml"
4747
alt="A sequence diagram showing the request from browser to the xkcd server."
4848
></object>
4949

@@ -108,7 +108,7 @@ from the xkcd web server:
108108

109109
.. raw:: html
110110

111-
<object data="../_images/http/xkcd-full.svg" type="image/svg+xml"
111+
<object data="/_images/http/xkcd-full.svg" type="image/svg+xml"
112112
alt="The full sequence diagram with the xkcd server sending the page's HTML back to the browser."
113113
></object>
114114

@@ -355,7 +355,7 @@ to do:
355355

356356
.. raw:: html
357357

358-
<object data="../_images/http/request-flow.svg" type="image/svg+xml"
358+
<object data="/_images/http/request-flow.svg" type="image/svg+xml"
359359
alt="A flow diagram visualizing the request-response flow. Each step is written out in text in the next section."
360360
></object>
361361

‎mercure.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Running a Mercure Hub
6969

7070
.. raw:: html
7171

72-
<object data="../_images/mercure/hub.svg" type="image/svg+xml"
72+
<object data="/_images/mercure/hub.svg" type="image/svg+xml"
7373
alt="Flow diagram showing a Symfony app communicating with the Mercure Hub using a POST request, and the Mercure Hub using SSE to communicate to the clients."
7474
></object>
7575

@@ -335,7 +335,7 @@ in a ``Link`` HTTP header.
335335

336336
.. raw:: html
337337

338-
<object data="../_images/mercure/discovery.svg" type="image/svg+xml"
338+
<object data="/_images/mercure/discovery.svg" type="image/svg+xml"
339339
alt="Flow diagram showing the Link response header set by the Symfony app to respond to an API request for a book with ID 1."
340340
></object>
341341

‎security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2705,7 +2705,7 @@ Authentication Events
27052705

27062706
.. raw:: html
27072707

2708-
<object data="../_images/security/security_events.svg" type="image/svg+xml"
2708+
<object data="/_images/security/security_events.svg" type="image/svg+xml"
27092709
alt="A flow diagram showing the authentication events that are described in this section in a request-response cycle."
27102710
></object>
27112711

0 commit comments

Comments
 (0)