Skip to content

Commit 5a28d29

Browse files
nicolas-grekasnicolas-grekas
committed
Fix XSD in XML examples
1 parent 81b3348 commit 5a28d29

File tree

201 files changed

+2129
-2806
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+2129
-2806
lines changed

‎bundles/best_practices.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,8 @@ The end user can provide values in any configuration file:
432432
<!-- config/services.xml -->
433433
<?xml version="1.0" encoding="UTF-8" ?>
434434
<container xmlns="http://symfony.com/schema/dic/services"
435-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
436-
xsi:schemaLocation="http://symfony.com/schema/dic/services
437-
https://symfony.com/schema/dic/services/services-1.0.xsd"
435+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
436+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
438437
>
439438
<parameters>
440439
<parameter key="acme_blog.author.email">fabien@example.com</parameter>

‎bundles/configuration.rst‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ as integration of other related components:
2525
<!-- config/packages/framework.xml -->
2626
<?xml version="1.0" encoding="UTF-8" ?>
2727
<container xmlns="http://symfony.com/schema/dic/services"
28-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
28+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
2929
xmlns:framework="http://symfony.com/schema/dic/symfony"
30-
xsi:schemaLocation="http://symfony.com/schema/dic/services
31-
https://symfony.com/schema/dic/services/services-1.0.xsd
32-
http://symfony.com/schema/dic/symfony
33-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
30+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
31+
https://symfony.com/schema/symfony-1.0.xsd"
3432
>
3533
<framework:config>
3634
<framework:form/>
@@ -171,10 +169,9 @@ can add some configuration that looks like this:
171169
<!-- config/packages/acme_social.xml -->
172170
<?xml version="1.0" encoding="UTF-8" ?>
173171
<container xmlns="http://symfony.com/schema/dic/services"
174-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
172+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
175173
xmlns:acme-social="http://example.org/schema/dic/acme_social"
176-
xsi:schemaLocation="http://symfony.com/schema/dic/services
177-
https://symfony.com/schema/dic/services/services-1.0.xsd"
174+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
178175
>
179176
<acme-social:config>
180177
<acme-social:twitter client-id="123"
@@ -342,9 +339,8 @@ For example, imagine your bundle has the following example config:
342339
<!-- src/config/services.xml -->
343340
<?xml version="1.0" encoding="UTF-8" ?>
344341
<container xmlns="http://symfony.com/schema/dic/services"
345-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
346-
xsi:schemaLocation="http://symfony.com/schema/dic/services
347-
https://symfony.com/schema/dic/services/services-1.0.xsd"
342+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
343+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
348344
>
349345
<services>
350346
<service id="acme_social.twitter_client" class="Acme\SocialBundle\TwitterClient">
@@ -514,20 +510,18 @@ can place it anywhere you like. You should return this path as the base path::
514510
}
515511
}
516512

517-
Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
518-
``https://acme_company.com/schema/dic/hello/hello-1.0.xsd``:
513+
Assuming the XSD file is called ``hello-1.0.xsd``, the schema location should be
514+
``https://acme_company.com/schema/hello-1.0.xsd``:
519515

520516
.. code-block:: xml
521517
522518
<!-- config/packages/acme_hello.xml -->
523519
<?xml version="1.0" encoding="UTF-8" ?>
524520
<container xmlns="http://symfony.com/schema/dic/services"
525-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
521+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
526522
xmlns:acme-hello="http://acme_company.com/schema/dic/hello"
527-
xsi:schemaLocation="http://symfony.com/schema/dic/services
528-
https://symfony.com/schema/dic/services/services-1.0.xsd
529-
http://acme_company.com/schema/dic/hello
530-
https://acme_company.com/schema/dic/hello/hello-1.0.xsd"
523+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
524+
https://acme_company.com/schema/hello-1.0.xsd"
531525
>
532526
<acme-hello:config>
533527
<!-- ... -->

