Skip to content

Commit 242aadd

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.2
* 3.4: moved XSD to HTTPS
2 parents 1adbe37 + 1df8843 commit 242aadd

File tree

179 files changed

+536
-537
lines changed

Some content is hidden

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

179 files changed

+536
-537
lines changed

‎_includes/service_container/_my_mailer.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<container xmlns="http://symfony.com/schema/dic/services"
1616
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1717
xsi:schemaLocation="http://symfony.com/schema/dic/services
18-
http://symfony.com/schema/dic/services/services-1.0.xsd">
18+
https://symfony.com/schema/dic/services/services-1.0.xsd">
1919

2020
<services>
2121
<service id="app.mailer" class="App\Mailer">

‎bundles/best_practices.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ The end user can provide values in any configuration file:
449449
<container xmlns="http://symfony.com/schema/dic/services"
450450
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
451451
xsi:schemaLocation="http://symfony.com/schema/dic/services
452-
http://symfony.com/schema/dic/services/services-1.0.xsd">
452+
https://symfony.com/schema/dic/services/services-1.0.xsd">
453453
454454
<parameters>
455455
<parameter key="acme_blog.author.email">[email protected]</parameter>

‎bundles/configuration.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ as integration of other related components:
2929
<container xmlns="http://symfony.com/schema/dic/services"
3030
xmlns:framework="http://symfony.com/schema/dic/symfony"
3131
xsi:schemaLocation="http://symfony.com/schema/dic/services
32-
http://symfony.com/schema/dic/services/services-1.0.xsd
32+
https://symfony.com/schema/dic/services/services-1.0.xsd
3333
http://symfony.com/schema/dic/symfony
34-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
34+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
3535
3636
<framework:config>
3737
<framework:form />
@@ -69,7 +69,7 @@ can add some configuration that looks like this:
6969
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7070
xmlns:acme-social="http://example.org/schema/dic/acme_social"
7171
xsi:schemaLocation="http://symfony.com/schema/dic/services
72-
http://symfony.com/schema/dic/services/services-1.0.xsd">
72+
https://symfony.com/schema/dic/services/services-1.0.xsd">
7373
7474
<acme-social:config>
7575
<acme-social:twitter client-id="123" client-secret="your_secret" />
@@ -240,7 +240,7 @@ For example, imagine your bundle has the following example config:
240240
<container xmlns="http://symfony.com/schema/dic/services"
241241
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
242242
xsi:schemaLocation="http://symfony.com/schema/dic/services
243-
http://symfony.com/schema/dic/services/services-1.0.xsd">
243+
https://symfony.com/schema/dic/services/services-1.0.xsd">
244244
245245
<services>
246246
<service id="acme.social.twitter_client" class="Acme\SocialBundle\TwitterClient">

‎bundles/override.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ to a new validation group:
143143
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
144144
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
145145
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
146-
http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
146+
https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
147147
148148
<class name="FOS\UserBundle\Model\User">
149149
<property name="plainPassword">

‎bundles/prepend_extension.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
122122
xmlns:acme-something="http://example.org/schema/dic/acme_something"
123123
xmlns:acme-other="http://example.org/schema/dic/acme_other"
124124
xsi:schemaLocation="http://symfony.com/schema/dic/services
125-
http://symfony.com/schema/dic/services/services-1.0.xsd">
125+
https://symfony.com/schema/dic/services/services-1.0.xsd">
126126
127127
<acme-something:config use-acme-goodbye="false">
128128
<acme-something:entity-manager-name>non_default</acme-something:entity-manager-name>

‎components/dependency_injection.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ config files:
268268
<?xml version="1.0" encoding="UTF-8" ?>
269269
<container xmlns="http://symfony.com/schema/dic/services"
270270
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
271-
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
271+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
272272
273273
<parameters>
274274
<!-- ... -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<container xmlns="http://symfony.com/schema/dic/services"
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="http://symfony.com/schema/dic/services
22-
http://symfony.com/schema/dic/services/services-1.0.xsd">
22+
https://symfony.com/schema/dic/services/services-1.0.xsd">
2323

