Commit 8e11b1a

committed

Make sure AssertFunctionTypeSpecifyingExtension works with namespaced functions

1 parent 151d71b commit 8e11b1aCopy full SHA for 8e11b1a

File tree

+68

-2

lines changed

+68

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function isFunctionSupported(`
`29`	`29`	`): bool`
`30`	`30`	`{`
`31`	`31`	`return AssertTypeSpecifyingExtensionHelper::isSupported(`
`32`		`- $functionReflection->getName(),`
	`32`	`+ $this->trimName($functionReflection->getName()),`
`33`	`33`	`$node->args`
`34`	`34`	`);`
`35`	`35`	`}`
`@@ -44,9 +44,19 @@ public function specifyTypes(`
`44`	`44`	`return AssertTypeSpecifyingExtensionHelper::specifyTypes(`
`45`	`45`	`$this->typeSpecifier,`
`46`	`46`	`$scope,`
`47`		`- $functionReflection->getName(),`
	`47`	`+ $this->trimName($functionReflection->getName()),`
`48`	`48`	`$node->args`
`49`	`49`	`);`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ private function trimName(string $functionName): string`
	`53`	`+ {`
	`54`	`+ $prefix = 'PHPUnit\\Framework\\';`
	`55`	`+ if (strpos($functionName, $prefix) === 0) {`
	`56`	`+ return substr($functionName, strlen($prefix));`
	`57`	`+ }`
	`58`	`+`
	`59`	`+ return $functionName;`
	`60`	`+ }`
	`61`	`+`
`52`	`62`	`}`

Lines changed: 36 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,36 @@`
	`1`	`+<?php declare(strict_types = 1);`
	`2`	`+`
	`3`	`+namespace PHPStan\Type\PHPUnit;`
	`4`	`+`
	`5`	`+use PHPStan\Testing\TypeInferenceTestCase;`
	`6`	`+`
	`7`	`+class AssertFunctionTypeSpecifyingExtensionTest extends TypeInferenceTestCase`
	`8`	`+{`
	`9`	`+`
	`10`	`+ /** @return mixed[] */`
	`11`	`+ public function dataFileAsserts(): iterable`
	`12`	`+ {`
	`13`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-function.php');`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ /**`
	`17`	`+ * @dataProvider dataFileAsserts`
	`18`	`+ * @param string $assertType`
	`19`	`+ * @param string $file`
	`20`	`+ * @param mixed ...$args`
	`21`	`+ */`
	`22`	`+ public function testFileAsserts(`
	`23`	`+ string $assertType,`
	`24`	`+ string $file,`
	`25`	`+ ...$args`
	`26`	`+ ): void`
	`27`	`+ {`
	`28`	`+ $this->assertFileAsserts($assertType, $file, ...$args);`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ public static function getAdditionalConfigFiles(): array`
	`32`	`+ {`
	`33`	`+ return [__DIR__ . '/../../../extension.neon'];`
	`34`	`+ }`
	`35`	`+`
	`36`	`+}`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+namespace AssertFunction;`
	`4`	`+`
	`5`	`+use function PHPStan\Testing\assertType;`
	`6`	`+use function PHPUnit\Framework\assertInstanceOf;`
	`7`	`+`
	`8`	`+class Foo`
	`9`	`+{`
	`10`	`+`
	`11`	`+ /**`
	`12`	`+ * @param object $o`
	`13`	`+ */`
	`14`	`+ public function doFoo($o): void`
	`15`	`+ {`
	`16`	`+ assertInstanceOf(self::class, $o);`
	`17`	`+ assertType(self::class, $o);`
	`18`	`+ }`
	`19`	`+`
	`20`	`+}`

Comments

(0)