Skip to content

Commit 4ef5015

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Use HTTPS links when possible
2 parents 74d96db + 686f83c commit 4ef5015

21 files changed

+36
-36
lines changed

components/asset.rst

+8-8
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,12 @@ class to generate absolute URLs for their assets::
286286
// ...
287287

288288
$urlPackage = new UrlPackage(
289-
'http://static.example.com/images/',
289+
'https://static.example.com/images/',
290290
new StaticVersionStrategy('v1')
291291
);
292292

293293
echo $urlPackage->getUrl('/logo.png');
294-
// result: http://static.example.com/images/logo.png?v1
294+
// result: https://static.example.com/images/logo.png?v1
295295

296296
You can also pass a schema-agnostic URL::
297297

@@ -318,15 +318,15 @@ constructor::
318318
// ...
319319

320320
$urls = [
321-
'//static1.example.com/images/',
322-
'//static2.example.com/images/',
321+
'https://static1.example.com/images/',
322+
'https://static2.example.com/images/',
323323
];
324324
$urlPackage = new UrlPackage($urls, new StaticVersionStrategy('v1'));
325325

326326
echo $urlPackage->getUrl('/logo.png');
327-
// result: http://static1.example.com/images/logo.png?v1
327+
// result: https://static1.example.com/images/logo.png?v1
328328
echo $urlPackage->getUrl('/icon.png');
329-
// result: http://static2.example.com/images/icon.png?v1
329+
// result: https://static2.example.com/images/icon.png?v1
330330

331331
For each asset, one of the URLs will be randomly used. But, the selection
332332
is deterministic, meaning that each asset will always be served by the same
@@ -376,7 +376,7 @@ they all have different base paths::
376376
$defaultPackage = new Package($versionStrategy);
377377

378378
$namedPackages = [
379-
'img' => new UrlPackage('http://img.example.com/', $versionStrategy),
379+
'img' => new UrlPackage('https://img.example.com/', $versionStrategy),
380380
'doc' => new PathPackage('/somewhere/deep/for/documents', $versionStrategy),
381381
];
382382

@@ -392,7 +392,7 @@ document inside a template::
392392
// result: /main.css?v1
393393

394394
echo $packages->getUrl('/logo.png', 'img');
395-
// result: http://img.example.com/logo.png?v1
395+
// result: https://img.example.com/logo.png?v1
396396

397397
echo $packages->getUrl('resume.pdf', 'doc');
398398
// result: /somewhere/deep/for/documents/resume.pdf?v1

components/intl.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ Learn more
416416
/reference/forms/types/timezone
417417

418418
.. _install the intl extension: https://www.php.net/manual/en/intl.setup.php
419-
.. _ICU library: http://site.icu-project.org/
419+
.. _ICU library: https://icu.unicode.org/
420420
.. _`Unicode ISO 15924 Registry`: https://www.unicode.org/iso15924/iso15924-codes.html
421421
.. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
422422
.. _`ISO 3166-1 alpha-3`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3

components/phpunit_bridge.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``:
5050

5151
.. code-block:: xml
5252
53-
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
53+
<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
5454
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5555
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
5656
>
@@ -199,7 +199,7 @@ message, enclosed with ``/``. For example, with:
199199

200200
.. code-block:: xml
201201
202-
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
202+
<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
203203
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
204204
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
205205
>
@@ -810,7 +810,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
810810

811811
.. code-block:: xml
812812
813-
<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
813+
<!-- https://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
814814
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
815815
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
816816
>
@@ -989,7 +989,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file:
989989

990990
.. code-block:: xml
991991
992-
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
992+
<!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
993993
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
994994
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
995995
>

components/serializer.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,7 @@ Learn more
18071807
.. _RFC3339: https://tools.ietf.org/html/rfc3339#section-5.8
18081808
.. _`options with libxml`: https://www.php.net/manual/en/libxml.constants.php
18091809
.. _`DOM XML_* constants`: https://www.php.net/manual/en/dom.constants.php
1810-
.. _JSON: http://www.json.org/
1810+
.. _JSON: https://www.json.org/json-en.html
18111811
.. _XML: https://www.w3.org/XML/
18121812
.. _YAML: https://yaml.org/
18131813
.. _CSV: https://tools.ietf.org/html/rfc4180

components/uid.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ to create each type of UUID::
5454
$uuid = Uuid::v3(Uuid::NAMESPACE_OID, $name); // same as: Uuid::v3('oid', $name);
5555
$uuid = Uuid::v3(Uuid::NAMESPACE_X500, $name); // same as: Uuid::v3('x500', $name);
5656

