Skip to content

Commit 42f9a93

Browse files
pascalheidmannondrejmirtes
pascalheidmann
authored and
ondrejmirtes
committed
update phpunit.xml to adjust to changed keywords in phpunit 9.3+
1 parent 7375f6c commit 42f9a93

File tree

2 files changed

+102
-82
lines changed

2 files changed

+102
-82
lines changed

‎phpunit.xml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="tests/phpunit.xsd"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
44
bootstrap="tests/bootstrap-runtime-reflection.php"
55
cacheResult="false"
66
colors="true"
@@ -11,6 +11,16 @@
1111
beStrictAboutOutputDuringTests="true"
1212
beStrictAboutTodoAnnotatedTests="true"
1313
verbose="false">
14+
<coverage processUncoveredFiles="true">
15+
<include>
16+
<directory suffix=".php">src</directory>
17+
</include>
18+
<report>
19+
<clover outputFile="tests/tmp/clover.xml"/>
20+
<text outputFile="php://stdout" showUncoveredFiles="true" showOnlySummary="true"/>
21+
</report>
22+
</coverage>
23+
1424
<testsuites>
1525
<testsuite name="PHPStan">
1626
<directory suffix="Test.php">tests/PHPStan</directory>
@@ -22,16 +32,5 @@
2232
<group>exec</group>
2333
</exclude>
2434
</groups>
25-
26-
<filter>
27-
<whitelist processUncoveredFilesFromWhitelist="true">
28-
<directory suffix=".php">src</directory>
29-
</whitelist>
30-
</filter>
31-
32-
<logging>
33-
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true" showOnlySummary="true"/>
34-
<log type="coverage-clover" target="tests/tmp/clover.xml"/>
35-
</logging>
35+
<logging/>
3636
</phpunit>
37-

‎tests/phpunit.xsd

