Skip to content

Commit d6366aa

Browse files
committed
Cleanup
1 parent 61e439e commit d6366aa

8 files changed

+3
-15
lines changed

SlevomatCodingStandard/Helpers/AnnotationHelper.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use PHPStan\PhpDocParser\Ast\NodeTraverser;
1010
use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineArgument;
1111
use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
12-
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
1312
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
1413
use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
1514
use PHPStan\PhpDocParser\Ast\PhpDoc\TypelessParamTagValueNode;
@@ -80,8 +79,9 @@ static function () use ($phpcsFile, $docCommentOpenPointer, $name): array {
8079
}
8180

8281
/**
83-
* @param class-string $type
84-
* @return list<Node>
82+
* @template T
83+
* @param class-string<T> $type
84+
* @return list<T>
8585
*/
8686
public static function getAnnotationNodesByType(Node $node, string $type): array
8787
{
@@ -166,7 +166,6 @@ public static function fixAnnotation(
166166
{
167167
$originalNode = $annotation->getNode();
168168

169-
/** @var PhpDocNode $newPhpDocNode */
170169
$newPhpDocNode = PhpDocParserHelper::cloneNode($parsedDocComment->getNode());
171170

172171
foreach ($newPhpDocNode->getTags() as $node) {

SlevomatCodingStandard/Sniffs/Namespaces/FullyQualifiedClassNameInAnnotationSniff.php

-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
4848
$this->ignoredAnnotationNames = SniffSettingsHelper::normalizeArray($this->ignoredAnnotationNames);
4949

5050
foreach ($annotations as $annotation) {
51-
/** @var list<IdentifierTypeNode> $identifierTypeNodes */
5251
$identifierTypeNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), IdentifierTypeNode::class);
5352

5453
$annotationName = $annotation->getName();
@@ -106,7 +105,6 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
106105
$phpcsFile->fixer->endChangeset();
107106
}
108107

109-
/** @var list<ConstFetchNode> $constantFetchNodes */
110108
$constantFetchNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), ConstFetchNode::class);
111109

112110
foreach ($constantFetchNodes as $constantFetchNode) {

SlevomatCodingStandard/Sniffs/Namespaces/ReferenceUsedNamesOnlySniff.php

-2
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,6 @@ private function getReferences(File $phpcsFile, int $openTagPointer): array
716716
$annotations = AnnotationHelper::getAnnotations($phpcsFile, $docCommentOpenPointer);
717717

718718
foreach ($annotations as $annotation) {
719-
/** @var list<IdentifierTypeNode> $identifierTypeNodes */
720719
$identifierTypeNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), IdentifierTypeNode::class);
721720

722721
foreach ($identifierTypeNodes as $typeHintNode) {
@@ -747,7 +746,6 @@ private function getReferences(File $phpcsFile, int $openTagPointer): array
747746
$references[] = $reference;
748747
}
749748

750-
/** @var list<ConstFetchNode> $constantFetchNodes */
751749
$constantFetchNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), ConstFetchNode::class);
752750

753751
foreach ($constantFetchNodes as $constantFetchNode) {

SlevomatCodingStandard/Sniffs/Namespaces/UnusedUsesSniff.php

-3
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,14 @@ public function process(File $phpcsFile, $openTagPointer): void
159159
$contentsToCheck[] = $annotation->getName();
160160
$contentsToCheck[] = $annotation->getValue()->value;
161161
} else {
162-
/** @var list<IdentifierTypeNode> $identifierTypeNodes */
163162
$identifierTypeNodes = AnnotationHelper::getAnnotationNodesByType(
164163
$annotation->getNode(),
165164
IdentifierTypeNode::class,
166165
);
167-
/** @var list<DoctrineAnnotation> $doctrineAnnotations */
168166
$doctrineAnnotations = AnnotationHelper::getAnnotationNodesByType(
169167
$annotation->getNode(),
170168
DoctrineAnnotation::class,
171169
);
172-
/** @var list<ConstFetchNode> $constFetchNodes */
173170
$constFetchNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), ConstFetchNode::class);
174171

175172
$contentsToCheck = array_filter(array_merge(

SlevomatCodingStandard/Sniffs/TypeHints/DisallowArrayTypeHintSyntaxSniff.php

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
8181

8282
$parsedDocComment = DocCommentHelper::parseDocComment($phpcsFile, $docCommentOpenPointer);
8383

84-
/** @var list<UnionTypeNode> $unionTypeNodes */
8584
$unionTypeNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), UnionTypeNode::class);
8685

8786
$unionTypeNode = $this->findUnionTypeThatContainsArrayType($arrayTypeNode, $unionTypeNodes);

SlevomatCodingStandard/Sniffs/TypeHints/DisallowMixedTypeHintSniff.php

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
5555
$annotations = AnnotationHelper::getAnnotations($phpcsFile, $docCommentOpenPointer);
5656

5757
foreach ($annotations as $annotation) {
58-
/** @var list<IdentifierTypeNode> $identifierTypeNodes */
5958
$identifierTypeNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), IdentifierTypeNode::class);
6059

6160
foreach ($identifierTypeNodes as $typeHintNode) {

SlevomatCodingStandard/Sniffs/TypeHints/LongTypeHintsSniff.php

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
3636
$annotations = AnnotationHelper::getAnnotations($phpcsFile, $docCommentOpenPointer);
3737

3838
foreach ($annotations as $annotation) {
39-
/** @var list<IdentifierTypeNode> $identifierTypeNodes */
4039
$identifierTypeNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), IdentifierTypeNode::class);
4140

4241
foreach ($identifierTypeNodes as $typeHintNode) {

SlevomatCodingStandard/Sniffs/TypeHints/NullTypeHintOnLastPositionSniff.php

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
4040
$annotations = AnnotationHelper::getAnnotations($phpcsFile, $docCommentOpenPointer);
4141

4242
foreach ($annotations as $annotation) {
43-
/** @var list<UnionTypeNode> $unionTypeNodes */
4443
$unionTypeNodes = AnnotationHelper::getAnnotationNodesByType($annotation->getNode(), UnionTypeNode::class);
4544

4645
foreach ($unionTypeNodes as $unionTypeNode) {

0 commit comments

Comments
 (0)