‎bundles/override.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,8 @@ to a new validation group:
126126
<!-- config/validator/validation.xml -->
127127
<?xml version="1.0" encoding="UTF-8" ?>
128128
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
129-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
130-
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
131-
https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"
129+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
130+
xsi:schemaLocation="https://symfony.com/schema/constraint-mapping-1.0.xsd"
132131
>
133132
<class name="FOS\UserBundle\Model\User">
134133
<property name="plainPassword">

‎bundles/prepend_extension.rst‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,11 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
113113
<!-- config/packages/acme_something.xml -->
114114
<?xml version="1.0" encoding="UTF-8" ?>
115115
<container xmlns="http://symfony.com/schema/dic/services"
116-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
116+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
117117
xmlns:acme-something="http://example.org/schema/dic/acme_something"
118118
xmlns:acme-other="http://example.org/schema/dic/acme_other"
119-
xsi:schemaLocation="http://symfony.com/schema/dic/services
120-
https://symfony.com/schema/dic/services/services-1.0.xsd
121-
http://example.org/schema/dic/acme_something
119+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
122120
https://example.org/schema/dic/acme_something/acme_something-1.0.xsd
123-
http://example.org/schema/dic/acme_other
124121
https://example.org/schema/dic/acme_something/acme_other-1.0.xsd"
125122
>
126123
<acme-something:config use-acme-goodbye="false">

‎cache.rst‎

