Skip to content

Commit 1df8843

Browse files
javiereguiluzjaviereguiluz
committed
minor symfony#11122 moved XSD to HTTPS (OskarStark)
This PR was merged into the 3.4 branch. Discussion ---------- moved XSD to HTTPS as @fabpot did this in the code base, I think we should reflect the changes in the docs, too. Refs symfony/symfony#30434 <!-- If your pull request fixes a BUG, use the oldest maintained branch that contains the bug (see https://symfony.com/roadmap for the list of maintained branches). If your pull request documents a NEW FEATURE, use the same Symfony branch where the feature was introduced (and `master` for features of unreleased versions). --> Commits ------- f57eabe moved XSD to HTTPS
2 parents 36b3ff4 + f57eabe commit 1df8843

File tree

193 files changed

+479
-479
lines changed

Some content is hidden

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

193 files changed

+479
-479
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="AppBundle\Mailer">

‎bundles/best_practices.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ The end user can provide values in any configuration file:
352352
<container xmlns="http://symfony.com/schema/dic/services"
353353
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
354354
xsi:schemaLocation="http://symfony.com/schema/dic/services
355-
http://symfony.com/schema/dic/services/services-1.0.xsd">
355+
https://symfony.com/schema/dic/services/services-1.0.xsd">
356356
357357
<parameters>
358358
<parameter key="acme_blog.author.email">[email protected]</parameter>

‎bundles/configuration.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ as integration of other related components:
2828
<container xmlns="http://symfony.com/schema/dic/services"
2929
xmlns:framework="http://symfony.com/schema/dic/symfony"
3030
xsi:schemaLocation="http://symfony.com/schema/dic/services
31-
http://symfony.com/schema/dic/services/services-1.0.xsd
31+
https://symfony.com/schema/dic/services/services-1.0.xsd
3232
http://symfony.com/schema/dic/symfony
3333
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
3434
@@ -79,7 +79,7 @@ allow users to configure it with some configuration that looks like this:
7979
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8080
xmlns:acme-social="http://example.org/schema/dic/acme_social"
8181
xsi:schemaLocation="http://symfony.com/schema/dic/services
82-
http://symfony.com/schema/dic/services/services-1.0.xsd">
82+
https://symfony.com/schema/dic/services/services-1.0.xsd">
8383
8484
<acme-social:config>
8585
<acme-social:twitter client-id="123" client-secret="your_secret" />
@@ -248,7 +248,7 @@ For example, imagine your bundle has the following example config:
248248
<container xmlns="http://symfony.com/schema/dic/services"
249249
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
250250
xsi:schemaLocation="http://symfony.com/schema/dic/services
251-
http://symfony.com/schema/dic/services/services-1.0.xsd">
251+
https://symfony.com/schema/dic/services/services-1.0.xsd">
252252
253253
<services>
254254
<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
@@ -104,7 +104,7 @@ to a new validation group:
104104
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
105105
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
106106
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
107-
http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
107+
https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
108108
109109
<class name="FOS\UserBundle\Model\User">
110110
<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 @@ The above would be the equivalent of writing the following into the
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%/app/parameters.yml" />

‎components/routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ routes with UTF-8 characters:
428428
<routes xmlns="http://symfony.com/schema/routing"
429429
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
430430
xsi:schemaLocation="http://symfony.com/schema/routing
431-
http://symfony.com/schema/routing/routing-1.0.xsd">
431+
https://symfony.com/schema/routing/routing-1.0.xsd">
432432
433433
<route id="route1" path="/category/{name}">
434434
<default key="_controller">AppBundle:Default:category</default>
@@ -508,7 +508,7 @@ You can also include UTF-8 strings as routing requirements:
508508
<routes xmlns="http://symfony.com/schema/routing"
509509
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
510510
xsi:schemaLocation="http://symfony.com/schema/routing
511-
http://symfony.com/schema/routing/routing-1.0.xsd">
511+
https://symfony.com/schema/routing/routing-1.0.xsd">
512512
513513
<route id="route2" path="/default/{default}">
514514
<default key="_controller">AppBundle:Default:default</default>

