Skip to content

Commit 082eea1

Browse files
Merge branch '5.0' into 5.1
* 5.0: Fix test that fails on old distros Fix: compatibility with phpunit 9.3 [DoctrineBridge] work around Connection::ping() deprecation [MimeType] Duplicated MimeType due to PHP Bug [DI] fix parsing of argument type=binary in xml fix guessing form types for DateTime types fix handling typed properties as constraint options Fix the 'supports' method argument type of the security voter Use the driverConnection executeUpdate method
2 parents 37d0137 + b840f53 commit 082eea1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Loader/schema/dic/services/services-1.0.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@
289289
<xsd:enumeration value="expression" />
290290
<xsd:enumeration value="string" />
291291
<xsd:enumeration value="constant" />
292+
<xsd:enumeration value="binary" />
292293
<xsd:enumeration value="iterator" />
293294
<xsd:enumeration value="service_locator" />
294295
<!-- "tagged" is an alias of "tagged_iterator", using "tagged_iterator" is preferred. -->

0 commit comments

Comments
 (0)