2424
<imports>
2525
<import resource="%kernel.project_dir%/somefile.yaml" />

‎components/routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ routes with UTF-8 characters:
420420
<routes xmlns="http://symfony.com/schema/routing"
421421
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
422422
xsi:schemaLocation="http://symfony.com/schema/routing
423-
http://symfony.com/schema/routing/routing-1.0.xsd">
423+
https://symfony.com/schema/routing/routing-1.0.xsd">
424424
425425
<route id="route1" path="/category/{name}" controller="App\Controller\DefaultController::category">
426426
<option key="utf8">true</option>
@@ -491,7 +491,7 @@ You can also include UTF-8 strings as routing requirements:
491491
<routes xmlns="http://symfony.com/schema/routing"
492492
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
493493
xsi:schemaLocation="http://symfony.com/schema/routing
494-
http://symfony.com/schema/routing/routing-1.0.xsd">
494+
https://symfony.com/schema/routing/routing-1.0.xsd">
495495
496496
<route id="route2" path="/category/{name}" controller="App\Controller\DefaultController::category">
497497
<default key="name">한국어</default>

‎components/serializer.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ Then, create your groups definition:
308308
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
309309
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
310310
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
311-
http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
311+
https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
312312
>
313313
<class name="Acme\MyObj">
314314
<attribute name="foo">
@@ -586,7 +586,7 @@ defines a ``Person`` entity with a ``firstName`` property:
586586
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
587587
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
588588
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
589-
http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
589+
https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
590590
>
591591
<class name="App\Entity\Person">
592592
<attribute name="firstName" serialized-name="customer_name" />
@@ -993,7 +993,7 @@ Here, we set it to 2 for the ``$child`` property:
993993
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
994994
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
995995
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
996-
http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
996+
https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
997997
>
998998
<class name="Acme\MyObj">
999999
<attribute name="child" max-depth="2" />
@@ -1368,7 +1368,7 @@ and ``BitBucketCodeRepository`` classes:
13681368
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
13691369
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
13701370
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
1371-
http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
1371+
https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
13721372
>
13731373
<class name="App\CodeRepository">
13741374
<discriminator-map type-property="type">

‎components/var_dumper.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ the :ref:`dump_destination option <configuration-debug-dump_destination>` of the
137137
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
138138
xmlns:debug="http://symfony.com/schema/dic/debug"
139139
xsi:schemaLocation="http://symfony.com/schema/dic/services
140-
http://symfony.com/schema/dic/services/services-1.0.xsd
141-
http://symfony.com/schema/dic/debug http://symfony.com/schema/dic/debug/debug-1.0.xsd">
140+
https://symfony.com/schema/dic/services/services-1.0.xsd
141+
http://symfony.com/schema/dic/debug https://symfony.com/schema/dic/debug/debug-1.0.xsd">
142142
143143
<debug:config dump-destination="tcp://%env(VAR_DUMPER_SERVER)%" />
144144
</container>

