build: Update squizlabs/php_codesniffer to 3.10.3

https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/3.10.3 https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/3.10.2 https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/3.10.1 https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/3.10.0 https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/3.9.2 https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/3.9.1 Adjust comment handling for open/close token to match test cases Bug: T376421 Change-Id: I068c635f5bfb1324bd49d0f91462da808b86cd24
wikimedia · Oct 3, 2024 · a520952 · a520952
1 parent f1c4655
commit a520952
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/MediaWiki/Sniffs/Commenting/DocCommentSniff.php b/MediaWiki/Sniffs/Commenting/DocCommentSniff.php
@@ -132,6 +132,7 @@ public function process( File $phpcsFile, $stackPtr ) {
 			// Ensure whitespace or tab after /** or *
 			if ( ( $tokens[$i]['code'] === T_DOC_COMMENT_OPEN_TAG ||
 				$tokens[$i]['code'] === T_DOC_COMMENT_STAR ) &&
+				$tokens[$i + 1]['code'] !== T_DOC_COMMENT_CLOSE_TAG &&
 				$tokens[$i + 1]['length'] > 0
 			) {
 				$commentStarSpacing = $i + 1;
@@ -284,7 +285,9 @@ public function process( File $phpcsFile, $stackPtr ) {
 					$phpcsFile->fixer->endChangeset();
 				}
 			}
-		} elseif ( $tokens[$commentEnd]['length'] > 0 ) {
+		} elseif ( $tokens[$commentEnd]['length'] > 0 &&
+			$tokens[$commentEnd - 1]['code'] !== T_DOC_COMMENT_OPEN_TAG
+		) {
 			// Ensure a whitespace before the token
 			$commentCloseSpacing = $commentEnd - 1;
 			$expectedSpaces = 1;

diff --git a/MediaWiki/Sniffs/Commenting/IllegalSingleLineCommentSniff.php b/MediaWiki/Sniffs/Commenting/IllegalSingleLineCommentSniff.php
@@ -58,7 +58,7 @@ public function process( File $phpcsFile, $stackPtr ) {
 				}
 			} else {
 				// Determine whether multiple "*" appears right before the "*/"
-				if ( preg_match( '/(\*){2,}\//', $currentToken['content'] ) !== 0 ) {
+				if ( preg_match( '/[^\/*](\*){2,}\//', $currentToken['content'] ) !== 0 ) {
 					$fix = $phpcsFile->addFixableWarning(
 						'Invalid end of a single line comment',
 						$stackPtr,

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
 		"ext-mbstring": "*",
 		"composer/semver": "3.3.2 || 3.4.0 || 3.4.2 || 3.4.3",
 		"composer/spdx-licenses": "~1.5.2",
-		"squizlabs/php_codesniffer": "3.9.0",
+		"squizlabs/php_codesniffer": "3.10.3",
 		"symfony/polyfill-php80": "^1.26.0",
 		"phpcsstandards/phpcsextra": "1.2.1"
 	},