Merge branch '5.4' into 6.2

OskarStark · OskarStark · commit 4ef50155b3b6 · 2023-04-14T11:58:23.000+02:00
* 5.4:
  Use HTTPS links when possible
diff --git a/components/asset.rst b/components/asset.rst
@@ -286,12 +286,12 @@ class to generate absolute URLs for their assets::
     // ...
 
     $urlPackage = new UrlPackage(
-        'http://static.example.com/images/',
+        'https://static.example.com/images/',
         new StaticVersionStrategy('v1')
     );
 
     echo $urlPackage->getUrl('/logo.png');
-    // result: http://static.example.com/images/logo.png?v1
+    // result: https://static.example.com/images/logo.png?v1
 
 You can also pass a schema-agnostic URL::
 
@@ -318,15 +318,15 @@ constructor::
     // ...
 
     $urls = [
-        '//static1.example.com/images/',
-        '//static2.example.com/images/',
+        'https://static1.example.com/images/',
+        'https://static2.example.com/images/',
     ];
     $urlPackage = new UrlPackage($urls, new StaticVersionStrategy('v1'));
 
     echo $urlPackage->getUrl('/logo.png');
-    // result: http://static1.example.com/images/logo.png?v1
+    // result: https://static1.example.com/images/logo.png?v1
     echo $urlPackage->getUrl('/icon.png');
-    // result: http://static2.example.com/images/icon.png?v1
+    // result: https://static2.example.com/images/icon.png?v1
 
 For each asset, one of the URLs will be randomly used. But, the selection
 is deterministic, meaning that each asset will always be served by the same
@@ -376,7 +376,7 @@ they all have different base paths::
     $defaultPackage = new Package($versionStrategy);
 
     $namedPackages = [
-        'img' => new UrlPackage('http://img.example.com/', $versionStrategy),
+        'img' => new UrlPackage('https://img.example.com/', $versionStrategy),
         'doc' => new PathPackage('/somewhere/deep/for/documents', $versionStrategy),
     ];
 
@@ -392,7 +392,7 @@ document inside a template::
     // result: /main.css?v1
 
     echo $packages->getUrl('/logo.png', 'img');
-    // result: http://img.example.com/logo.png?v1
+    // result: https://img.example.com/logo.png?v1
 
     echo $packages->getUrl('resume.pdf', 'doc');
     // result: /somewhere/deep/for/documents/resume.pdf?v1
diff --git a/components/intl.rst b/components/intl.rst
@@ -416,7 +416,7 @@ Learn more
     /reference/forms/types/timezone
 
 .. _install the intl extension: https://www.php.net/manual/en/intl.setup.php
-.. _ICU library: http://site.icu-project.org/
+.. _ICU library: https://icu.unicode.org/
 .. _`Unicode ISO 15924 Registry`: https://www.unicode.org/iso15924/iso15924-codes.html
 .. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 .. _`ISO 3166-1 alpha-3`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
@@ -50,7 +50,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``:
 
 .. code-block:: xml
 
-    <!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
+    <!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
     >
@@ -199,7 +199,7 @@ message, enclosed with ``/``. For example, with:
 
 .. code-block:: xml
 
-    <!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
+    <!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
     >
@@ -810,7 +810,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
 
 .. code-block:: xml
 
-    <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
+    <!-- https://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
     >
@@ -989,7 +989,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file:
 
 .. code-block:: xml
 
-    <!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
+    <!-- https://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
     <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
     >
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -1807,7 +1807,7 @@ Learn more
 .. _RFC3339: https://tools.ietf.org/html/rfc3339#section-5.8
 .. _`options with libxml`: https://www.php.net/manual/en/libxml.constants.php
 .. _`DOM XML_* constants`: https://www.php.net/manual/en/dom.constants.php
-.. _JSON: http://www.json.org/
+.. _JSON: https://www.json.org/json-en.html
 .. _XML: https://www.w3.org/XML/
 .. _YAML: https://yaml.org/
 .. _CSV: https://tools.ietf.org/html/rfc4180
diff --git a/components/uid.rst b/components/uid.rst
@@ -54,9 +54,9 @@ to create each type of UUID::
     $uuid = Uuid::v3(Uuid::NAMESPACE_OID, $name);  // same as: Uuid::v3('oid', $name);
     $uuid = Uuid::v3(Uuid::NAMESPACE_X500, $name); // same as: Uuid::v3('x500', $name);
 
-    // UUID type 6 is not part of the UUID standard. It's lexicographically sortable
+    // UUID type 6 is not yet part of the UUID standard. It's lexicographically sortable
     // (like ULIDs) and contains a 60-bit timestamp and 63 extra unique bits.
-    // It's defined in http://gh.peabody.io/uuidv6/
+    // It's defined in https://www.ietf.org/archive/id/draft-peabody-dispatch-new-uuid-format-04.html#name-uuid-version-6
     $uuid = Uuid::v6(); // $uuid is an instance of Symfony\Component\Uid\UuidV6
 
     // UUID version 7 features a time-ordered value field derived from the well known
