Skip to content

Commit 4b7dfec

Browse files
wouterjwouterj
committed
minor #11296 moved XSD to HTTPS - Part 2 (OskarStark)
This PR was merged into the 3.4 branch. Discussion ---------- moved XSD to HTTPS - Part 2 This is a follow up of #11122. I double checked the doctrine and phpunit namespaces, and the are available via https! //cc @fabpot <!-- 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 ------- c638c32 moved XSD to HTTPS - Part 2
2 parents bcfa1e4 + c638c32 commit 4b7dfec

Some content is hidden

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

60 files changed

+132
-132
lines changed

‎bundles/configuration.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ as integration of other related components:
3030
xsi:schemaLocation="http://symfony.com/schema/dic/services
3131
https://symfony.com/schema/dic/services/services-1.0.xsd
3232
http://symfony.com/schema/dic/symfony
33-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
33+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
3434
3535
<framework:config>
3636
<framework:form/>
@@ -418,7 +418,7 @@ can place it anywhere you like. You should return this path as the base path::
418418
}
419419

420420
Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
421-
``http://acme_company.com/schema/dic/hello/hello-1.0.xsd``:
421+
``https://acme_company.com/schema/dic/hello/hello-1.0.xsd``:
422422

423423
.. code-block:: xml
424424
@@ -428,7 +428,7 @@ Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
428428
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
429429
xmlns:acme-hello="http://acme_company.com/schema/dic/hello"
430430
xsi:schemaLocation="http://acme_company.com/schema/dic/hello
431-
http://acme_company.com/schema/dic/hello/hello-1.0.xsd">
431+
https://acme_company.com/schema/dic/hello/hello-1.0.xsd">
432432
433433
<acme-hello:config>
434434
<!-- ... -->

‎components/dependency_injection/compilation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ The XML version of the config would then look like this:
201201
<container xmlns="http://symfony.com/schema/dic/services"
202202
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
203203
xmlns:acme_demo="http://www.example.com/symfony/schema/"
204-
xsi:schemaLocation="http://www.example.com/symfony/schema/ http://www.example.com/symfony/schema/hello-1.0.xsd">
204+
xsi:schemaLocation="http://www.example.com/symfony/schema/ https://www.example.com/symfony/schema/hello-1.0.xsd">
205205
206206
<acme_demo:config>
207207
<acme_demo:foo>fooValue</acme_demo:foo>

‎components/phpunit_bridge.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``:
4949
5050
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
5151
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
52-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.0/phpunit.xsd"
52+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
5353
>
5454
5555
<!-- ... -->
@@ -173,7 +173,7 @@ message, enclosed with ``/``. For example, with:
173173
174174
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
175175
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
176-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.0/phpunit.xsd"
176+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
177177
>
178178
179179
<!-- ... -->
@@ -500,7 +500,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
500500
501501
<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
502502
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
503-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
503+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
504504
>
505505
506506
<!-- ... -->
@@ -644,7 +644,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file:
644644
645645
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
646646
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
647-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.0/phpunit.xsd"
647+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
648648
>
649649
650650
<!-- ... -->

‎components/serializer.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ Then, create your groups definition:
319319
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
320320
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
321321
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
322-
http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
322+
https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
323323
>
324324
<class name="Acme\MyObj">
325325
<attribute name="foo">
@@ -833,7 +833,7 @@ Here, we set it to 2 for the ``$child`` property:
833833
<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
834834
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
835835
xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping
836-
http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
836+
https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
837837
>
838838
<class name="Acme\MyObj">
839839
<attribute name="child" max-depth="2"/>

‎configuration.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The main configuration file is called ``config.yml``:
4646
xsi:schemaLocation="http://symfony.com/schema/dic/services
4747
https://symfony.com/schema/dic/services/services-1.0.xsd
4848
http://symfony.com/schema/dic/symfony
49-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd
49+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd
5050
http://symfony.com/schema/dic/twig
5151
https://symfony.com/schema/dic/twig/twig-1.0.xsd">
5252
@@ -201,7 +201,7 @@ can also load XML files or PHP files.
201201
xsi:schemaLocation="http://symfony.com/schema/dic/services
202202
https://symfony.com/schema/dic/services/services-1.0.xsd
203203
http://symfony.com/schema/dic/symfony
204-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd
204+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd
205205
http://symfony.com/schema/dic/twig
206206
https://symfony.com/schema/dic/twig/twig-1.0.xsd">
207207
@@ -255,7 +255,7 @@ key:
255255
xsi:schemaLocation="http://symfony.com/schema/dic/services
256256
https://symfony.com/schema/dic/services/services-1.0.xsd
257257
http://symfony.com/schema/dic/symfony
258-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
258+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
259259
260260
<!-- ... -->
261261
<parameters>
@@ -335,7 +335,7 @@ configure DoctrineBundle and other parts of Symfony:
335335
xsi:schemaLocation="http://symfony.com/schema/dic/services
336336
https://symfony.com/schema/dic/services/services-1.0.xsd
337337
http://symfony.com/schema/dic/doctrine
338-
http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
338+
https://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
339339
340340
<doctrine:config>
341341
<doctrine:dbal