Lines changed: 31 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,10 @@ adapter (template) they use by using the ``app`` and ``system`` key like:
6666
<!-- config/packages/cache.xml -->
6767
<?xml version="1.0" encoding="UTF-8" ?>
6868
<container xmlns="http://symfony.com/schema/dic/services"
69-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
69+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
7070
xmlns:framework="http://symfony.com/schema/dic/symfony"
71-
xsi:schemaLocation="http://symfony.com/schema/dic/services
72-
https://symfony.com/schema/dic/services/services-1.0.xsd
73-
http://symfony.com/schema/dic/symfony
74-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
71+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
72+
https://symfony.com/schema/symfony-1.0.xsd"
7573
>
7674
<framework:config>
7775
<framework:cache
@@ -144,12 +142,10 @@ Some of these adapters could be configured via shortcuts.
144142
<!-- config/packages/cache.xml -->
145143
<?xml version="1.0" encoding="UTF-8" ?>
146144
<container xmlns="http://symfony.com/schema/dic/services"
147-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
145+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
148146
xmlns:framework="http://symfony.com/schema/dic/symfony"
149-
xsi:schemaLocation="http://symfony.com/schema/dic/services
150-
https://symfony.com/schema/dic/services/services-1.0.xsd
151-
http://symfony.com/schema/dic/symfony
152-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
147+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
148+
https://symfony.com/schema/symfony-1.0.xsd"
153149
>
154150
<framework:config>
155151
<!-- "directory" attribute is only used with cache.adapter.filesystem -->
@@ -241,12 +237,10 @@ You can also create more customized pools:
241237
<!-- config/packages/cache.xml -->
242238
<?xml version="1.0" encoding="UTF-8" ?>
243239
<container xmlns="http://symfony.com/schema/dic/services"
244-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
240+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
245241
xmlns:framework="http://symfony.com/schema/dic/symfony"
246-
xsi:schemaLocation="http://symfony.com/schema/dic/services
247-
https://symfony.com/schema/dic/services/services-1.0.xsd
248-
http://symfony.com/schema/dic/symfony
249-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
242+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
243+
https://symfony.com/schema/symfony-1.0.xsd"
250244
>
251245
<framework:config>
252246
<framework:cache default-memcached-provider="memcached://localhost">
@@ -361,9 +355,8 @@ with either :class:`Symfony\\Contracts\\Cache\\CacheInterface` or
361355
<!-- config/services.xml -->
362356
<?xml version="1.0" encoding="UTF-8" ?>
363357
<container xmlns="http://symfony.com/schema/dic/services"
364-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
365-
xsi:schemaLocation="http://symfony.com/schema/dic/services
366-
https://symfony.com/schema/dic/services/services-1.0.xsd"
358+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
359+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
367360
>
368361
<services>
369362
<!-- ... -->
@@ -423,12 +416,10 @@ and use that when configuring the pool.
423416
<!-- config/packages/cache.xml -->
424417
<?xml version="1.0" encoding="UTF-8" ?>
425418
<container xmlns="http://symfony.com/schema/dic/services"
426-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
419+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
427420
xmlns:framework="http://symfony.com/schema/dic/symfony"
428-
xsi:schemaLocation="http://symfony.com/schema/dic/services
429-
https://symfony.com/schema/dic/services/services-1.0.xsd
430-
http://symfony.com/schema/dic/symfony
431-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
421+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
422+
https://symfony.com/schema/symfony-1.0.xsd"
432423
>
433424
<framework:config>
434425
<framework:cache>
@@ -515,12 +506,10 @@ Symfony stores the item automatically in all the missing pools.
515506
<!-- config/packages/cache.xml -->
516507
<?xml version="1.0" encoding="UTF-8" ?>
517508
<container xmlns="http://symfony.com/schema/dic/services"
518-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
509+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
519510
xmlns:framework="http://symfony.com/schema/dic/symfony"
520-
xsi:schemaLocation="http://symfony.com/schema/dic/services
521-
https://symfony.com/schema/dic/services/services-1.0.xsd
522-
http://symfony.com/schema/dic/symfony
523-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
511+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
512+
https://symfony.com/schema/symfony-1.0.xsd"
524513
>
525514
<framework:config>
526515
<framework:cache>
@@ -609,12 +598,10 @@ to enable this feature. This could be added by using the following configuration
609598
<!-- config/packages/cache.xml -->
610599
<?xml version="1.0" encoding="UTF-8" ?>
611600
<container xmlns="http://symfony.com/schema/dic/services"
612-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
601+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
613602
xmlns:framework="http://symfony.com/schema/dic/symfony"
614-
xsi:schemaLocation="http://symfony.com/schema/dic/services
615-
https://symfony.com/schema/dic/services/services-1.0.xsd
616-
http://symfony.com/schema/dic/symfony
617-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
603+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
604+
https://symfony.com/schema/symfony-1.0.xsd"
618605
>
619606
<framework:config>
620607
<framework:cache>
@@ -662,12 +649,10 @@ achieved by specifying the adapter.
662649
<!-- config/packages/cache.xml -->
663650
<?xml version="1.0" encoding="UTF-8" ?>
664651
<container xmlns="http://symfony.com/schema/dic/services"
665-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
652+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
666653
xmlns:framework="http://symfony.com/schema/dic/symfony"
667-
xsi:schemaLocation="http://symfony.com/schema/dic/services
668-
https://symfony.com/schema/dic/services/services-1.0.xsd
669-
http://symfony.com/schema/dic/symfony
670-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
654+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
655+
https://symfony.com/schema/symfony-1.0.xsd"
671656
>
672657
<framework:config>
673658
<framework:cache>
@@ -819,13 +804,11 @@ Then, register the ``SodiumMarshaller`` service using this key:
819804
<!-- config/packages/cache.xml -->
820805
<?xml version="1.0" encoding="UTF-8" ?>
821806
<container xmlns="http://symfony.com/schema/dic/services"
822-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
807+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
823808
xmlns:framework="http://symfony.com/schema/dic/symfony"
824-
xsi:schemaLocation="http://symfony.com/schema/dic/services
825-
https://symfony.com/schema/dic/services/services-1.0.xsd
826-
http://symfony.com/schema/dic/symfony
827-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
828-
809+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
810+
https://symfony.com/schema/symfony-1.0.xsd"
811+
>
829812
<!-- ... -->
830813
831814
<services>
@@ -950,12 +933,10 @@ a message bus to compute values in a worker:
950933
<!-- config/packages/framework.xml -->
951934
<?xml version="1.0" encoding="UTF-8" ?>
952935
<container xmlns="http://symfony.com/schema/dic/services"
953-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
954-
xmlns:framework="http://symfony.com/schema/dic/symfony"
955-
xsi:schemaLocation="http://symfony.com/schema/dic/services
956-
https://symfony.com/schema/dic/services/services-1.0.xsd
957-
http://symfony.com/schema/dic/symfony
958-
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
936+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
937+
xmlns:framework="http://symfony.com/schema/dic/symfony"
938+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
939+
https://symfony.com/schema/symfony-1.0.xsd"
959940
>
960941
<framework:config>
961942
<framework:cache>

