Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 42acea8

Browse files
greg0iregreg0ire
committed
Match namespace in XML file with namespace in XSD file
In 7fa3e6e, a global search and replace was used for http and https. This broke the example 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.
1 parent 4978e0e commit 42acea8

7 files changed

Lines changed: 42 additions & 36 deletions

File tree

‎docs/en/reference/events.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ specific to a particular entity class's lifecycle.
281281
282282
<?xml version="1.0" encoding="UTF-8"?>
283283
284-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
285-
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
286-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
287-
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
284+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
285+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
286+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
287+
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
288288
<entity name="User">
289289
<!-- ... -->
290290
<lifecycle-callbacks>

‎docs/en/reference/second-level-cache.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,10 @@ level cache region.
322322
.. code-block:: xml
323323
324324
<?xml version="1.0" encoding="utf-8"?>
325-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
325+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
326+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
327+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
328+
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
326329
<entity name="Country">
327330
<cache usage="READ_ONLY" region="my_entity_region" />
328331
<id name="id" type="integer" column="id">
@@ -427,7 +430,10 @@ It caches the primary keys of association and cache each element will be cached
427430
.. code-block:: xml
428431
429432
<?xml version="1.0" encoding="utf-8"?>
430-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
433+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
434+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
435+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
436+
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
431437
<entity name="State">
432438
433439
<cache usage="NONSTRICT_READ_WRITE" />

‎docs/en/reference/xml-mapping.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ setup for the latest code in trunk.
1616

1717
.. code-block:: xml
1818
19-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
19+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
2020
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
21+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
2222
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
2323
2424
...
@@ -102,9 +102,9 @@ of several common elements:
102102
103103
// Doctrine.Tests.ORM.Mapping.User.dcm.xml
104104
<?xml version="1.0" encoding="UTF-8"?>
105-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
105+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
106106
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
107-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
107+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
108108
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
109109
110110
<entity name="Doctrine\Tests\ORM\Mapping\User" table="cms_users">
@@ -769,9 +769,9 @@ entity relationship. You can define this in XML with the "association-key" attri
769769

770770
.. code-block:: xml
771771
772-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
772+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
773773
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
774-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
774+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
775775
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
776776
777777
<entity name="Application\Model\ArticleAttribute">

‎docs/en/tutorials/composite-primary-keys.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ and year of production as primary keys:
8585
.. code-block:: xml
8686
8787
<?xml version="1.0" encoding="UTF-8"?>
88-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
88+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
8989
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
90-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
90+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
9191
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
9292
9393
<entity name="VehicleCatalogue\Model\Car">
@@ -267,9 +267,9 @@ We keep up the example of an Article with arbitrary attributes, the mapping look
267267
268268
.. code-block:: xml
269269
270-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
270+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
271271
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
272-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
272+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
273273
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
274274
275275
<entity name="Application\Model\ArticleAttribute">

‎docs/en/tutorials/extra-lazy-associations.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ switch to extra lazy as shown in these examples:
8585
.. code-block:: xml
8686
8787
<?xml version="1.0" encoding="UTF-8"?>
88-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
88+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
8989
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
90-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
90+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
9191
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
9292
9393
<entity name="Doctrine\Tests\Models\CMS\CmsGroup">

‎docs/en/tutorials/getting-started.rst‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,10 @@ methods, but you only need to choose one.
557557
.. code-block:: xml
558558
559559
<!-- config/xml/Product.dcm.xml -->
560-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
561-
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
562-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
563-
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
560+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
561+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
562+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
563+
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
564564
565565
<entity name="Product" table="products">
566566
<id name="id" type="integer">
@@ -1138,10 +1138,10 @@ the ``Product`` before:
11381138
.. code-block:: xml
11391139
11401140
<!-- config/xml/Bug.dcm.xml -->
1141-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
1142-
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
1143-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
1144-
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
1141+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
1142+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
1143+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
1144+
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
11451145
11461146
<entity name="Bug" table="bugs">
11471147
<id name="id" type="integer">
@@ -1293,10 +1293,10 @@ Finally, we'll add metadata mappings for the ``User`` entity.
12931293
.. code-block:: xml
12941294
12951295
<!-- config/xml/User.dcm.xml -->
1296-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
1297-
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
1298-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
1299-
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
1296+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
1297+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
1298+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
1299+
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
13001300
13011301
<entity name="User" table="users">
13021302
<id name="id" type="integer">
@@ -1818,9 +1818,9 @@ we have to adjust the metadata slightly.
18181818
18191819
.. code-block:: xml
18201820
1821-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
1821+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
18221822
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
1823-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
1823+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
18241824
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
18251825
18261826
<entity name="Bug" table="bugs" repository-class="BugRepository">

‎docs/en/tutorials/working-with-indexed-associations.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ The code and mappings for the Market entity looks like this:
161161
.. code-block:: xml
162162
163163
<?xml version="1.0" encoding="UTF-8"?>
164-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
164+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
165165
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
166-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
166+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
167167
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
168168
169169
<entity name="Doctrine\Tests\Models\StockExchange\Market">
@@ -278,9 +278,9 @@ here are the code and mappings for it:
278278
.. code-block:: xml
279279
280280
<?xml version="1.0" encoding="UTF-8"?>
281-
<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping"
281+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
282282
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
283-
xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping
283+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
284284
https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
285285
286286
<entity name="Doctrine\Tests\Models\StockExchange\Stock">

0 commit comments

Comments
 (0)