Skip to content

Commit baf8970

Browse files
mspirkovmspirkov
authored
Fix PHPUnit coverage report generation (#253)
* Fix PHPUnit coverage report generation * Update PHPUnit config * Fix CS * Fix CS
1 parent 7026403 commit baf8970

33 files changed

+10
-482
lines changed

‎phpunit.xml.dist‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<phpunit
43
bootstrap="vendor/autoload.php"
54
colors="true"
65
verbose="true"
76
convertDeprecationsToExceptions="false"
8-
forceCoversAnnotation="true"
97
>
8+
<coverage>
9+
<include>
10+
<directory suffix=".php">src</directory>
11+
</include>
12+
<report>
13+
<clover outputFile="build/logs/clover.xml" />
14+
<html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70" />
15+
</report>
16+
</coverage>
1017
<testsuites>
1118
<testsuite name="unit">
1219
<directory>./tests/unit/</directory>
1320
</testsuite>
1421
</testsuites>
15-
<filter>
16-
<whitelist>
17-
<directory suffix=".php">src</directory>
18-
</whitelist>
19-
</filter>
2022
<logging>
21-
<log type="coverage-html"
22-
target="build/coverage"
23-
lowUpperBound="35"
24-
highLowerBound="70" />
25-
<log type="coverage-clover" target="build/logs/clover.xml"/>
26-
<log type="junit" target="build/logs/junit.xml"/>
23+
<junit outputFile="build/logs/junit.xml" />
2724
</logging>
2825
</phpunit>

‎tests/unit/CollectionResolverTest.php‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,13 @@
2727
use PHPUnit\Framework\TestCase;
2828
use RuntimeException;
2929

30-
/**
31-
* @coversDefaultClass \phpDocumentor\Reflection\TypeResolver
32-
*/
3330
class CollectionResolverTest extends TestCase
3431
{
3532
/**
3633
* @uses \phpDocumentor\Reflection\Types\Context
3734
* @uses \phpDocumentor\Reflection\Types\Compound
3835
* @uses \phpDocumentor\Reflection\PseudoTypes\Generic
3936
* @uses \phpDocumentor\Reflection\Types\String_
40-
*
41-
* @covers ::resolve
42-
* @covers ::createType
43-
* @covers ::__construct
4437
*/
4538
public function testResolvingCollection(): void
4639
{
@@ -59,10 +52,6 @@ public function testResolvingCollection(): void
5952
* @uses \phpDocumentor\Reflection\Types\Compound
6053
* @uses \phpDocumentor\Reflection\PseudoTypes\Generic
6154
* @uses \phpDocumentor\Reflection\Types\String_
62-
*
63-
* @covers ::__construct
64-
* @covers ::resolve
65-
* @covers ::createType
6655
*/
6756
public function testResolvingCollectionWithKeyType(): void
6857
{
@@ -86,10 +75,6 @@ public function testResolvingCollectionWithKeyType(): void
8675
* @uses \phpDocumentor\Reflection\Types\Context
8776
* @uses \phpDocumentor\Reflection\Types\Compound
8877
* @uses \phpDocumentor\Reflection\Types\String_
89-
*
90-
* @covers ::__construct
91-
* @covers ::resolve
92-
* @covers ::createType
9378
*/
9479
public function testResolvingArrayCollection(): void
9580
{
@@ -112,10 +97,6 @@ public function testResolvingArrayCollection(): void
11297
* @uses \phpDocumentor\Reflection\Types\Context
11398
* @uses \phpDocumentor\Reflection\Types\Compound
11499
* @uses \phpDocumentor\Reflection\Types\String_
115-
*
116-
* @covers ::__construct
117-
* @covers ::resolve
118-
* @covers ::createType
119100
*/
120101
public function testResolvingArrayCollectionWithKey(): void
121102
{
@@ -138,10 +119,6 @@ public function testResolvingArrayCollectionWithKey(): void
138119
* @uses \phpDocumentor\Reflection\Types\Context
139120
* @uses \phpDocumentor\Reflection\Types\Compound
140121
* @uses \phpDocumentor\Reflection\Types\String_
141-
142-
* @covers ::__construct
143-
* @covers ::resolve
144-
* @covers ::createType
145122
*/
146123
public function testResolvingArrayCollectionWithKeyAndWhitespace(): void
147124
{
@@ -165,10 +142,6 @@ public function testResolvingArrayCollectionWithKeyAndWhitespace(): void
165142
* @uses \phpDocumentor\Reflection\Types\Compound
166143
* @uses \phpDocumentor\Reflection\PseudoTypes\Generic
167144
* @uses \phpDocumentor\Reflection\Types\String_
168-
*
169-
* @covers ::__construct
170-
* @covers ::resolve
171-
* @covers ::createType
172145
*/
173146
public function testResolvingCollectionOfCollection(): void
174147
{
@@ -194,11 +167,6 @@ public function testResolvingCollectionOfCollection(): void
194167
$this->assertEquals(new Object_(new Fqsen('\\DateTime')), $nestedGenericTypes[0]);
195168
}
196169

197-
/**
198-
* @covers ::__construct
199-
* @covers ::resolve
200-
* @covers ::createType
201-
*/
202170
public function testGoodArrayCollectionKey(): void
203171
{
204172
$fixture = new TypeResolver();
@@ -214,11 +182,6 @@ public function testGoodArrayCollectionKey(): void
214182
$this->assertSame('array<class-string,string>', (string) $resolvedType);
215183
}
216184

217-
/**
218-
* @covers ::__construct
219-
* @covers ::resolve
220-
* @covers ::createType
221-
*/
222185
public function testMissingStartCollection(): void
223186
{
224187
$this->expectException(RuntimeException::class);
@@ -227,11 +190,6 @@ public function testMissingStartCollection(): void
227190
$fixture->resolve('<string>', new Context(''));
228191
}
229192

230-
/**
231-
* @covers ::__construct
232-
* @covers ::resolve
233-
* @covers ::createType
234-
*/
235193
public function testMissingEndCollection(): void
236194
{
237195
$this->expectException(RuntimeException::class);
@@ -240,11 +198,6 @@ public function testMissingEndCollection(): void
240198
$fixture->resolve('ArrayObject<object|string', new Context(''));
241199
}
242200

243-
/**
244-
* @covers ::__construct
245-
* @covers ::resolve
246-
* @covers ::createType
247-
*/
248201
public function testBadCollectionClass(): void
249202
{
250203
$this->expectException(RuntimeException::class);
@@ -257,10 +210,6 @@ public function testBadCollectionClass(): void
257210
* @uses \phpDocumentor\Reflection\Types\Context
258211
* @uses \phpDocumentor\Reflection\Types\Compound
259212
* @uses \phpDocumentor\Reflection\Types\String_
260-
*
261-
* @covers ::__construct
262-
* @covers ::resolve
263-
* @covers ::createType
264213
*/
265214
public function testResolvingCollectionAsArray(): void
266215
{
@@ -282,10 +231,6 @@ public function testResolvingCollectionAsArray(): void
282231
/**
283232
* @uses \phpDocumentor\Reflection\Types\Context
284233
* @uses \phpDocumentor\Reflection\Types\String_
285-
*
286-
* @covers ::__construct
287-
* @covers ::resolve
288-
* @covers ::createType
289234
*/
290235
public function testResolvingList(): void
291236
{
@@ -307,10 +252,6 @@ public function testResolvingList(): void
307252
/**
308253
* @uses \phpDocumentor\Reflection\Types\Context
309254
* @uses \phpDocumentor\Reflection\Types\String_
310-
*
311-
* @covers ::__construct
312-
* @covers ::resolve
313-
* @covers ::createType
314255
*/
315256
public function testResolvingNonEmptyList(): void
316257
{
@@ -332,10 +273,6 @@ public function testResolvingNonEmptyList(): void
332273
/**
333274
* @uses \phpDocumentor\Reflection\Types\Context
334275
* @uses \phpDocumentor\Reflection\Types\Nullable
335-
*
336-
* @covers ::__construct
337-
* @covers ::resolve
338-
* @covers ::createType
339276
*/
340277
public function testResolvingNullableArray(): void
341278
{

‎tests/unit/FqsenResolverTest.php‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,8 @@
1717
use phpDocumentor\Reflection\Types\Context;
1818
use PHPUnit\Framework\TestCase;
1919

20-
/**
21-
* @coversDefaultClass \phpDocumentor\Reflection\FqsenResolver
22-
*/
2320
final class FqsenResolverTest extends TestCase
2421
{
25-
/**
26-
* @covers ::resolve
27-
*/
2822
public function testResolveFqsen(): void
2923
{
3024
$fqsenResolver = new FqsenResolver();
@@ -35,9 +29,6 @@ public function testResolveFqsen(): void
3529
static::assertSame('\DocBlock', (string) $result);
3630
}
3731

38-
/**
39-
* @covers ::resolve
40-
*/
4132
public function testResolveFqsenWithEmoji(): void
4233
{
4334
$fqsenResolver = new FqsenResolver();
@@ -48,9 +39,6 @@ public function testResolveFqsenWithEmoji(): void
4839
static::assertSame('\My😁DocBlock', (string) $result);
4940
}
5041

51-
/**
52-
* @covers ::resolve
53-
*/
5442
public function testResolveWithoutContext(): void
5543
{
5644
$fqsenResolver = new FqsenResolver();
@@ -59,9 +47,6 @@ public function testResolveWithoutContext(): void
5947
static::assertSame('\DocBlock', (string) $result);
6048
}
6149

62-
/**
63-
* @covers ::resolve
64-
*/
6550
public function testResolveFromAlias(): void
6651
{
6752
$fqsenResolver = new FqsenResolver();
@@ -72,9 +57,6 @@ public function testResolveFromAlias(): void
7257
static::assertSame('\some\other\ns', (string) $result);
7358
}
7459

75-
/**
76-
* @covers ::resolve
77-
*/
7860
public function testResolveFromPartialAlias(): void
7961
{
8062
$fqsenResolver = new FqsenResolver();
@@ -85,9 +67,6 @@ public function testResolveFromPartialAlias(): void
8567
static::assertSame('\some\other\ns', (string) $result);
8668
}
8769

88-
/**
89-
* @covers ::resolve
90-
*/
9170
public function testResolveThrowsExceptionWhenGarbageInputIsPassed(): void
9271
{
9372
$this->expectException(InvalidArgumentException::class);

‎tests/unit/IntegerRangeResolverTest.php‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,12 @@
1818
use PHPUnit\Framework\TestCase;
1919
use RuntimeException;
2020

21-
/**
22-
* @coversDefaultClass \phpDocumentor\Reflection\TypeResolver
23-
*/
2421
class IntegerRangeResolverTest extends TestCase
2522
{
2623
/**
2724
* @uses \phpDocumentor\Reflection\Types\Context
2825
* @uses \phpDocumentor\Reflection\Types\Compound
2926
* @uses \phpDocumentor\Reflection\Types\String_
30-
*
31-
* @covers ::__construct
32-
* @covers ::resolve
33-
* @covers ::createType
3427
*/
3528
public function testResolvingIntRange(): void
3629
{
@@ -52,10 +45,6 @@ public function testResolvingIntRange(): void
5245
* @uses \phpDocumentor\Reflection\Types\Context
5346
* @uses \phpDocumentor\Reflection\Types\Compound
5447
* @uses \phpDocumentor\Reflection\Types\String_
55-
*
56-
* @covers ::__construct
57-
* @covers ::resolve
58-
* @covers ::createType
5948
*/
6049
public function testResolvingIntRangeWithKeywords(): void
6150
{
@@ -77,10 +66,6 @@ public function testResolvingIntRangeWithKeywords(): void
7766
* @uses \phpDocumentor\Reflection\Types\Context
7867
* @uses \phpDocumentor\Reflection\Types\Compound
7968
* @uses \phpDocumentor\Reflection\Types\String_
80-
*
81-
* @covers ::__construct
82-
* @covers ::resolve
83-
* @covers ::createType
8469
*/
8570
public function testResolvingIntRangeErrorMissingMaxValue(): void
8671
{
@@ -95,10 +80,6 @@ public function testResolvingIntRangeErrorMissingMaxValue(): void
9580
* @uses \phpDocumentor\Reflection\Types\Context
9681
* @uses \phpDocumentor\Reflection\Types\Compound
9782
* @uses \phpDocumentor\Reflection\Types\String_
98-
*
99-
* @covers ::__construct
100-
* @covers ::resolve
101-
* @covers ::createType
10283
*/
10384
public function testResolvingIntRangeErrorMisingMinValue(): void
10485
{
@@ -113,10 +94,6 @@ public function testResolvingIntRangeErrorMisingMinValue(): void
11394
* @uses \phpDocumentor\Reflection\Types\Context
11495
* @uses \phpDocumentor\Reflection\Types\Compound
11596
* @uses \phpDocumentor\Reflection\Types\String_
116-
*
117-
* @covers ::__construct
118-
* @covers ::resolve
119-
* @covers ::createType
12097
*/
12198
public function testResolvingIntRangeErrorMisingComma(): void
12299
{
@@ -131,10 +108,6 @@ public function testResolvingIntRangeErrorMisingComma(): void
131108
* @uses \phpDocumentor\Reflection\Types\Context
132109
* @uses \phpDocumentor\Reflection\Types\Compound
133110
* @uses \phpDocumentor\Reflection\Types\String_
134-
*
135-
* @covers ::__construct
136-
* @covers ::resolve
137-
* @covers ::createType
138111
*/
139112
public function testResolvingIntRangeErrorMissingEnd(): void
140113
{

‎tests/unit/NumericResolverTest.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,12 @@
2020
use phpDocumentor\Reflection\Types\String_;
2121
use PHPUnit\Framework\TestCase;
2222

23-
/**
24-
* @coversDefaultClass \phpDocumentor\Reflection\TypeResolver
25-
*/
2623
class NumericResolverTest extends TestCase
2724
{
2825
/**
2926
* @uses \phpDocumentor\Reflection\Types\Context
3027
* @uses \phpDocumentor\Reflection\Types\Compound
3128
* @uses \phpDocumentor\Reflection\Types\String_
32-
*
33-
* @covers ::__construct
3429
*/
3530
public function testResolvingIntRange(): void
3631
{

‎tests/unit/PseudoTypes/ArrayKeyTest.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,15 @@
1717
use phpDocumentor\Reflection\Types\String_;
1818
use PHPUnit\Framework\TestCase;
1919

20-
/**
21-
* @coversDefaultClass \phpDocumentor\Reflection\PseudoTypes\ArrayKey
22-
*/
2320
final class ArrayKeyTest extends TestCase
2421
{
25-
/**
26-
* @covers ::__construct
27-
* @covers ::__toString
28-
*/
2922
public function testArrayKeyCanBeConstructedAndStringifiedCorrectly(): void
3023
{
3124
$this->assertSame('array-key', (string) (new ArrayKey()));
3225
}
3326

3427
/**
3528
* @uses \phpDocumentor\Reflection\PseudoTypes\ArrayKey::__construct
36-
*
37-
* @covers ::getIterator
3829
*/
3930
public function testArrayKeyCanBeIterated(): void
4031
{

0 commit comments

Comments
 (0)