‎configuration.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ The main configuration file is called ``config.yml``:
4444
xmlns:framework="http://symfony.com/schema/dic/symfony"
4545
xmlns:twig="http://symfony.com/schema/dic/twig"
4646
xsi:schemaLocation="http://symfony.com/schema/dic/services
47-
http://symfony.com/schema/dic/services/services-1.0.xsd
47+
https://symfony.com/schema/dic/services/services-1.0.xsd
4848
http://symfony.com/schema/dic/symfony
4949
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd
5050
http://symfony.com/schema/dic/twig
51-
http://symfony.com/schema/dic/twig/twig-1.0.xsd">
51+
https://symfony.com/schema/dic/twig/twig-1.0.xsd">
5252
5353
<imports>
5454
<import resource="parameters.yml" />
@@ -151,7 +151,7 @@ it *also* loads other configuration files via its ``imports`` key:
151151
<container xmlns="http://symfony.com/schema/dic/services"
152152
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
153153
xsi:schemaLocation="http://symfony.com/schema/dic/services
154-
http://symfony.com/schema/dic/services/services-1.0.xsd">
154+
https://symfony.com/schema/dic/services/services-1.0.xsd">
155155
156156
<imports>
157157
<import resource="parameters.yml" />
@@ -199,11 +199,11 @@ can also load XML files or PHP files.
199199
xmlns:framework="http://symfony.com/schema/dic/symfony"
200200
xmlns:twig="http://symfony.com/schema/dic/twig"
201201
xsi:schemaLocation="http://symfony.com/schema/dic/services
202-
http://symfony.com/schema/dic/services/services-1.0.xsd
202+
https://symfony.com/schema/dic/services/services-1.0.xsd
203203
http://symfony.com/schema/dic/symfony
204204
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd
205205
http://symfony.com/schema/dic/twig
206-
http://symfony.com/schema/dic/twig/twig-1.0.xsd">
206+
https://symfony.com/schema/dic/twig/twig-1.0.xsd">
207207
208208
<imports>
209209
<import resource="parameters.res" type="yml" />
@@ -253,7 +253,7 @@ key:
253253
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
254254
xmlns:framework="http://symfony.com/schema/dic/symfony"
255255
xsi:schemaLocation="http://symfony.com/schema/dic/services
256-
http://symfony.com/schema/dic/services/services-1.0.xsd
256+
https://symfony.com/schema/dic/services/services-1.0.xsd
257257
http://symfony.com/schema/dic/symfony
258258
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
259259
@@ -333,7 +333,7 @@ configure DoctrineBundle and other parts of Symfony:
333333
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
334334
xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
335335
xsi:schemaLocation="http://symfony.com/schema/dic/services
336-
http://symfony.com/schema/dic/services/services-1.0.xsd
336+
https://symfony.com/schema/dic/services/services-1.0.xsd
337337
http://symfony.com/schema/dic/doctrine
338338
http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
339339