‎configuration/configuration_organization.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ needed for the ``app/config/dev/config.yml`` file:
128128
xsi:schemaLocation="http://symfony.com/schema/dic/services
129129
https://symfony.com/schema/dic/services/services-1.0.xsd
130130
http://symfony.com/schema/dic/symfony
131-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
131+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
132132
133133
<imports>
134134
<import resource="../common/config.xml"/>
@@ -239,7 +239,7 @@ format (``.yml``, ``.xml``, ``.php``, ``.ini``):
239239
xsi:schemaLocation="http://symfony.com/schema/dic/services
240240
https://symfony.com/schema/dic/services/services-1.0.xsd
241241
http://symfony.com/schema/dic/symfony
242-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
242+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
243243
244244
<imports>
245245
<import resource="parameters.yml"/>
@@ -303,7 +303,7 @@ any other configuration file:
303303
xsi:schemaLocation="http://symfony.com/schema/dic/services
304304
https://symfony.com/schema/dic/services/services-1.0.xsd
305305
http://symfony.com/schema/dic/symfony
306-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
306+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
307307
308308
<imports>
309309
<import resource="parameters.yml"/>
@@ -346,7 +346,7 @@ doesn't exist:
346346
xsi:schemaLocation="http://symfony.com/schema/dic/services
347347
https://symfony.com/schema/dic/services/services-1.0.xsd
348348
http://symfony.com/schema/dic/symfony
349-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
349+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
350350
351351
<imports>
352352
<import resource="parameters.yml"/>

‎configuration/environments.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ accomplished easily and transparently:
7474
xsi:schemaLocation="http://symfony.com/schema/dic/services
7575
https://symfony.com/schema/dic/services/services-1.0.xsd
7676
http://symfony.com/schema/dic/doctrine
77-
http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
77+
https://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
7878
7979
<imports>
8080
<import resource="config.xml"/>
@@ -120,7 +120,7 @@ configuration file:
120120
xsi:schemaLocation="http://symfony.com/schema/dic/services
121121
https://symfony.com/schema/dic/services/services-1.0.xsd
122122
http://symfony.com/schema/dic/webprofiler
123-
http://symfony.com/schema/dic/webprofiler/webprofiler-1.0.xsd">
123+
https://symfony.com/schema/dic/webprofiler/webprofiler-1.0.xsd">
124124
125125
<imports>
126126
<import resource="config.xml"/>
@@ -227,7 +227,7 @@ this code and changing the environment string.
227227
xsi:schemaLocation="http://symfony.com/schema/dic/services
228228
https://symfony.com/schema/dic/services/services-1.0.xsd
229229
http://symfony.com/schema/dic/doctrine
230-
http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
230+
https://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
231231
232232
<doctrine:dbal logging="%kernel.debug%"/>
233233
@@ -316,7 +316,7 @@ The best way to accomplish this is via a new environment called, for example,
316316
xsi:schemaLocation="http://symfony.com/schema/dic/services
317317
https://symfony.com/schema/dic/services/services-1.0.xsd
318318
http://symfony.com/schema/dic/symfony
319-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
319+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
320320
321321
<imports>
322322
<import resource="config_prod.xml"/>

‎configuration/external_parameters.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ variable in your service container configuration, you can reference it using
4444
xsi:schemaLocation="http://symfony.com/schema/dic/services
4545
https://symfony.com/schema/dic/services/services-1.0.xsd
4646
http://symfony.com/schema/dic/doctrine
47-
http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
47+
https://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
4848
4949
<doctrine:config>
5050
<doctrine:dbal
@@ -172,7 +172,7 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
172172
xsi:schemaLocation="http://symfony.com/schema/dic/services
173173
https://symfony.com/schema/dic/services/services-1.0.xsd
174174
http://symfony.com/schema/dic/symfony
175-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
175+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
176176
177177
<framework:config>
178178
<framework:router http-port="%env(int:HTTP_PORT)%"/>
@@ -213,7 +213,7 @@ Symfony provides the following env var processors:
213213
xsi:schemaLocation="http://symfony.com/schema/dic/services
214214
https://symfony.com/schema/dic/services/services-1.0.xsd
215215
http://symfony.com/schema/dic/symfony
216-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
216+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
217217
218218
<parameters>
219219
<parameter key="env(SECRET)">some_secret</parameter>
@@ -253,7 +253,7 @@ Symfony provides the following env var processors:
253253
xsi:schemaLocation="http://symfony.com/schema/dic/services
254254
https://symfony.com/schema/dic/services/services-1.0.xsd
255255
http://symfony.com/schema/dic/symfony
256-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
256+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
257257
258258
<parameters>
259259
<parameter key="env(HTTP_METHOD_OVERRIDE)">true</parameter>
@@ -349,7 +349,7 @@ Symfony provides the following env var processors:
349349
xsi:schemaLocation="http://symfony.com/schema/dic/services
350350
https://symfony.com/schema/dic/services/services-1.0.xsd
351351
http://symfony.com/schema/dic/symfony
352-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
352+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
353353
354354
<parameters>
355355
<parameter key="env(TRUSTED_HOSTS)">["10.0.0.1", "10.0.0.2"]</parameter>
@@ -430,7 +430,7 @@ Symfony provides the following env var processors:
430430
xsi:schemaLocation="http://symfony.com/schema/dic/services
431431
https://symfony.com/schema/dic/services/services-1.0.xsd
432432
http://symfony.com/schema/dic/symfony
433-
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
433+
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
434434
435435
<parameters>
436436
<parameter key="env(AUTH_FILE)">../config/auth.json</parameter>

‎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
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
230230
xmlns:framework="http://symfony.com/schema/dic/symfony"
231231
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
232-
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
232+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
233233
234234
<framework:config secret="S0ME_SECRET">
235235
<framework:templating>

‎configuration/override_dir_structure.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ You also need to change the ``extra.symfony-web-dir`` option in the
194194
xsi:schemaLocation="http://symfony.com/schema/dic/services
195195
https://symfony.com/schema/dic/services/services-1.0.xsd
196196
http://symfony.com/schema/dic/assetic
197-
http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
197+
https://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
198198
199199
<!-- ... -->
200200
<assetic:config read-from="%kernel.project_dir%/../public_html"/>

0 commit comments

Comments
 (0)