57-
// UUID type 6 is not part of the UUID standard. It's lexicographically sortable
57+
// UUID type 6 is not yet part of the UUID standard. It's lexicographically sortable
5858
// (like ULIDs) and contains a 60-bit timestamp and 63 extra unique bits.
59-
// It's defined in http://gh.peabody.io/uuidv6/
59+
// It's defined in https://www.ietf.org/archive/id/draft-peabody-dispatch-new-uuid-format-04.html#name-uuid-version-6
6060
$uuid = Uuid::v6(); // $uuid is an instance of Symfony\Component\Uid\UuidV6
6161

6262
// UUID version 7 features a time-ordered value field derived from the well known

deployment.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,10 @@ Learn More
269269

270270
.. _`Capifony`: https://github.com/everzet/capifony
271271
.. _`Capistrano`: https://capistranorb.com/
272-
.. _`Fabric`: http://www.fabfile.org/
272+
.. _`Fabric`: https://www.fabfile.org/
273273
.. _`Ansistrano`: https://ansistrano.com/
274274
.. _`Magallanes`: https://github.com/andres-montanez/Magallanes
275-
.. _`Memcached`: http://memcached.org/
275+
.. _`Memcached`: https://memcached.org/
276276
.. _`Redis`: https://redis.io/
277277
.. _`Symfony plugin`: https://github.com/capistrano/symfony/
278278
.. _`Deployer`: https://deployer.org/

deployment/proxies.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,4 @@ handling the request::
169169
.. _`CloudFront`: https://en.wikipedia.org/wiki/Amazon_CloudFront
170170
.. _`CloudFront IP ranges`: https://ip-ranges.amazonaws.com/ip-ranges.json
171171
.. _`HTTP Host header attacks`: https://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
172-
.. _`nginx realip module`: http://nginx.org/en/docs/http/ngx_http_realip_module.html
172+
.. _`nginx realip module`: https://nginx.org/en/docs/http/ngx_http_realip_module.html

http_cache/esi.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,4 +281,4 @@ The ``render_esi`` helper supports three other useful options:
281281

282282
The ``absolute_uri`` option was introduced in Symfony 6.2.
283283

284-
.. _`ESI`: http://www.w3.org/TR/esi-lang
284+
.. _`ESI`: https://www.w3.org/TR/esi-lang/

http_cache/varnish.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ proxy before it has expired, it adds complexity to your caching setup.
225225
Varnish and other reverse proxies for cache invalidation.
226226

227227
.. _`Varnish`: https://varnish-cache.org/
228-
.. _`Edge Architecture`: http://www.w3.org/TR/edge-arch
228+
.. _`Edge Architecture`: https://www.w3.org/TR/edge-arch
229229
.. _`clean the cookies header`: https://varnish-cache.org/docs/7.0/reference/vmod_cookie.html
230-
.. _`Surrogate-Capability Header`: http://www.w3.org/TR/edge-arch
230+
.. _`Surrogate-Capability Header`: https://www.w3.org/TR/edge-arch
231231
.. _`cache invalidation`: https://tools.ietf.org/html/rfc2616#section-13.10
232232
.. _`FOSHttpCacheBundle`: https://foshttpcachebundle.readthedocs.io/en/latest/features/user-context.html
233233
.. _`default.vcl`: https://github.com/varnishcache/varnish-cache/blob/3.0/bin/varnishd/default.vcl

introduction/http_fundamentals.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ Here's what we've learned so far:
372372

373373
.. _`xkcd`: https://xkcd.com/
374374
.. _`XMLHttpRequest`: https://en.wikipedia.org/wiki/XMLHttpRequest
375-
.. _`HTTP 1.1 RFC`: http://www.w3.org/Protocols/rfc2616/rfc2616.html
376-
.. _`HTTP Bis`: http://datatracker.ietf.org/wg/httpbis/
375+
.. _`HTTP 1.1 RFC`: https://www.w3.org/Protocols/rfc2616/rfc2616.html
376+
.. _`HTTP Bis`: https://datatracker.ietf.org/wg/httpbis/
377377
.. _`List of HTTP header fields`: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
378378
.. _`list of HTTP status codes`: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
379379
.. _`List of common media types`: https://www.iana.org/assignments/media-types/media-types.xhtml

reference/constraints/File.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -412,5 +412,5 @@ The message that is displayed if the uploaded file is only partially uploaded.
412412

413413
This message has no parameters.
414414

415-
.. _`IANA website`: http://www.iana.org/assignments/media-types/media-types.xhtml
415+
.. _`IANA website`: https://www.iana.org/assignments/media-types/media-types.xhtml
416416
.. _`Wikipedia: Binary prefix`: https://en.wikipedia.org/wiki/Binary_prefix

reference/constraints/Image.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -524,5 +524,5 @@ options has been set.
524524

525525
This message has no parameters.
526526