‎configuration/configuration_organization.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ needed for the ``app/config/dev/config.yml`` file:
126126
<container xmlns="http://symfony.com/schema/dic/services"
127127
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
128128
xsi:schemaLocation="http://symfony.com/schema/dic/services
129-
http://symfony.com/schema/dic/services/services-1.0.xsd
129+
https://symfony.com/schema/dic/services/services-1.0.xsd
130130
http://symfony.com/schema/dic/symfony
131131
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
132132
@@ -237,7 +237,7 @@ format (``.yml``, ``.xml``, ``.php``, ``.ini``):
237237
<container xmlns="http://symfony.com/schema/dic/services"
238238
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
239239
xsi:schemaLocation="http://symfony.com/schema/dic/services
240-
http://symfony.com/schema/dic/services/services-1.0.xsd
240+
https://symfony.com/schema/dic/services/services-1.0.xsd
241241
http://symfony.com/schema/dic/symfony
242242
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
243243
@@ -301,7 +301,7 @@ any other configuration file:
301301
<container xmlns="http://symfony.com/schema/dic/services"
302302
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
303303
xsi:schemaLocation="http://symfony.com/schema/dic/services
304-
http://symfony.com/schema/dic/services/services-1.0.xsd
304+
https://symfony.com/schema/dic/services/services-1.0.xsd
305305
http://symfony.com/schema/dic/symfony
306306
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
307307
@@ -344,7 +344,7 @@ doesn't exist:
344344
<container xmlns="http://symfony.com/schema/dic/services"
345345
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
346346
xsi:schemaLocation="http://symfony.com/schema/dic/services
347-
http://symfony.com/schema/dic/services/services-1.0.xsd
347+
https://symfony.com/schema/dic/services/services-1.0.xsd
348348
http://symfony.com/schema/dic/symfony
349349
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
350350

‎configuration/environments.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ accomplished easily and transparently:
7272
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7373
xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
7474
xsi:schemaLocation="http://symfony.com/schema/dic/services
75-
http://symfony.com/schema/dic/services/services-1.0.xsd
75+
https://symfony.com/schema/dic/services/services-1.0.xsd
7676
http://symfony.com/schema/dic/doctrine
7777
http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
7878
@@ -118,7 +118,7 @@ configuration file:
118118
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
119119
xmlns:webprofiler="http://symfony.com/schema/dic/webprofiler"
120120
xsi:schemaLocation="http://symfony.com/schema/dic/services
121-
http://symfony.com/schema/dic/services/services-1.0.xsd
121+
https://symfony.com/schema/dic/services/services-1.0.xsd
122122
http://symfony.com/schema/dic/webprofiler
123123
http://symfony.com/schema/dic/webprofiler/webprofiler-1.0.xsd">
124124
@@ -225,7 +225,7 @@ this code and changing the environment string.
225225
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
226226
xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
227227
xsi:schemaLocation="http://symfony.com/schema/dic/services
228-
http://symfony.com/schema/dic/services/services-1.0.xsd
228+
https://symfony.com/schema/dic/services/services-1.0.xsd
229229
http://symfony.com/schema/dic/doctrine
230230
http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
231231
@@ -314,7 +314,7 @@ The best way to accomplish this is via a new environment called, for example,
314314
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
315315
xmlns:framework="http://symfony.com/schema/dic/symfony"
316316
xsi:schemaLocation="http://symfony.com/schema/dic/services
317-
http://symfony.com/schema/dic/services/services-1.0.xsd
317+
https://symfony.com/schema/dic/services/services-1.0.xsd
318318
http://symfony.com/schema/dic/symfony
319319
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
320320

