@phpcsSuppress can be with comment

Author: kukulich

SlevomatCodingStandard/Helpers/SuppressHelper.php

@@ -6,6 +6,7 @@
 use SlevomatCodingStandard\Helpers\Annotation\Annotation;
 use function array_reduce;
 use function assert;
+use function explode;
 use function sprintf;
 use function strpos;
 use const T_DOC_COMMENT_CLOSE_TAG;
@@ -24,9 +25,15 @@ public static function isSniffSuppressed(File $phpcsFile, int $pointer, string $
 		return array_reduce(
 			AnnotationHelper::getAnnotationsByName($phpcsFile, $pointer, self::ANNOTATION),
 			static function (bool $carry, Annotation $annotation) use ($suppressName): bool {
+				if ($annotation->getContent() === null) {
+					return $carry;
+				}
+
+				$annotationSuppressName = explode(' ', $annotation->getContent())[0];
+
 				if (
-					$annotation->getContent() === $suppressName
-					|| strpos($suppressName, sprintf('%s.', $annotation->getContent())) === 0
+					$suppressName === $annotationSuppressName
+					|| strpos($suppressName, sprintf('%s.', $annotationSuppressName)) === 0
 				) {
 					$carry = true;
 				}

tests/Helpers/SuppressHelperTest.php

@@ -86,6 +86,8 @@ public function dataFunctionIsSuppressed(): array
 		return [
 			['suppressWithFullName'],
 			['suppressWithPartialName'],
+			['suppressWithFullNameAndComment'],
+			['suppressWithPartialNameAndComment'],
 			['suppressWithFullDocComment'],
 		];
 	}

tests/Helpers/data/suppress.php

@@ -54,6 +54,22 @@ final public function suppressWithPartialName($e)
 
 	}
 
+	/**
+	 * @phpcsSuppress Sniff.Sniff.Sniff.check Some comment
+	 */
+	final public function suppressWithFullNameAndComment()
+	{
+
+	}
+
+	/**
+	 * @phpcsSuppress Sniff.Sniff.Sniff Some comment
+	 */
+	final public function suppressWithPartialNameAndComment($e)
+	{
+
+	}
+
 	/**
 	 * Description description description.
 	 *