‎configuration.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ instance, the framework bundle is configured in ``config/packages/framework.yaml
4343
<container xmlns="http://symfony.com/schema/dic/services"
4444
xmlns:framework="http://symfony.com/schema/dic/framework"
4545
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
46-
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
47-
http://symfony.com/schema/dic/framework http://symfony.com/schema/dic/framework/framework-1.0.xsd"
46+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
47+
http://symfony.com/schema/dic/framework https://symfony.com/schema/dic/framework/framework-1.0.xsd"
4848
>
4949
<framework:config secret="%env(APP_SECRET)%">
5050
<!--<framework:csrf-protection enabled="true“ />-->
@@ -142,9 +142,9 @@ package, a ``locale`` parameter is added to ``config/services.yaml``:
142142
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
143143
xmlns:framework="http://symfony.com/schema/dic/symfony"
144144
xsi:schemaLocation="http://symfony.com/schema/dic/services
145-
http://symfony.com/schema/dic/services/services-1.0.xsd
145+
https://symfony.com/schema/dic/services/services-1.0.xsd
146146
http://symfony.com/schema/dic/symfony
147-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
147+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
148148
149149
<parameters>
150150
<parameter key="locale">en</parameter>
@@ -181,9 +181,9 @@ This parameter is then referenced in the framework config in
181181
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
182182
xmlns:framework="http://symfony.com/schema/dic/symfony"
183183
xsi:schemaLocation="http://symfony.com/schema/dic/services
184-
http://symfony.com/schema/dic/services/services-1.0.xsd
184+
https://symfony.com/schema/dic/services/services-1.0.xsd
185185
http://symfony.com/schema/dic/symfony
186-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
186+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
187187
188188
<!-- any string surrounded by two % is replaced by that parameter value -->
189189
<framework:config default-locale="%locale%">

‎configuration/configuration_organization.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ format (``.yaml``, ``.xml``, ``.php``, ``.ini``):
9898
<container xmlns="http://symfony.com/schema/dic/services"
9999
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
100100
xsi:schemaLocation="http://symfony.com/schema/dic/services
101-
http://symfony.com/schema/dic/services/services-1.0.xsd
101+
https://symfony.com/schema/dic/services/services-1.0.xsd
102102
http://symfony.com/schema/dic/symfony
103-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
103+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
104104
105105
<imports>
106106
<import resource="my_config_file.yaml" />
@@ -152,9 +152,9 @@ when importing it from any other configuration file:
152152
<container xmlns="http://symfony.com/schema/dic/services"
153153
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
154154
xsi:schemaLocation="http://symfony.com/schema/dic/services
155-
http://symfony.com/schema/dic/services/services-1.0.xsd
155+
https://symfony.com/schema/dic/services/services-1.0.xsd
156156
http://symfony.com/schema/dic/symfony
157-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
157+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
158158
159159
<imports>
160160
<import resource="/etc/sites/mysite.com/parameters.yaml" ignore-errors="true" />

‎configuration/environments.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ the environment variable is passed to the kernel::
154154
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
155155
xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
156156
xsi:schemaLocation="http://symfony.com/schema/dic/services
157-
http://symfony.com/schema/dic/services/services-1.0.xsd
157+
https://symfony.com/schema/dic/services/services-1.0.xsd
158158
http://symfony.com/schema/dic/twig
159-
http://symfony.com/schema/dic/twig/twig-1.0.xsd">
159+
https://symfony.com/schema/dic/twig/twig-1.0.xsd">
160160
161161
<twig:config debug="%kernel.debug%" />
162162
@@ -226,9 +226,9 @@ configuration file:
226226
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
227227
xmlns:framework="http://symfony.com/schema/dic/symfony"
228228
xsi:schemaLocation="http://symfony.com/schema/dic/services
229-
http://symfony.com/schema/dic/services/services-1.0.xsd
229+
https://symfony.com/schema/dic/services/services-1.0.xsd
230230
http://symfony.com/schema/dic/symfony
231-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
231+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
232232
233233
<framework:config>
234234
<framework:profiler only-exceptions="false" />
@@ -284,9 +284,9 @@ environment through your browser:
284284
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
285285
xmlns:framework="http://symfony.com/schema/dic/symfony"
286286
xsi:schemaLocation="http://symfony.com/schema/dic/services
287-
http://symfony.com/schema/dic/services/services-1.0.xsd
287+
https://symfony.com/schema/dic/services/services-1.0.xsd
288288
http://symfony.com/schema/dic/symfony
289-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
289+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
290290
291291
<imports>
292292
<import resource="../prod/"/>

0 commit comments

Comments
 (0)