Merge branch '6.0' into 6.1

* 6.0:
  Update constraint Type types
  Emphasizing *NOT* working
  More minor rewordings
  remove mention to @required

Author: javiereguiluz

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

@@ -2,7 +2,7 @@
 
     Due to the way in which parameters are resolved, you cannot use them
     to build paths in imports dynamically. This means that something like
-    the following doesn't work:
+    **the following does not work:**
 
     .. configuration-block::
 

configuration.rst

@@ -58,8 +58,8 @@ Configuration Formats
 ~~~~~~~~~~~~~~~~~~~~~
 
 Unlike other frameworks, Symfony doesn't impose a specific format on you to
-configure your applications. Symfony lets you choose between YAML, XML and PHP
-and throughout the Symfony documentation, all configuration examples will be
+configure your applications, but lets you choose between YAML, XML and PHP. 
+Throughout the Symfony documentation, all configuration examples will be
 shown in these three formats.
 
 There isn't any practical difference between formats. In fact, Symfony

reference/constraints/Type.rst

@@ -169,22 +169,24 @@ This required option defines the type or collection of types allowed for the
 given value. Each type is either the FQCN (fully qualified class name) of some
 PHP class/interface or a valid PHP datatype (checked by PHP's ``is_()`` functions):
 
-* :phpfunction:`array <is_array>`
 * :phpfunction:`bool <is_bool>`
-* :phpfunction:`callable <is_callable>`
-* :phpfunction:`float <is_float>`
-* :phpfunction:`double <is_double>`
+* :phpfunction:`boolean <is_bool>`
 * :phpfunction:`int <is_int>`
-* :phpfunction:`integer <is_integer>`
-* :phpfunction:`iterable <is_iterable>`
-* :phpfunction:`long <is_long>`
-* :phpfunction:`null <is_null>`
+* :phpfunction:`integer <is_int>`
+* :phpfunction:`long <is_int>`
+* :phpfunction:`float <is_float>`
+* :phpfunction:`double <is_float>`
+* :phpfunction:`real <is_float>`
 * :phpfunction:`numeric <is_numeric>`
+* :phpfunction:`string <is_string>`
+* :phpfunction:`scalar <is_scalar>`
+* :phpfunction:`array <is_array>`
+* :phpfunction:`iterable <is_iterable>`
+* :phpfunction:`countable <is_countable>`
+* :phpfunction:`callable <is_callable>`
 * :phpfunction:`object <is_object>`
-* :phpfunction:`real <is_real>`
 * :phpfunction:`resource <is_resource>`
-* :phpfunction:`scalar <is_scalar>`
-* :phpfunction:`string <is_string>`
+* :phpfunction:`null <is_null>`
 
 Also, you can use ``ctype_*()`` functions from corresponding
 `built-in PHP extension`_. Consider `a list of ctype functions`_:

service_container/autowiring.rst

@@ -630,11 +630,8 @@ Autowiring will automatically call *any* method with the ``#[Required]`` attribu
 above it, autowiring each argument. If you need to manually wire some of the arguments
 to a method, you can always explicitly :doc:`configure the method call </service_container/calls>`.
 
-If your PHP version doesn't support attributes (they were introduced in PHP 8),
-you can use the ``@required`` annotation instead.
-
 Despite property injection having some :ref:`drawbacks <property-injection>`,
-autowiring with ``#[Required]`` or ``@required`` can also be applied to public
+autowiring with ``#[Required]`` can also be applied to public
 typed properties:
 
 .. configuration-block::