Merge branch '7.3'

sebastianbergmann · Aug 14, 2018 · 59d3ce6 · 59d3ce6
2 parents 5a70bc5 + bfd79a9
commit 59d3ce6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/ChangeLog-6.5.md b/ChangeLog-6.5.md
@@ -4,7 +4,8 @@ All notable changes of the PHPUnit 6.5 release series are documented in this fil
 
 ## [6.5.12] - 2018-MM-DD
 
-* Fixed [#3248](https://github.com/sebastianbergmann/phpunit/issues/3248): `phpunit.xsd` dictates element order where it should not
+* Fixed [#3248](https://github.com/sebastianbergmann/phpunit/issues/3248) and [#3233](https://github.com/sebastianbergmann/phpunit/issues/3233): `phpunit.xsd` dictates element order where it should not
+* Fixed [#3251](https://github.com/sebastianbergmann/phpunit/issues/3251): TeamCity result logger is missing test duration information
 
 ## [6.5.11] - 2018-08-07
 

diff --git a/ChangeLog-7.3.md b/ChangeLog-7.3.md
@@ -7,7 +7,7 @@ All notable changes of the PHPUnit 7.3 release series are documented in this fil
 ### Fixed
 
 * Fixed [#3219](https://github.com/sebastianbergmann/phpunit/issues/3219): `getMockFromWsdl()` generates invalid PHP code when WSDL filename contains special characters
-* Fixed [#3248](https://github.com/sebastianbergmann/phpunit/issues/3248): `phpunit.xsd` dictates element order where it should not
+* Fixed [#3248](https://github.com/sebastianbergmann/phpunit/issues/3248) and [#3233](https://github.com/sebastianbergmann/phpunit/issues/3233): `phpunit.xsd` dictates element order where it should not
 * Fixed [#3251](https://github.com/sebastianbergmann/phpunit/issues/3251): TeamCity result logger is missing test duration information
 
 ## [7.3.1] - 2018-08-07

diff --git a/phpunit.xsd b/phpunit.xsd
@@ -84,15 +84,17 @@
     </xs:complexType>
     <xs:group name="argumentsGroup">
         <xs:sequence>
-            <xs:element name="array" type="arrayType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="integer" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="string" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="double" type="xs:double" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="null" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="file" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="directory" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="boolean" type="xs:boolean" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="array" type="arrayType" />
+                <xs:element name="integer" type="xs:integer" />
+                <xs:element name="string" type="xs:string" />
+                <xs:element name="double" type="xs:double" />
+                <xs:element name="null" />
+                <xs:element name="object" type="objectType" />
+                <xs:element name="file" type="xs:anyURI" />
+                <xs:element name="directory" type="xs:anyURI" />
+                <xs:element name="boolean" type="xs:boolean" />
+            </xs:choice>
         </xs:sequence>
     </xs:group>
     <xs:group name="argumentChoice">