Cleanup

Author: kukulich

SlevomatCodingStandard/Helpers/AttributeHelper.php

@@ -4,6 +4,8 @@
 
 use InvalidArgumentException;
 use PHP_CodeSniffer\Files\File;
+use function array_map;
+use function in_array;
 use function sprintf;
 use const T_ANON_CLASS;
 use const T_ATTRIBUTE;
@@ -40,6 +42,23 @@ class AttributeHelper
 		T_VARIABLE,
 	];
 
+	public static function hasAttribute(File $phpcsFile, int $docCommentOpenPointer, string $attributeName): bool
+	{
+		$tokens = $phpcsFile->getTokens();
+		$nextPointer = TokenHelper::findNextEffective($phpcsFile, $docCommentOpenPointer + 1);
+
+		if ($nextPointer === null || $tokens[$nextPointer]['code'] !== T_ATTRIBUTE) {
+			return false;
+		}
+
+		$attributeNames = array_map(
+			static fn (Attribute $name): string => $name->getFullyQualifiedName(),
+			self::getAttributes($phpcsFile, $nextPointer),
+		);
+
+		return in_array($attributeName, $attributeNames, true);
+	}
+
 	/**
 	 * @return list<Attribute>
 	 */

SlevomatCodingStandard/Sniffs/TypeHints/DisallowMixedTypeHintSniff.php

@@ -6,15 +6,10 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use SlevomatCodingStandard\Helpers\AnnotationHelper;
-use SlevomatCodingStandard\Helpers\Attribute;
 use SlevomatCodingStandard\Helpers\AttributeHelper;
 use SlevomatCodingStandard\Helpers\SuppressHelper;
-use SlevomatCodingStandard\Helpers\TokenHelper;
-use function array_map;
-use function in_array;
 use function sprintf;
 use function strtolower;
-use const T_ATTRIBUTE;
 use const T_DOC_COMMENT_OPEN_TAG;
 
 class DisallowMixedTypeHintSniff implements Sniff
@@ -48,7 +43,7 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
 			return;
 		}
 
-		if ($this->targetHasOverrideAttribute($phpcsFile, $docCommentOpenPointer)) {
+		if (AttributeHelper::hasAttribute($phpcsFile, $docCommentOpenPointer, '\Override')) {
 			return;
 		}
 
@@ -78,21 +73,4 @@ private function getSniffName(string $sniffName): string
 		return sprintf('%s.%s', self::NAME, $sniffName);
 	}
 
-	private function targetHasOverrideAttribute(File $phpcsFile, int $docCommentOpenPointer): bool
-	{
-		$tokens = $phpcsFile->getTokens();
-		$nextPointer = TokenHelper::findNextEffective($phpcsFile, $docCommentOpenPointer + 1);
-
-		if ($nextPointer === null || $tokens[$nextPointer]['code'] !== T_ATTRIBUTE) {
-			return false;
-		}
-
-		$attributeNames = array_map(
-			static fn (Attribute $name): string => $name->getFullyQualifiedName(),
-			AttributeHelper::getAttributes($phpcsFile, $nextPointer),
-		);
-
-		return in_array('\Override', $attributeNames, true);
-	}
-
 }