Skip to content

Commit 4ee59d5

Browse files
Merge branch '5.0' into 5.1
* 5.0: minor #37141 [Messenger] fix forward compatibility with Doctrine DBAL 2.11+ (xabbuh) fix forward compatibility with Doctrine DBAL 3 [WebProfilerBundle] Set NullLogger for functional tests [Mailer] Fixed generator bug when creating multiple transports using Transport::fromDsn [FrameworkBundle] Fix XSD definition Update welcome.html.php [travis] add nightly to allowed failures
2 parents c4bf4ba + 14d7e55 commit 4ee59d5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Resources/config/schema/symfony-1.0.xsd

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

568568
<xsd:complexType name="mailer_envelope">
569569
<xsd:sequence>
570-
<xsd:element name="sender" type="xsd:string" />
570+
<xsd:element name="sender" type="xsd:string" minOccurs="0" maxOccurs="1" />
571571
<xsd:element name="recipients" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
572572
</xsd:sequence>
573573
</xsd:complexType>

0 commit comments

Comments
 (0)