Skip to content

Commit cf5cadd

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: Update constraint Type types Emphasizing *NOT* working More minor rewordings remove mention to @required
2 parents 437106d + 2a7a55e commit cf5cadd

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Due to the way in which parameters are resolved, you cannot use them
44
to build paths in imports dynamically. This means that something like
5-
the following doesn't work:
5+
**the following does not work:**
66

77
.. configuration-block::
88

configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Configuration Formats
5858
~~~~~~~~~~~~~~~~~~~~~
5959

6060
Unlike other frameworks, Symfony doesn't impose a specific format on you to
61-
configure your applications. Symfony lets you choose between YAML, XML and PHP
62-
and throughout the Symfony documentation, all configuration examples will be
61+
configure your applications, but lets you choose between YAML, XML and PHP.
62+
Throughout the Symfony documentation, all configuration examples will be
6363
shown in these three formats.
6464

6565
There isn't any practical difference between formats. In fact, Symfony

reference/constraints/Type.rst

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,22 +169,24 @@ This required option defines the type or collection of types allowed for the
169169
given value. Each type is either the FQCN (fully qualified class name) of some
170170
PHP class/interface or a valid PHP datatype (checked by PHP's ``is_()`` functions):
171171

172-
* :phpfunction:`array <is_array>`
173172
* :phpfunction:`bool <is_bool>`
174-
* :phpfunction:`callable <is_callable>`
175-
* :phpfunction:`float <is_float>`
176-
* :phpfunction:`double <is_double>`
173+
* :phpfunction:`boolean <is_bool>`
177174
* :phpfunction:`int <is_int>`
178-
* :phpfunction:`integer <is_integer>`
179-
* :phpfunction:`iterable <is_iterable>`
180-
* :phpfunction:`long <is_long>`
181-
* :phpfunction:`null <is_null>`
175+
* :phpfunction:`integer <is_int>`
176+
* :phpfunction:`long <is_int>`
177+
* :phpfunction:`float <is_float>`
178+
* :phpfunction:`double <is_float>`
179+
* :phpfunction:`real <is_float>`
182180
* :phpfunction:`numeric <is_numeric>`
181+
* :phpfunction:`string <is_string>`
182+
* :phpfunction:`scalar <is_scalar>`
183+
* :phpfunction:`array <is_array>`
184+
* :phpfunction:`iterable <is_iterable>`
185+
* :phpfunction:`countable <is_countable>`
186+
* :phpfunction:`callable <is_callable>`
183187
* :phpfunction:`object <is_object>`
184-
* :phpfunction:`real <is_real>`
185188
* :phpfunction:`resource <is_resource>`
186-
* :phpfunction:`scalar <is_scalar>`
187-
* :phpfunction:`string <is_string>`
189+
* :phpfunction:`null <is_null>`
188190

189191
Also, you can use ``ctype_*()`` functions from corresponding
190192
`built-in PHP extension`_. Consider `a list of ctype functions`_:

service_container/autowiring.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,11 +640,8 @@ Autowiring will automatically call *any* method with the ``#[Required]`` attribu
640640
above it, autowiring each argument. If you need to manually wire some of the arguments
641641
to a method, you can always explicitly :doc:`configure the method call </service_container/calls>`.
642642

643-
If your PHP version doesn't support attributes (they were introduced in PHP 8),
644-
you can use the ``@required`` annotation instead.
645-
646643
Despite property injection having some :ref:`drawbacks <property-injection>`,
647-
autowiring with ``#[Required]`` or ``@required`` can also be applied to public
644+
autowiring with ``#[Required]`` can also be applied to public
648645
typed properties:
649646

650647
.. configuration-block::

0 commit comments

Comments
 (0)