‎configuration/external_parameters.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ variable in your service container configuration, you can reference it using
4242
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4343
xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
4444
xsi:schemaLocation="http://symfony.com/schema/dic/services
45-
http://symfony.com/schema/dic/services/services-1.0.xsd
45+
https://symfony.com/schema/dic/services/services-1.0.xsd
4646
http://symfony.com/schema/dic/doctrine
4747
http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
4848
@@ -81,7 +81,7 @@ will be used whenever the corresponding environment variable is *not* found:
8181
<?xml version="1.0" encoding="UTF-8" ?>
8282
<container xmlns="http://symfony.com/schema/dic/services"
8383
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
84-
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
84+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
8585
8686
<parameters>
8787
<parameter key="database_host">%env(DATABASE_HOST)%</parameter>
@@ -170,7 +170,7 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
170170
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
171171
xmlns:framework="http://symfony.com/schema/dic/symfony"
172172
xsi:schemaLocation="http://symfony.com/schema/dic/services
173-
http://symfony.com/schema/dic/services/services-1.0.xsd
173+
https://symfony.com/schema/dic/services/services-1.0.xsd
174174
http://symfony.com/schema/dic/symfony
175175
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
176176
@@ -211,7 +211,7 @@ Symfony provides the following env var processors:
211211
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
212212
xmlns:framework="http://symfony.com/schema/dic/symfony"
213213
xsi:schemaLocation="http://symfony.com/schema/dic/services
214-
http://symfony.com/schema/dic/services/services-1.0.xsd
214+
https://symfony.com/schema/dic/services/services-1.0.xsd
215215
http://symfony.com/schema/dic/symfony
216216
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
217217
@@ -251,7 +251,7 @@ Symfony provides the following env var processors:
251251
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
252252
xmlns:framework="http://symfony.com/schema/dic/symfony"
253253
xsi:schemaLocation="http://symfony.com/schema/dic/services
254-
http://symfony.com/schema/dic/services/services-1.0.xsd
254+
https://symfony.com/schema/dic/services/services-1.0.xsd
255255
http://symfony.com/schema/dic/symfony
256256
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
257257
@@ -298,7 +298,7 @@ Symfony provides the following env var processors:
298298
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
299299
xmlns:security="http://symfony.com/schema/dic/security"
300300
xsi:schemaLocation="http://symfony.com/schema/dic/services
301-
http://symfony.com/schema/dic/services/services-1.0.xsd">
301+
https://symfony.com/schema/dic/services/services-1.0.xsd">
302302
303303
<parameters>
304304
<parameter key="env(HEALTH_CHECK_METHOD)">Symfony\Component\HttpFoundation\Request::METHOD_HEAD</parameter>
@@ -347,7 +347,7 @@ Symfony provides the following env var processors:
347347
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
348348
xmlns:framework="http://symfony.com/schema/dic/symfony"
349349
xsi:schemaLocation="http://symfony.com/schema/dic/services
350-
http://symfony.com/schema/dic/services/services-1.0.xsd
350+
https://symfony.com/schema/dic/services/services-1.0.xsd
351351
http://symfony.com/schema/dic/symfony
352352
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
353353
@@ -388,7 +388,7 @@ Symfony provides the following env var processors:
388388
<container xmlns="http://symfony.com/schema/dic/services"
389389
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
390390
xsi:schemaLocation="http://symfony.com/schema/dic/services
391-
http://symfony.com/schema/dic/services/services-1.0.xsd">
391+
https://symfony.com/schema/dic/services/services-1.0.xsd">
392392
393393
<parameters>
394394
<parameter key="env(HOST)">10.0.0.1</parameter>
@@ -428,7 +428,7 @@ Symfony provides the following env var processors:
428428
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
429429
xmlns:framework="http://symfony.com/schema/dic/symfony"
430430
xsi:schemaLocation="http://symfony.com/schema/dic/services
431-
http://symfony.com/schema/dic/services/services-1.0.xsd
431+
https://symfony.com/schema/dic/services/services-1.0.xsd
432432
http://symfony.com/schema/dic/symfony
433433
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
434434
@@ -520,7 +520,7 @@ in the container. The following imports a file named ``parameters.php``.
520520
<container xmlns="http://symfony.com/schema/dic/services"
521521
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
522522
xsi:schemaLocation="http://symfony.com/schema/dic/services
523-
http://symfony.com/schema/dic/services/services-1.0.xsd">
523+
https://symfony.com/schema/dic/services/services-1.0.xsd">
524524
525525
<imports>
526526
<import resource="parameters.php" />

‎configuration/micro_kernel_trait.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ because the configuration started to get bigger:
229229
<container xmlns="http://symfony.com/schema/dic/services"
230230
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
231231
xmlns:framework="http://symfony.com/schema/dic/symfony"
232-
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
232+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
233233
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
234234
235235
<framework:config secret="S0ME_SECRET">

0 commit comments

Comments
 (0)