Merge branch 'master' into 4.x

Author: jrfnl

src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php

@@ -76,7 +76,7 @@ protected function processReturn(File $phpcsFile, $stackPtr, $commentStart)
                 $phpcsFile->addError($error, $return, 'MissingReturnType');
             } else {
                 // Support both a return type and a description.
-                preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\a-z0-9\[\]]+))*)( .*)?`i', $content, $returnParts);
+                preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\a-z0-9_\[\]]+))*)( .*)?`i', $content, $returnParts);
                 if (isset($returnParts[1]) === false) {
                     return;
                 }

src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.1.inc

@@ -1167,3 +1167,30 @@ public function setTranslator($a): void
 {
     $this->translator = $translator;
 }
+
+/**
+ * Issue PHPCSStandards/PHP_CodeSniffer#1197.
+ *
+ * @return int|WP_Error
+ */
+function doNotTruncateClassNamesContainingUnderscoresAtEndOfType() {
+    return 0;
+}
+
+/**
+ * Issue PHPCSStandards/PHP_CodeSniffer#1197.
+ *
+ * @return WP_Error|int
+ */
+function doNotTruncateClassNamesContainingUnderscoresAtStartOfType() {
+    return 0;
+}
+
+/**
+ * Issue PHPCSStandards/PHP_CodeSniffer#1197.
+ *
+ * @return int|WP_Error|false
+ */
+function doNotTruncateClassNamesContainingUnderscoresInTheMiddelOfType() {
+    return 0;
+}

src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.1.inc.fixed

@@ -1167,3 +1167,30 @@ public function setTranslator($a): void
 {
     $this->translator = $translator;
 }
+
+/**
+ * Issue PHPCSStandards/PHP_CodeSniffer#1197.
+ *
+ * @return integer|WP_Error
+ */
+function doNotTruncateClassNamesContainingUnderscoresAtEndOfType() {
+    return 0;
+}
+
+/**
+ * Issue PHPCSStandards/PHP_CodeSniffer#1197.
+ *
+ * @return WP_Error|integer
+ */
+function doNotTruncateClassNamesContainingUnderscoresAtStartOfType() {
+    return 0;
+}
+
+/**
+ * Issue PHPCSStandards/PHP_CodeSniffer#1197.
+ *
+ * @return integer|WP_Error|false
+ */
+function doNotTruncateClassNamesContainingUnderscoresInTheMiddelOfType() {
+    return 0;
+}

src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php

@@ -160,6 +160,9 @@ public function getErrorList($testFile='')
                 1151 => 1,
                 1154 => 1,
                 1160 => 1,
+                1174 => 1,
+                1183 => 1,
+                1192 => 1,
             ];
 
             // Mixed type hints only work from PHP 8.0 onwards.