From e94fa8588d7936c8eaf302b4d995c83d22cb5b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 9 Jul 2023 21:11:50 +0200 Subject: [PATCH] Match namespace in XML file with namespace in XSD file In 7fa3e6ec7c75e1b4f14ab7e6a1dd80badc4e0fac, a global search and replace was used for http and https. This broke the documentation examples in that as soon as you turn on XSD validation, it will fail because the namespace in the XML file does not match the ones defined in the XSD file, which do not exhibit the https. Note that this is not a security concern, because these URIs are not meant to be actually resolved, but to serve as a unique identifier for the namespace in which we define our elements. --- docs/en/reference/events.rst | 8 +++--- docs/en/reference/second-level-cache.rst | 10 +++++-- docs/en/reference/xml-mapping.rst | 12 ++++---- docs/en/tutorials/composite-primary-keys.rst | 8 +++--- docs/en/tutorials/extra-lazy-associations.rst | 4 +-- docs/en/tutorials/getting-started.rst | 28 +++++++++---------- .../working-with-indexed-associations.rst | 8 +++--- 7 files changed, 42 insertions(+), 36 deletions(-) diff --git a/docs/en/reference/events.rst b/docs/en/reference/events.rst index 97c3a6f339c..c2dfcecc9fc 100644 --- a/docs/en/reference/events.rst +++ b/docs/en/reference/events.rst @@ -281,10 +281,10 @@ specific to a particular entity class's lifecycle. - + diff --git a/docs/en/reference/second-level-cache.rst b/docs/en/reference/second-level-cache.rst index e5bb2c2b610..cf5cb37d4fa 100644 --- a/docs/en/reference/second-level-cache.rst +++ b/docs/en/reference/second-level-cache.rst @@ -322,7 +322,10 @@ level cache region. .. code-block:: xml - + @@ -427,7 +430,10 @@ It caches the primary keys of association and cache each element will be cached .. code-block:: xml - + diff --git a/docs/en/reference/xml-mapping.rst b/docs/en/reference/xml-mapping.rst index 67edc4a4965..c8c1abe51d4 100644 --- a/docs/en/reference/xml-mapping.rst +++ b/docs/en/reference/xml-mapping.rst @@ -16,9 +16,9 @@ setup for the latest code in trunk. .. code-block:: xml - ... @@ -102,9 +102,9 @@ of several common elements: // Doctrine.Tests.ORM.Mapping.User.dcm.xml - @@ -769,9 +769,9 @@ entity relationship. You can define this in XML with the "association-key" attri .. code-block:: xml - diff --git a/docs/en/tutorials/composite-primary-keys.rst b/docs/en/tutorials/composite-primary-keys.rst index 62111cdd1e3..456adeaf5de 100644 --- a/docs/en/tutorials/composite-primary-keys.rst +++ b/docs/en/tutorials/composite-primary-keys.rst @@ -85,9 +85,9 @@ and year of production as primary keys: .. code-block:: xml - @@ -267,9 +267,9 @@ We keep up the example of an Article with arbitrary attributes, the mapping look .. code-block:: xml - diff --git a/docs/en/tutorials/extra-lazy-associations.rst b/docs/en/tutorials/extra-lazy-associations.rst index ca558f4530d..fbff96f428b 100644 --- a/docs/en/tutorials/extra-lazy-associations.rst +++ b/docs/en/tutorials/extra-lazy-associations.rst @@ -85,9 +85,9 @@ switch to extra lazy as shown in these examples: .. code-block:: xml - diff --git a/docs/en/tutorials/getting-started.rst b/docs/en/tutorials/getting-started.rst index 2cd398cb6ad..023d89c211e 100644 --- a/docs/en/tutorials/getting-started.rst +++ b/docs/en/tutorials/getting-started.rst @@ -557,10 +557,10 @@ methods, but you only need to choose one. .. code-block:: xml - + @@ -1138,10 +1138,10 @@ the ``Product`` before: .. code-block:: xml - + @@ -1293,10 +1293,10 @@ Finally, we'll add metadata mappings for the ``User`` entity. .. code-block:: xml - + @@ -1818,9 +1818,9 @@ we have to adjust the metadata slightly. .. code-block:: xml - diff --git a/docs/en/tutorials/working-with-indexed-associations.rst b/docs/en/tutorials/working-with-indexed-associations.rst index b09da398249..c4099eb5589 100644 --- a/docs/en/tutorials/working-with-indexed-associations.rst +++ b/docs/en/tutorials/working-with-indexed-associations.rst @@ -161,9 +161,9 @@ The code and mappings for the Market entity looks like this: .. code-block:: xml - @@ -278,9 +278,9 @@ here are the code and mappings for it: .. code-block:: xml -