Commit c86e460

mad-brillerondrejmirtes

authored and

committed

Fix covers rule for functions.

1 parent e431a6c commit c86e460Copy full SHA for c86e460

File tree

3 files changed

+25

-5

lines changed

src/Rules/PHPUnit
- CoversHelper.php
tests/Rules/PHPUnit
- ClassMethodCoversExistsRuleTest.php
- data
  - class-coverage.php

3 files changed

+25

-5

lines changed

`‎src/Rules/PHPUnit/CoversHelper.php‎`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace PHPStan\Rules\PHPUnit;`
`4`	`4`
`5`	`5`	`use PhpParser\Node;`
	`6`	`+use PhpParser\Node\Name;`
`6`	`7`	`use PHPStan\PhpDoc\ResolvedPhpDocBlock;`
`7`	`8`	`use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;`
`8`	`9`	`use PHPStan\Reflection\ReflectionProvider;`
`@@ -70,8 +71,9 @@ public function processCovers(`
`70`	`71`	`{`
`71`	`72`	`$errors = [];`
`72`	`73`	`$covers = (string) $phpDocTag->value;`
	`74`	`+ $isMethod = strpos($covers, '::') !== false;`
`73`	`75`
`74`		`- if (strpos($covers, '::') !== false) {`
	`76`	`+ if ($isMethod) {`
`75`	`77`	`[$className, $method] = explode('::', $covers);`
`76`	`78`	`} else {`
`77`	`79`	`$className = $covers;`
`@@ -83,16 +85,22 @@ public function processCovers(`
`83`	`85`
`84`	`86`	`if ($this->reflectionProvider->hasClass($className)) {`
`85`	`87`	`$class = $this->reflectionProvider->getClass($className);`
	`88`	`+`
`86`	`89`	`if (isset($method) && $method !== '' && !$class->hasMethod($method)) {`
`87`	`90`	`$errors[] = RuleErrorBuilder::message(sprintf(`
`88`	`91`	`'@covers value %s references an invalid method.',`
`89`	`92`	`$covers`
`90`	`93`	`))->build();`
`91`	`94`	`}`
`92`	`95`	`} else {`
	`96`	`+ if (!isset($method) && $this->reflectionProvider->hasFunction(new Name($covers, []), null)) {`
	`97`	`+ return $errors;`
	`98`	`+ }`
	`99`	`+`
`93`	`100`	`$errors[] = RuleErrorBuilder::message(sprintf(`
`94`		`- '@covers value %s references an invalid class.',`
`95`		`- $covers`
	`101`	`+ '@covers value %s references an invalid %s.',`
	`102`	`+ $covers,`
	`103`	`+ $isMethod ? 'method' : 'class or function'`
`96`	`104`	`))->build();`
`97`	`105`	`}`
`98`	`106`	`return $errors;`

`‎tests/Rules/PHPUnit/ClassMethodCoversExistsRuleTest.php‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ public function testRule(): void`
`26`	`26`	`{`
`27`	`27`	`$this->analyse([__DIR__ . '/data/method-coverage.php'], [`
`28`	`28`	`[`
`29`		`- '@covers value ::ignoreThis references an invalid class.',`
	`29`	`+ '@covers value ::ignoreThis references an invalid method.',`
`30`	`30`	`14,`
`31`	`31`	`],`
`32`	`32`	`[`
`33`	`33`	`'@covers value \PHPUnit\Framework\TestCase::assertNotReal references an invalid method.',`
`34`	`34`	`28,`
`35`	`35`	`],`
`36`	`36`	`[`
`37`		`- '@covers value \Not\A\Class::foo references an invalid class.',`
	`37`	`+ '@covers value \Not\A\Class::foo references an invalid method.',`
`38`	`38`	`35,`
`39`	`39`	`],`
`40`	`40`	`[`

`‎tests/Rules/PHPUnit/data/class-coverage.php‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,3 +23,15 @@ class CoversShouldExistTestCase2 extends \PHPUnit\Framework\TestCase`
`23`	`23`	`class MultipleCoversDefaultClass extends \PHPUnit\Framework\TestCase`
`24`	`24`	`{`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+/**`
	`28`	`+ * @covers \ClassCoverage\testable`
	`29`	`+ */`
	`30`	`+class CoversFunction extends \PHPUnit\Framework\TestCase`
	`31`	`+{`
	`32`	`+}`
	`33`	`+`
	`34`	`+function testable(): void`
	`35`	`+{`
	`36`	`+`
	`37`	`+}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit c86e460

File tree

3 files changed

3 files changed

`‎src/Rules/PHPUnit/CoversHelper.php‎`

`‎tests/Rules/PHPUnit/ClassMethodCoversExistsRuleTest.php‎`

`‎tests/Rules/PHPUnit/data/class-coverage.php‎`

0 commit comments