527-
.. _`IANA website`: http://www.iana.org/assignments/media-types/media-types.xhtml
527+
.. _`IANA website`: https://www.iana.org/assignments/media-types/media-types.xhtml
528528
.. _`PHP GD extension`: https://www.php.net/manual/en/book.image.php

reference/formats/message_format.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,8 @@ The ``number`` formatter allows you to format numbers using Intl's :phpclass:`Nu
498498
// "9 988 776,65 €"
499499
echo $translator->trans('value_of_object', ['value' => 9988776.65]);
500500
501-
.. _`online editor`: http://format-message.github.io/icu-message-format-for-translators/
501+
.. _`online editor`: https://format-message.github.io/icu-message-format-for-translators/
502502
.. _`ICU MessageFormat`: https://unicode-org.github.io/icu/userguide/format_parse/messages/
503503
.. _`switch statement`: https://www.php.net/control-structures.switch
504-
.. _`Language Plural Rules`: http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html
504+
.. _`Language Plural Rules`: https://www.unicode.org/cldr/charts/43/supplemental/language_plural_rules.html
505505
.. _`constants defined by the IntlDateFormatter class`: https://www.php.net/manual/en/class.intldateformatter.php

reference/formats/xliff.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ loaded/dumped inside a Symfony application:
3737
</file>
3838
</xliff>
3939
40-
.. _XLIFF: http://docs.oasis-open.org/xliff/xliff-core/v2.1/xliff-core-v2.1.html
40+
.. _XLIFF: https://docs.oasis-open.org/xliff/xliff-core/v2.1/xliff-core-v2.1.html

reference/forms/types/datetime.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,5 +231,5 @@ Field Variables
231231
| | | contains the input type to use (``datetime``, ``date`` or ``time``). |
232232
+----------+------------+----------------------------------------------------------------------+
233233

234-
.. _`datetime local`: http://w3c.github.io/html-reference/datatypes.html#form.data.datetime-local
234+
.. _`datetime local`: https://html.spec.whatwg.org/multipage/input.html#local-date-and-time-state-(type=datetime-local)
235235
.. _`Date/Time Format Syntax`: https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax

reference/forms/types/language.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ The actual default value of this option depends on other field options:
137137

138138
.. _`ISO 639-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_639-1
139139
.. _`ISO 639-2 alpha-3 (2T)`: https://en.wikipedia.org/wiki/ISO_639-2
140-
.. _`International Components for Unicode`: http://site.icu-project.org
140+
.. _`International Components for Unicode`: https://icu.unicode.org/

reference/forms/types/options/required.rst.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ from your validation information.
1515
The required option also affects how empty data for each field is
1616
handled. For more details, see the `empty_data`_ option.
1717

18-
.. _`HTML5 required attribute`: http://diveintohtml5.info/forms.html
18+
.. _`HTML5 required attribute`: https://html.spec.whatwg.org/multipage/input.html#attr-input-required

reference/forms/types/timezone.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ The actual default value of this option depends on other field options:
133133

134134
.. include:: /reference/forms/types/options/row_attr.rst.inc
135135

136-
.. _`ICU Project`: http://site.icu-project.org/
136+
.. _`ICU Project`: https://icu.unicode.org/

security/ldap.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,6 @@ Configuration example for form login and query_string
533533
};
534534
535535
.. _`LDAP PHP extension`: https://www.php.net/manual/en/intro.ldap.php
536-
.. _`RFC4515`: http://www.faqs.org/rfcs/rfc4515.html
536+
.. _`RFC4515`: https://datatracker.ietf.org/doc/rfc4515/
537537
.. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection
538538

serializer.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ take a look at how this bundle works.
522522

523523
.. _`API Platform`: https://api-platform.com
524524
.. _`JSON-LD`: https://json-ld.org
525-
.. _`Hydra Core Vocabulary`: http://www.hydra-cg.com
525+
.. _`Hydra Core Vocabulary`: https://www.hydra-cg.com/
526526
.. _`OpenAPI`: https://www.openapis.org
527527
.. _`GraphQL`: https://graphql.org
528528
.. _`JSON:API`: https://jsonapi.org

templates.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1599,4 +1599,4 @@ for this class and :doc:`tag your service </service_container/tags>` with ``twig
15991599
.. _`default Twig filters and functions`: https://twig.symfony.com/doc/3.x/#reference
16001600
.. _`official Twig extensions`: https://github.com/twigphp?q=extra
16011601
.. _`global variables`: https://twig.symfony.com/doc/3.x/advanced.html#id1
1602-
.. _`hinclude.js`: http://mnot.github.io/hinclude/
1602+
.. _`hinclude.js`: https://mnot.github.io/hinclude/

0 commit comments

Comments
 (0)