diff --git a/deployment.rst b/deployment.rst
@@ -269,10 +269,10 @@ Learn More
 
 .. _`Capifony`: https://github.com/everzet/capifony
 .. _`Capistrano`: https://capistranorb.com/
-.. _`Fabric`: http://www.fabfile.org/
+.. _`Fabric`: https://www.fabfile.org/
 .. _`Ansistrano`: https://ansistrano.com/
 .. _`Magallanes`: https://github.com/andres-montanez/Magallanes
-.. _`Memcached`: http://memcached.org/
+.. _`Memcached`: https://memcached.org/
 .. _`Redis`: https://redis.io/
 .. _`Symfony plugin`: https://github.com/capistrano/symfony/
 .. _`Deployer`: https://deployer.org/
diff --git a/deployment/proxies.rst b/deployment/proxies.rst
@@ -169,4 +169,4 @@ handling the request::
 .. _`CloudFront`: https://en.wikipedia.org/wiki/Amazon_CloudFront
 .. _`CloudFront IP ranges`: https://ip-ranges.amazonaws.com/ip-ranges.json
 .. _`HTTP Host header attacks`: https://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
-.. _`nginx realip module`: http://nginx.org/en/docs/http/ngx_http_realip_module.html
+.. _`nginx realip module`: https://nginx.org/en/docs/http/ngx_http_realip_module.html
diff --git a/http_cache/esi.rst b/http_cache/esi.rst
@@ -281,4 +281,4 @@ The ``render_esi`` helper supports three other useful options:
 
     The ``absolute_uri`` option was introduced in Symfony 6.2.
 
-.. _`ESI`: http://www.w3.org/TR/esi-lang
+.. _`ESI`: https://www.w3.org/TR/esi-lang/
diff --git a/http_cache/varnish.rst b/http_cache/varnish.rst
@@ -225,9 +225,9 @@ proxy before it has expired, it adds complexity to your caching setup.
     Varnish and other reverse proxies for cache invalidation.
 
 .. _`Varnish`: https://varnish-cache.org/
-.. _`Edge Architecture`: http://www.w3.org/TR/edge-arch
+.. _`Edge Architecture`: https://www.w3.org/TR/edge-arch
 .. _`clean the cookies header`: https://varnish-cache.org/docs/7.0/reference/vmod_cookie.html
-.. _`Surrogate-Capability Header`: http://www.w3.org/TR/edge-arch
+.. _`Surrogate-Capability Header`: https://www.w3.org/TR/edge-arch
 .. _`cache invalidation`: https://tools.ietf.org/html/rfc2616#section-13.10
 .. _`FOSHttpCacheBundle`: https://foshttpcachebundle.readthedocs.io/en/latest/features/user-context.html
 .. _`default.vcl`: https://github.com/varnishcache/varnish-cache/blob/3.0/bin/varnishd/default.vcl
diff --git a/introduction/http_fundamentals.rst b/introduction/http_fundamentals.rst
@@ -372,8 +372,8 @@ Here's what we've learned so far:
 
 .. _`xkcd`: https://xkcd.com/
 .. _`XMLHttpRequest`: https://en.wikipedia.org/wiki/XMLHttpRequest
-.. _`HTTP 1.1 RFC`: http://www.w3.org/Protocols/rfc2616/rfc2616.html
-.. _`HTTP Bis`: http://datatracker.ietf.org/wg/httpbis/
+.. _`HTTP 1.1 RFC`: https://www.w3.org/Protocols/rfc2616/rfc2616.html
+.. _`HTTP Bis`: https://datatracker.ietf.org/wg/httpbis/
 .. _`List of HTTP header fields`: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
 .. _`list of HTTP status codes`: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
 .. _`List of common media types`: https://www.iana.org/assignments/media-types/media-types.xhtml
diff --git a/reference/constraints/File.rst b/reference/constraints/File.rst
@@ -412,5 +412,5 @@ The message that is displayed if the uploaded file is only partially uploaded.
 
 This message has no parameters.
 
-.. _`IANA website`: http://www.iana.org/assignments/media-types/media-types.xhtml
+.. _`IANA website`: https://www.iana.org/assignments/media-types/media-types.xhtml
 .. _`Wikipedia: Binary prefix`: https://en.wikipedia.org/wiki/Binary_prefix
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
@@ -524,5 +524,5 @@ options has been set.
 
 This message has no parameters.
 
-.. _`IANA website`: http://www.iana.org/assignments/media-types/media-types.xhtml
+.. _`IANA website`: https://www.iana.org/assignments/media-types/media-types.xhtml
 .. _`PHP GD extension`: https://www.php.net/manual/en/book.image.php