‎components/config/definition.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,6 @@ The example results in the following:
650650
password=""
651651
memory="false"
652652
>
653-
654653
<!-- prototype -->
655654
<!-- value: Required -->
656655
<parameters

‎components/dependency_injection.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,8 @@ config files:
286286
287287
<?xml version="1.0" encoding="UTF-8" ?>
288288
<container xmlns="http://symfony.com/schema/dic/services"
289-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
290-
xsi:schemaLocation="http://symfony.com/schema/dic/services
291-
https://symfony.com/schema/dic/services/services-1.0.xsd"
289+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
290+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
292291
>
293292
<parameters>
294293
<!-- ... -->

‎components/dependency_injection/_imports-parameters-note.rst.inc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
<!-- config/services.xml -->
1818
<?xml version="1.0" encoding="UTF-8" ?>
1919
<container xmlns="http://symfony.com/schema/dic/services"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://symfony.com/schema/dic/services
22-
https://symfony.com/schema/dic/services/services-1.0.xsd"
20+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd"
2322
>
2423
<imports>
2524
<import resource="%kernel.project_dir%/somefile.yaml"/>

‎components/dependency_injection/compilation.rst‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,10 @@ The XML version of the config would then look like this:
196196
197197
<?xml version="1.0" encoding="UTF-8" ?>
198198
<container xmlns="http://symfony.com/schema/dic/services"
199-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
200-
xmlns:acme-demo="http://www.example.com/schema/dic/acme_demo"
201-
xsi:schemaLocation="http://symfony.com/schema/dic/services
202-
https://symfony.com/schema/dic/services/services-1.0.xsd
203-
http://www.example.com/schema/dic/acme_demo
204-
https://www.example.com/schema/dic/acme_demo/acme_demo-1.0.xsd"
199+
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
200+
xmlns:acme-demo="https://example.com/schema/dic/acme_demo"
201+
xsi:schemaLocation="https://symfony.com/schema/services-1.0.xsd
202+
https://example.com/schema/dic/acme_demo/acme_demo-1.0.xsd"
205203
>
206204
<acme-demo:config>
207205
<acme_demo:foo>fooValue</acme_demo:foo>

‎components/phpunit_bridge.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``:
5252
.. code-block:: xml
5353
5454
<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
55-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55+
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
5656
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
5757
>
5858
@@ -201,7 +201,7 @@ message, enclosed with ``/``. For example, with:
201201
.. code-block:: xml
202202
203203
<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
204-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
204+
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
205205
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
206206
>
207207
@@ -420,7 +420,7 @@ configuration file:
420420
.. code-block:: xml
421421
422422
<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
423-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
423+
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
424424
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
425425
>
426426
@@ -875,7 +875,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
875875
.. code-block:: xml
876876
877877
<!-- https://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
878-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
878+
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
879879
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
880880
>
881881
@@ -1054,7 +1054,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file:
10541054
.. code-block:: xml
10551055
10561056
<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
1057-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1057+
<phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
10581058
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
10591059
>
10601060

0 commit comments

Comments
 (0)