Lines changed: 90 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
33
<xs:annotation>
44
<xs:documentation source="https://phpunit.de/documentation.html">
5-
This Schema file defines the rules by which the XML configuration file of PHPUnit 7.5 may be structured.
5+
This Schema file defines the rules by which the XML configuration file of PHPUnit 9.5 may be structured.
66
</xs:documentation>
77
<xs:appinfo source="https://phpunit.de/documentation.html"/>
88
</xs:annotation>
@@ -11,30 +11,33 @@
1111
<xs:documentation>Root Element</xs:documentation>
1212
</xs:annotation>
1313
</xs:element>
14-
<xs:complexType name="filtersType">
15-
<xs:sequence>
16-
<xs:element name="whitelist" type="whiteListType" minOccurs="0"/>
17-
</xs:sequence>
18-
</xs:complexType>
19-
<xs:complexType name="filterType">
20-
<xs:sequence>
21-
<xs:choice maxOccurs="unbounded" minOccurs="0">
22-
<xs:group ref="pathGroup"/>
23-
<xs:element name="exclude">
24-
<xs:complexType>
25-
<xs:group ref="pathGroup"/>
26-
</xs:complexType>
27-
</xs:element>
28-
</xs:choice>
29-
</xs:sequence>
14+
<xs:complexType name="coverageType">
15+
<xs:all>
16+
<xs:element name="include" minOccurs="0" maxOccurs="1">
17+
<xs:complexType>
18+
<xs:group ref="pathGroup"/>
19+
</xs:complexType>
20+
</xs:element>
21+
<xs:element name="exclude" minOccurs="0" maxOccurs="1">
22+
<xs:complexType>
23+
<xs:group ref="pathGroup"/>
24+
</xs:complexType>
25+
</xs:element>
26+
<xs:element name="report" minOccurs="0" maxOccurs="1">
27+
<xs:complexType>
28+
<xs:group ref="coverageReportGroup"/>
29+
</xs:complexType>
30+
</xs:element>
31+
</xs:all>
32+
<xs:attribute name="cacheDirectory" type="xs:anyURI"/>
33+
<xs:attribute name="pathCoverage" type="xs:boolean" default="false"/>
34+
<xs:attribute name="includeUncoveredFiles" type="xs:boolean" default="true"/>
35+
<xs:attribute name="processUncoveredFiles" type="xs:boolean" default="false"/>
36+
<xs:attribute name="ignoreDeprecatedCodeUnits" type="xs:boolean" default="false"/>
37+
<xs:attribute name="disableCodeCoverageIgnore" type="xs:boolean" default="false"/>
3038
</xs:complexType>
31-
<xs:complexType name="whiteListType">
32-
<xs:complexContent>
33-
<xs:extension base="filterType">
34-
<xs:attribute name="addUncoveredFilesFromWhitelist" default="true" type="xs:boolean"/>
35-
<xs:attribute name="processUncoveredFilesFromWhitelist" default="false" type="xs:boolean"/>
36-
</xs:extension>
37-
</xs:complexContent>
39+
<xs:complexType name="loggingType">
40+
<xs:group ref="loggingGroup"/>
3841
</xs:complexType>
3942
<xs:complexType name="groupsType">
4043
<xs:choice>
@@ -122,39 +125,6 @@
122125
</xs:simpleType>
123126
</xs:union>
124127
</xs:simpleType>
125-
<xs:complexType name="loggersType">
126-
<xs:sequence>
127-
<xs:element name="log" type="loggerType" maxOccurs="unbounded"/>
128-
</xs:sequence>
129-
</xs:complexType>
130-
<xs:complexType name="loggerType">
131-
<xs:attribute name="type">
132-
<xs:simpleType>
133-
<xs:restriction base="xs:string">
134-
<xs:enumeration value="coverage-html"/>
135-
<xs:enumeration value="coverage-text"/>
136-
<xs:enumeration value="coverage-clover"/>
137-
<xs:enumeration value="coverage-crap4j"/>
138-
<xs:enumeration value="coverage-xml"/>
139-
<xs:enumeration value="coverage-php"/>
140-
<xs:enumeration value="json"/>
141-
<xs:enumeration value="plain"/>
142-
<xs:enumeration value="tap"/>
143-
<xs:enumeration value="teamcity"/>
144-
<xs:enumeration value="junit"/>
145-
<xs:enumeration value="testdox-html"/>
146-
<xs:enumeration value="testdox-text"/>
147-
<xs:enumeration value="testdox-xml"/>
148-
</xs:restriction>
149-
</xs:simpleType>
150-
</xs:attribute>
151-
<xs:attribute name="target" type="xs:anyURI"/>
152-
<xs:attribute name="lowUpperBound" type="xs:nonNegativeInteger" default="35"/>
153-
<xs:attribute name="highLowerBound" type="xs:nonNegativeInteger" default="70"/>
154-
<xs:attribute name="showUncoveredFiles" type="xs:boolean" default="false"/>
155-
<xs:attribute name="showOnlySummary" type="xs:boolean" default="false"/>
156-
<xs:attribute name="threshold" type="xs:nonNegativeInteger" default="30"/>
157-
</xs:complexType>
158128
<xs:group name="pathGroup">
159129
<xs:sequence>
160130
<xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -176,14 +146,22 @@
176146
<xs:restriction base="xs:string">
177147
<xs:enumeration value="default"/>
178148
<xs:enumeration value="defects"/>
179-
<xs:enumeration value="duration"/>
180149
<xs:enumeration value="depends"/>
181150
<xs:enumeration value="depends,defects"/>
182-
<xs:enumeration value="random"/>
183-
<xs:enumeration value="reverse"/>
151+
<xs:enumeration value="depends,duration"/>
184152
<xs:enumeration value="depends,random"/>
185153
<xs:enumeration value="depends,reverse"/>
186-
<xs:enumeration value="depends,duration"/>
154+
<xs:enumeration value="depends,size"/>
155+
<xs:enumeration value="duration"/>
156+
<xs:enumeration value="no-depends"/>
157+
<xs:enumeration value="no-depends,defects"/>
158+
<xs:enumeration value="no-depends,duration"/>
159+
<xs:enumeration value="no-depends,random"/>
160+
<xs:enumeration value="no-depends,reverse"/>
161+
<xs:enumeration value="no-depends,size"/>
162+
<xs:enumeration value="random"/>
163+
<xs:enumeration value="reverse"/>
164+
<xs:enumeration value="size"/>
187165
</xs:restriction>
188166
</xs:simpleType>
189167
<xs:complexType name="fileFilterType">
@@ -231,18 +209,16 @@
231209
<xs:attribute name="backupGlobals" type="xs:boolean" default="false"/>
232210
<xs:attribute name="backupStaticAttributes" type="xs:boolean" default="false"/>
233211
<xs:attribute name="bootstrap" type="xs:anyURI"/>
234-
<xs:attribute name="cacheResult" type="xs:boolean" default="false"/>
212+
<xs:attribute name="cacheResult" type="xs:boolean" default="true"/>
235213
<xs:attribute name="cacheResultFile" type="xs:anyURI"/>
236-
<xs:attribute name="cacheTokens" type="xs:boolean" default="false"/>
237214
<xs:attribute name="colors" type="xs:boolean" default="false"/>
238215
<xs:attribute name="columns" type="columnsType" default="80"/>
239216
<xs:attribute name="convertDeprecationsToExceptions" type="xs:boolean" default="true"/>
240217
<xs:attribute name="convertErrorsToExceptions" type="xs:boolean" default="true"/>
241218
<xs:attribute name="convertNoticesToExceptions" type="xs:boolean" default="true"/>
242219
<xs:attribute name="convertWarningsToExceptions" type="xs:boolean" default="true"/>
243-
<xs:attribute name="disableCodeCoverageIgnore" type="xs:boolean" default="false"/>
244220
<xs:attribute name="forceCoversAnnotation" type="xs:boolean" default="false"/>
245-
<xs:attribute name="printerClass" type="xs:string" default="PHPUnit\TextUI\ResultPrinter"/>
221+
<xs:attribute name="printerClass" type="xs:string" default="PHPUnit\TextUI\DefaultResultPrinter"/>
246222
<xs:attribute name="printerFile" type="xs:anyURI"/>
247223
<xs:attribute name="processIsolation" type="xs:boolean" default="false"/>
248224
<xs:attribute name="stopOnDefect" type="xs:boolean" default="false"/>
@@ -252,7 +228,10 @@
252228
<xs:attribute name="stopOnIncomplete" type="xs:boolean" default="false"/>
253229
<xs:attribute name="stopOnRisky" type="xs:boolean" default="false"/>
254230
<xs:attribute name="stopOnSkipped" type="xs:boolean" default="false"/>
231+
<xs:attribute name="failOnEmptyTestSuite" type="xs:boolean" default="false"/>
232+
<xs:attribute name="failOnIncomplete" type="xs:boolean" default="false"/>
255233
<xs:attribute name="failOnRisky" type="xs:boolean" default="false"/>
234+
<xs:attribute name="failOnSkipped" type="xs:boolean" default="false"/>
256235
<xs:attribute name="failOnWarning" type="xs:boolean" default="false"/>
257236
<xs:attribute name="beStrictAboutChangesToGlobalState" type="xs:boolean" default="false"/>
258237
<xs:attribute name="beStrictAboutOutputDuringTests" type="xs:boolean" default="false"/>
@@ -262,28 +241,29 @@
262241
<xs:attribute name="beStrictAboutCoversAnnotation" type="xs:boolean" default="false"/>
263242
<xs:attribute name="defaultTimeLimit" type="xs:integer" default="0"/>
264243
<xs:attribute name="enforceTimeLimit" type="xs:boolean" default="false"/>
265-
<xs:attribute name="ignoreDeprecatedCodeUnitsFromCodeCoverage" type="xs:boolean" default="false"/>
266244
<xs:attribute name="timeoutForSmallTests" type="xs:integer" default="1"/>
267245
<xs:attribute name="timeoutForMediumTests" type="xs:integer" default="10"/>
268246
<xs:attribute name="timeoutForLargeTests" type="xs:integer" default="60"/>
269247
<xs:attribute name="testSuiteLoaderClass" type="xs:string" default="PHPUnit\Runner\StandardTestSuiteLoader"/>
270248
<xs:attribute name="testSuiteLoaderFile" type="xs:anyURI"/>
271249
<xs:attribute name="defaultTestSuite" type="xs:string" default=""/>
272250
<xs:attribute name="verbose" type="xs:boolean" default="false"/>
251+
<xs:attribute name="testdox" type="xs:boolean" default="false"/>
273252
<xs:attribute name="stderr" type="xs:boolean" default="false"/>
274253
<xs:attribute name="reverseDefectList" type="xs:boolean" default="false"/>
275254
<xs:attribute name="registerMockObjectsFromTestArgumentsRecursively" type="xs:boolean" default="false"/>
276255
<xs:attribute name="extensionsDirectory" type="xs:string"/>
277256
<xs:attribute name="executionOrder" type="executionOrderType" default="default"/>
278-
<xs:attribute name="resolveDependencies" type="xs:boolean" default="false"/>
257+
<xs:attribute name="resolveDependencies" type="xs:boolean" default="true"/>
258+
<xs:attribute name="noInteraction" type="xs:boolean" default="false"/>
279259
</xs:attributeGroup>
280260
<xs:group name="configGroup">
281261
<xs:all>
282262
<xs:element ref="testSuiteFacet" minOccurs="0"/>
283263
<xs:element name="groups" type="groupsType" minOccurs="0"/>
284264
<xs:element name="testdoxGroups" type="groupsType" minOccurs="0"/>
285-
<xs:element name="filter" type="filtersType" minOccurs="0"/>
286-
<xs:element name="logging" type="loggersType" minOccurs="0"/>
265+
<xs:element name="coverage" type="coverageType" minOccurs="0"/>
266+
<xs:element name="logging" type="loggingType" minOccurs="0"/>
287267
<xs:element name="extensions" type="extensionsType" minOccurs="0"/>
288268
<xs:element name="listeners" type="listenersType" minOccurs="0"/>
289269
<xs:element name="php" type="phpType" minOccurs="0"/>
@@ -304,4 +284,45 @@
304284
</xs:sequence>
305285
<xs:attribute name="name" type="xs:string" use="required"/>
306286
</xs:complexType>
287+
<xs:group name="coverageReportGroup">
288+
<xs:all>
289+
<xs:element name="clover" type="logToFileType" minOccurs="0"/>
290+
<xs:element name="cobertura" type="logToFileType" minOccurs="0"/>
291+
<xs:element name="crap4j" type="coverageReportCrap4JType" minOccurs="0" />
292+
<xs:element name="html" type="coverageReportHtmlType" minOccurs="0" />
293+
<xs:element name="php" type="logToFileType" minOccurs="0" />
294+
<xs:element name="text" type="coverageReportTextType" minOccurs="0" />
295+
<xs:element name="xml" type="logToDirectoryType" minOccurs="0" />
296+
</xs:all>
297+
</xs:group>
298+
<xs:group name="loggingGroup">
299+
<xs:all>
300+
<xs:element name="junit" type="logToFileType" minOccurs="0" />
301+
<xs:element name="teamcity" type="logToFileType" minOccurs="0" />
302+
<xs:element name="testdoxHtml" type="logToFileType" minOccurs="0" />
303+
<xs:element name="testdoxText" type="logToFileType" minOccurs="0" />
304+
<xs:element name="testdoxXml" type="logToFileType" minOccurs="0" />
305+
<xs:element name="text" type="logToFileType" minOccurs="0"/>
306+
</xs:all>
307+
</xs:group>
308+
<xs:complexType name="logToFileType">
309+
<xs:attribute name="outputFile" type="xs:anyURI" use="required"/>
310+
</xs:complexType>
311+
<xs:complexType name="logToDirectoryType">
312+
<xs:attribute name="outputDirectory" type="xs:anyURI" use="required"/>
313+
</xs:complexType>
314+
<xs:complexType name="coverageReportCrap4JType">
315+
<xs:attribute name="outputFile" type="xs:anyURI" use="required"/>
316+
<xs:attribute name="threshold" type="xs:integer"/>
317+
</xs:complexType>
318+
<xs:complexType name="coverageReportHtmlType">
319+
<xs:attribute name="outputDirectory" type="xs:anyURI" use="required"/>
320+
<xs:attribute name="lowUpperBound" type="xs:integer" default="50"/>
321+
<xs:attribute name="highLowerBound" type="xs:integer" default="90"/>
322+
</xs:complexType>
323+
<xs:complexType name="coverageReportTextType">
324+
<xs:attribute name="outputFile" type="xs:anyURI" use="required"/>
325+
<xs:attribute name="showUncoveredFiles" type="xs:boolean" default="false"/>
326+
<xs:attribute name="showOnlySummary" type="xs:boolean" default="false"/>
327+
</xs:complexType>
307328
</xs:schema>

0 commit comments

Comments
 (0)