Reserve @use for generic traits instead of @uses (which already has m…

…eaning in PHP projects)
phpstan · Dec 5, 2019 · 0331e88 · 0331e88
1 parent 51a9bf6
commit 0331e88
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/Ast/PhpDoc/PhpDocNode.php b/src/Ast/PhpDoc/PhpDocNode.php
@@ -115,7 +115,7 @@ public function getImplementsTagValues(string $tagName = '@implements'): array
 	/**
 	 * @return UsesTagValueNode[]
 	 */
-	public function getUsesTagValues(string $tagName = '@uses'): array
+	public function getUsesTagValues(string $tagName = '@use'): array
 	{
 		return array_column(
 			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {

diff --git a/src/Parser/PhpDocParser.php b/src/Parser/PhpDocParser.php
@@ -179,10 +179,10 @@ public function parseTagValue(TokenIterator $tokens, string $tag): Ast\PhpDoc\Ph
 					$tagValue = $this->parseExtendsTagValue('@implements', $tokens);
 					break;
 
-				case '@uses':
-				case '@phpstan-uses':
+				case '@use':
+				case '@phpstan-use':
 				case '@template-use':
-					$tagValue = $this->parseExtendsTagValue('@uses', $tokens);
+					$tagValue = $this->parseExtendsTagValue('@use', $tokens);
 					break;
 
 				default:
@@ -346,7 +346,7 @@ private function parseExtendsTagValue(string $tagName, TokenIterator $tokens): A
 				return new Ast\PhpDoc\ExtendsTagValueNode($type, $description);
 			case '@implements':
 				return new Ast\PhpDoc\ImplementsTagValueNode($type, $description);
-			case '@uses':
+			case '@use':
 				return new Ast\PhpDoc\UsesTagValueNode($type, $description);
 		}
 

diff --git a/tests/PHPStan/Parser/PhpDocParserTest.php b/tests/PHPStan/Parser/PhpDocParserTest.php
@@ -2480,11 +2480,11 @@ public function provideExtendsTagsData(): \Iterator
 		];
 
 		yield [
-			'OK @uses',
-			'/** @uses Foo<A,B> */',
+			'OK @use',
+			'/** @use Foo<A,B> */',
 			new PhpDocNode([
 				new PhpDocTagNode(
-					'@uses',
+					'@use',
 					new UsesTagValueNode(
 						new GenericTypeNode(
 							new IdentifierTypeNode('Foo'),