diff --git a/reference/formats/message_format.rst b/reference/formats/message_format.rst
@@ -498,8 +498,8 @@ The ``number`` formatter allows you to format numbers using Intl's :phpclass:`Nu
     // "9 988 776,65 €"
     echo $translator->trans('value_of_object', ['value' => 9988776.65]);
 
-.. _`online editor`: http://format-message.github.io/icu-message-format-for-translators/
+.. _`online editor`: https://format-message.github.io/icu-message-format-for-translators/
 .. _`ICU MessageFormat`: https://unicode-org.github.io/icu/userguide/format_parse/messages/
 .. _`switch statement`: https://www.php.net/control-structures.switch
-.. _`Language Plural Rules`: http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html
+.. _`Language Plural Rules`: https://www.unicode.org/cldr/charts/43/supplemental/language_plural_rules.html
 .. _`constants defined by the IntlDateFormatter class`: https://www.php.net/manual/en/class.intldateformatter.php
diff --git a/reference/formats/xliff.rst b/reference/formats/xliff.rst
@@ -37,4 +37,4 @@ loaded/dumped inside a Symfony application:
         </file>
     </xliff>
 
-.. _XLIFF: http://docs.oasis-open.org/xliff/xliff-core/v2.1/xliff-core-v2.1.html
+.. _XLIFF: https://docs.oasis-open.org/xliff/xliff-core/v2.1/xliff-core-v2.1.html
diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst
@@ -231,5 +231,5 @@ Field Variables
 |          |            | contains the input type to use (``datetime``, ``date`` or ``time``). |
 +----------+------------+----------------------------------------------------------------------+
 
-.. _`datetime local`: http://w3c.github.io/html-reference/datatypes.html#form.data.datetime-local
+.. _`datetime local`: https://html.spec.whatwg.org/multipage/input.html#local-date-and-time-state-(type=datetime-local)
 .. _`Date/Time Format Syntax`: https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst
@@ -137,4 +137,4 @@ The actual default value of this option depends on other field options:
 
 .. _`ISO 639-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_639-1
 .. _`ISO 639-2 alpha-3 (2T)`: https://en.wikipedia.org/wiki/ISO_639-2
-.. _`International Components for Unicode`: http://site.icu-project.org
+.. _`International Components for Unicode`: https://icu.unicode.org/
diff --git a/reference/forms/types/options/required.rst.inc b/reference/forms/types/options/required.rst.inc
@@ -15,4 +15,4 @@ from your validation information.
     The required option also affects how empty data for each field is
     handled. For more details, see the `empty_data`_ option.
 
-.. _`HTML5 required attribute`: http://diveintohtml5.info/forms.html
+.. _`HTML5 required attribute`: https://html.spec.whatwg.org/multipage/input.html#attr-input-required
diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst
@@ -133,4 +133,4 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/row_attr.rst.inc
 
-.. _`ICU Project`: http://site.icu-project.org/
+.. _`ICU Project`: https://icu.unicode.org/
diff --git a/security/ldap.rst b/security/ldap.rst
@@ -533,6 +533,6 @@ Configuration example for form login and query_string
         };
 
 .. _`LDAP PHP extension`: https://www.php.net/manual/en/intro.ldap.php
-.. _`RFC4515`: http://www.faqs.org/rfcs/rfc4515.html
+.. _`RFC4515`: https://datatracker.ietf.org/doc/rfc4515/
 .. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection
 
diff --git a/serializer.rst b/serializer.rst
@@ -522,7 +522,7 @@ take a look at how this bundle works.
 
 .. _`API Platform`: https://api-platform.com
 .. _`JSON-LD`: https://json-ld.org
-.. _`Hydra Core Vocabulary`: http://www.hydra-cg.com
+.. _`Hydra Core Vocabulary`: https://www.hydra-cg.com/
 .. _`OpenAPI`: https://www.openapis.org
 .. _`GraphQL`: https://graphql.org
 .. _`JSON:API`: https://jsonapi.org
diff --git a/templates.rst b/templates.rst
@@ -1599,4 +1599,4 @@ for this class and :doc:`tag your service </service_container/tags>` with ``twig
 .. _`default Twig filters and functions`: https://twig.symfony.com/doc/3.x/#reference
 .. _`official Twig extensions`: https://github.com/twigphp?q=extra
 .. _`global variables`: https://twig.symfony.com/doc/3.x/advanced.html#id1
-.. _`hinclude.js`: http://mnot.github.io/hinclude/
+.. _`hinclude.js`: https://mnot.github.io/hinclude/

Original file line number	Diff line number	Diff line change
@@ -281,4 +281,4 @@ The ``render_esi`` helper supports three other useful options:
`281`	`281`
`282`	`282`	The ``absolute_uri`` option was introduced in Symfony 6.2.
`283`	`283`
`284`		-.. _`ESI`: http://www.w3.org/TR/esi-lang
	`284`	+.. _`ESI`: https://www.w3.org/TR/esi-lang/