diff --git a/coder_sniffer/Drupal/Sniffs/Arrays/ArraySniff.php b/coder_sniffer/Drupal/Sniffs/Arrays/ArraySniff.php
index f0a6f3504e0a36cc9c210f8af101ea34da8c325e..f911571c74a6d5527fa89dc54fcf072d6600d80b 100644
--- a/coder_sniffer/Drupal/Sniffs/Arrays/ArraySniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Arrays/ArraySniff.php
@@ -39,7 +39,7 @@ class ArraySniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php b/coder_sniffer/Drupal/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php
index 996d5ed5958636b4cb81e9c2fc5d069b36e54679..f66bea5b1cb4fac2c20d3a7f0971131f30eec7dc 100644
--- a/coder_sniffer/Drupal/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php
@@ -28,7 +28,7 @@ class ClassDefinitionNameSpacingSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = ['CSS'];
diff --git a/coder_sniffer/Drupal/Sniffs/CSS/ColourDefinitionSniff.php b/coder_sniffer/Drupal/Sniffs/CSS/ColourDefinitionSniff.php
index 8f622bfcf0c2dccc0e85230bfe6fc26a70a233ca..941fbdfbbf974f5d2df14b59413dea443ba7054e 100644
--- a/coder_sniffer/Drupal/Sniffs/CSS/ColourDefinitionSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/CSS/ColourDefinitionSniff.php
@@ -27,7 +27,7 @@ class ColourDefinitionSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = ['CSS'];
@@ -35,7 +35,7 @@ class ColourDefinitionSniff implements Sniff
/**
* Returns the token types that this sniff is interested in.
*
- * @return array(int)
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Classes/ClassCreateInstanceSniff.php b/coder_sniffer/Drupal/Sniffs/Classes/ClassCreateInstanceSniff.php
index febe0110eeb57341b7f5bad5338a0ffbc5a1d86c..4c2dc082cc86bc11811e987abe8f8dc89549bd10 100644
--- a/coder_sniffer/Drupal/Sniffs/Classes/ClassCreateInstanceSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Classes/ClassCreateInstanceSniff.php
@@ -29,7 +29,7 @@ class ClassCreateInstanceSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Classes/ClassDeclarationSniff.php b/coder_sniffer/Drupal/Sniffs/Classes/ClassDeclarationSniff.php
index b3a1da81b3cc05ca1c7a1b2f4f2c5046f38c7f2e..8e0b5b660e8f6fe5dbb0d63af24c3af4ddfee218 100644
--- a/coder_sniffer/Drupal/Sniffs/Classes/ClassDeclarationSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Classes/ClassDeclarationSniff.php
@@ -29,7 +29,7 @@ class ClassDeclarationSniff extends PSR2ClassDeclarationSniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Classes/ClassFileNameSniff.php b/coder_sniffer/Drupal/Sniffs/Classes/ClassFileNameSniff.php
index aa5b02c199258e93d0b5c644a04626cf4d1e8d58..23ee75452bc316939d3c0f2421c814925e5726ee 100644
--- a/coder_sniffer/Drupal/Sniffs/Classes/ClassFileNameSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Classes/ClassFileNameSniff.php
@@ -20,7 +20,7 @@ class ClassFileNameSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Classes/FullyQualifiedNamespaceSniff.php b/coder_sniffer/Drupal/Sniffs/Classes/FullyQualifiedNamespaceSniff.php
index ba81c73d920f57ec6f1cabc1aac59f8cfb504734..4dc885be8c16be7bae2a786d7d66d9725fb91a49 100644
--- a/coder_sniffer/Drupal/Sniffs/Classes/FullyQualifiedNamespaceSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Classes/FullyQualifiedNamespaceSniff.php
@@ -26,7 +26,7 @@ class FullyQualifiedNamespaceSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Classes/InterfaceNameSniff.php b/coder_sniffer/Drupal/Sniffs/Classes/InterfaceNameSniff.php
index 689f4ae11d1e1ce9523ba89727c0000629c0b49b..a9c6aedabad32b579026b05b374e2592e693ddf7 100644
--- a/coder_sniffer/Drupal/Sniffs/Classes/InterfaceNameSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Classes/InterfaceNameSniff.php
@@ -26,7 +26,7 @@ class InterfaceNameSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Classes/UnusedUseStatementSniff.php b/coder_sniffer/Drupal/Sniffs/Classes/UnusedUseStatementSniff.php
index 7964d3a4216212234da58f064b38818ee34eaa25..7b325a235901a8220f10ec4df308f2e2e448e572 100644
--- a/coder_sniffer/Drupal/Sniffs/Classes/UnusedUseStatementSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Classes/UnusedUseStatementSniff.php
@@ -27,7 +27,7 @@ class UnusedUseStatementSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Classes/UseLeadingBackslashSniff.php b/coder_sniffer/Drupal/Sniffs/Classes/UseLeadingBackslashSniff.php
index 4979210bf10a40130778c9ed5bfc6fa32cfb5d3c..1b0f1013653f5abbddd7f3ba1f9bfc82fbf3a535 100644
--- a/coder_sniffer/Drupal/Sniffs/Classes/UseLeadingBackslashSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Classes/UseLeadingBackslashSniff.php
@@ -27,7 +27,7 @@ class UseLeadingBackslashSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/ClassCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/ClassCommentSniff.php
index 8eaca41dcb52bf5e48d4e82caff01b23c9603a4e..7998d5128b7872605cce5550550d4c6b4fada844 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/ClassCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/ClassCommentSniff.php
@@ -32,7 +32,7 @@ class ClassCommentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/DataTypeNamespaceSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/DataTypeNamespaceSniff.php
index a6c13b6e94276e0b7ea5889af4336fd4d672fa7f..1644ee2c0cce71b3b502b75a28f7fd6700f1056a 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/DataTypeNamespaceSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/DataTypeNamespaceSniff.php
@@ -27,7 +27,7 @@ class DataTypeNamespaceSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/DeprecatedSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/DeprecatedSniff.php
index f0c1bf93f1e09799ba4f9d7c77b8b419f66efcc6..637e3fc8dc056e9929a624688a744ac764302a71 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/DeprecatedSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/DeprecatedSniff.php
@@ -26,7 +26,7 @@ class DeprecatedSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentAlignmentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentAlignmentSniff.php
index 0986fb6dfa52f99a2d2f19121fa973513dbaeb7d..c455f66fb210348f7df695fddbfe8743f7c1fa78 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentAlignmentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentAlignmentSniff.php
@@ -30,7 +30,7 @@ class DocCommentAlignmentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentSniff.php
index 16c0738c709702b14411fd29cdafd61b8aaf6276..d82686d4561215af6e4ce09990ee7a0a876f6386 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentSniff.php
@@ -29,7 +29,7 @@ class DocCommentSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = [
'PHP',
@@ -40,7 +40,7 @@ class DocCommentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentStarSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentStarSniff.php
index b3c99db0aaefdd6d477b9558043589b1d61aee05..1d0a8e3f78254b0567db16785f20396e7806c509 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentStarSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/DocCommentStarSniff.php
@@ -26,7 +26,7 @@ class DocCommentStarSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/FileCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/FileCommentSniff.php
index f2196eb04636f364acabefdb014b10ca14512b89..dd34fa72886ca0aa63b82b34577d0effd534bd9b 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/FileCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/FileCommentSniff.php
@@ -33,7 +33,7 @@ class FileCommentSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = [
'PHP',
@@ -44,7 +44,7 @@ class FileCommentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
index 20819a6ad19caf933a89bff0e862432dba15b6c8..bc089266e3619876bccaf74fcb29e8005a4b6e53 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
@@ -27,7 +27,7 @@ class FunctionCommentSniff implements Sniff
/**
* A map of invalid data types to valid ones for param and return documentation.
*
- * @var array
+ * @var array<string, string>
*/
public static $invalidTypes = [
'Array' => 'array',
@@ -54,7 +54,7 @@ class FunctionCommentSniff implements Sniff
/**
* An array of variable types for param/var we will check.
*
- * @var array(string)
+ * @var array<string>
*/
public $allowedTypes = [
'array',
@@ -68,7 +68,7 @@ class FunctionCommentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/GenderNeutralCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/GenderNeutralCommentSniff.php
index 324ada5a8c008eda4363325c82d6d243a66c1897..cb1f41d90f2415ba5b1060d9c55fb065c7b2b6df 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/GenderNeutralCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/GenderNeutralCommentSniff.php
@@ -26,7 +26,7 @@ class GenderNeutralCommentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/HookCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/HookCommentSniff.php
index ba5d4e24a6881ae5f67054e5972848bc7444c437..8d6ac34e6c7400c63a93c914cad91b69703b4494 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/HookCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/HookCommentSniff.php
@@ -26,7 +26,7 @@ class HookCommentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/InlineCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/InlineCommentSniff.php
index 69aaffd5a3721cd3456f2b8a9490a24cd773077c..b398f3a891c8bb7513debc520520339956f99325 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/InlineCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/InlineCommentSniff.php
@@ -31,7 +31,7 @@ class InlineCommentSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = [
'PHP',
@@ -42,7 +42,7 @@ class InlineCommentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/PostStatementCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/PostStatementCommentSniff.php
index ea16f665dbbd7563a9a1be6c4bb16c4d72f92733..a6a199b76f2821ee0a3ad01fdc67b829a6506f97 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/PostStatementCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/PostStatementCommentSniff.php
@@ -27,7 +27,7 @@ class PostStatementCommentSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = ['PHP'];
@@ -35,7 +35,7 @@ class PostStatementCommentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/ControlStructures/ControlSignatureSniff.php b/coder_sniffer/Drupal/Sniffs/ControlStructures/ControlSignatureSniff.php
index 8b651727863c4d9be19b7e9be0f6d806cdb8a516..d17385469a1790ed2fcbcd99ffec56e76698911b 100644
--- a/coder_sniffer/Drupal/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/ControlStructures/ControlSignatureSniff.php
@@ -30,7 +30,7 @@ class ControlSignatureSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = [
'PHP',
diff --git a/coder_sniffer/Drupal/Sniffs/ControlStructures/ElseIfSniff.php b/coder_sniffer/Drupal/Sniffs/ControlStructures/ElseIfSniff.php
index 6455a070dec84594e17a25ad9a79f097615d8ea0..4d41827d0cda4ffee4b2178aedd541aff7fc125d 100644
--- a/coder_sniffer/Drupal/Sniffs/ControlStructures/ElseIfSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/ControlStructures/ElseIfSniff.php
@@ -26,7 +26,7 @@ class ElseIfSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Files/EndFileNewlineSniff.php b/coder_sniffer/Drupal/Sniffs/Files/EndFileNewlineSniff.php
index b131bbc106bb5c2b2b4e3ed84d5740afce4d47cd..aa47b82fe73c811641202b62b1f9ec783a4d0c36 100644
--- a/coder_sniffer/Drupal/Sniffs/Files/EndFileNewlineSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Files/EndFileNewlineSniff.php
@@ -29,7 +29,7 @@ class EndFileNewlineSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = [
'PHP',
@@ -41,7 +41,7 @@ class EndFileNewlineSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
@@ -101,7 +101,7 @@ class EndFileNewlineSniff implements Sniff
}
$lastCodeLine = $tokens[$lastCode]['line'];
- $blankLines = ($lastLine - $lastCodeLine + 1);
+ $blankLines = (string) ($lastLine - $lastCodeLine + 1);
$phpcsFile->recordMetric($stackPtr, 'Number of newlines at EOF', $blankLines);
if ($blankLines > 1) {
diff --git a/coder_sniffer/Drupal/Sniffs/Files/FileEncodingSniff.php b/coder_sniffer/Drupal/Sniffs/Files/FileEncodingSniff.php
index 982a6daaa7eaedf7763a13302157e96669324225..983365d5c705e83d755a33ef78468ed838ebe2ee 100644
--- a/coder_sniffer/Drupal/Sniffs/Files/FileEncodingSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Files/FileEncodingSniff.php
@@ -36,7 +36,7 @@ class FileEncodingSniff implements Sniff
*
* Any other detected encodings will throw a warning.
*
- * @var array
+ * @var array<string>
*/
public $allowedEncodings = ['UTF-8'];
@@ -44,7 +44,7 @@ class FileEncodingSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Files/LineLengthSniff.php b/coder_sniffer/Drupal/Sniffs/Files/LineLengthSniff.php
index a812bce592ddba13f7363ae4a8ccad5a537b385a..739119692ea134afc5d924ff598175c62e490ec4 100644
--- a/coder_sniffer/Drupal/Sniffs/Files/LineLengthSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Files/LineLengthSniff.php
@@ -46,7 +46,7 @@ class LineLengthSniff extends GenericLineLengthSniff
* Checks if a line is too long.
*
* @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
- * @param array $tokens The token stack.
+ * @param array<int, array> $tokens The token stack.
* @param int $stackPtr The first token on the next line.
*
* @return false|null
diff --git a/coder_sniffer/Drupal/Sniffs/Files/TxtFileLineLengthSniff.php b/coder_sniffer/Drupal/Sniffs/Files/TxtFileLineLengthSniff.php
index c904c182f89e1cf2cd0a441391316aaa4c4daa00..66f93c8325585ca8c0430c351d91c8f87bf9b7c6 100644
--- a/coder_sniffer/Drupal/Sniffs/Files/TxtFileLineLengthSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Files/TxtFileLineLengthSniff.php
@@ -29,7 +29,7 @@ class TxtFileLineLengthSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Formatting/MultiLineAssignmentSniff.php b/coder_sniffer/Drupal/Sniffs/Formatting/MultiLineAssignmentSniff.php
index 0ad7c73c2042c72befda4411502c8cdd5ebdd623..b30b9ea3e29bf7bf65107f62ec68e6a27d47f78f 100644
--- a/coder_sniffer/Drupal/Sniffs/Formatting/MultiLineAssignmentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Formatting/MultiLineAssignmentSniff.php
@@ -32,7 +32,7 @@ class MultiLineAssignmentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
@@ -62,7 +62,7 @@ class MultiLineAssignmentSniff implements Sniff
}
// Make sure it is the first thing on the line, otherwise we ignore it.
- $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), false, true);
+ $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
if ($prev === false) {
// Bad assignment.
return;
diff --git a/coder_sniffer/Drupal/Sniffs/Formatting/SpaceInlineIfSniff.php b/coder_sniffer/Drupal/Sniffs/Formatting/SpaceInlineIfSniff.php
index 5cd202425639ff4580c782e5bcf618c10ed84998..e9f4ac04a3624a47c18c11817db5aed2958a9b5c 100644
--- a/coder_sniffer/Drupal/Sniffs/Formatting/SpaceInlineIfSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Formatting/SpaceInlineIfSniff.php
@@ -26,7 +26,7 @@ class SpaceInlineIfSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Formatting/SpaceUnaryOperatorSniff.php b/coder_sniffer/Drupal/Sniffs/Formatting/SpaceUnaryOperatorSniff.php
index ada0c0a9428ae4f9176e2b527e84eaf107bab21d..ef23bfc635e899cd9592333dc861cff91e90d09a 100644
--- a/coder_sniffer/Drupal/Sniffs/Formatting/SpaceUnaryOperatorSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Formatting/SpaceUnaryOperatorSniff.php
@@ -30,7 +30,7 @@ class SpaceUnaryOperatorSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Functions/DiscouragedFunctionsSniff.php b/coder_sniffer/Drupal/Sniffs/Functions/DiscouragedFunctionsSniff.php
index 30bb1b683bd3894bdc29348fd24376d4f53f7728..df8f342dca2b85998ac5732f9f7a2771889dae2b 100644
--- a/coder_sniffer/Drupal/Sniffs/Functions/DiscouragedFunctionsSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Functions/DiscouragedFunctionsSniff.php
@@ -27,7 +27,7 @@ class DiscouragedFunctionsSniff extends ForbiddenFunctionsSniff
* The value is NULL if no alternative exists, i.e., the function should
* just not be used.
*
- * @var array|null)
+ * @var array<string, null>
*/
public $forbiddenFunctions = [
// Devel module debugging functions.
diff --git a/coder_sniffer/Drupal/Sniffs/Functions/FunctionDeclarationSniff.php b/coder_sniffer/Drupal/Sniffs/Functions/FunctionDeclarationSniff.php
index a3cea5c7614d9ff22b8d575051d80f455240288b..b4cdcdd0e69c99536f051ad15fea7abe0e396c66 100644
--- a/coder_sniffer/Drupal/Sniffs/Functions/FunctionDeclarationSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Functions/FunctionDeclarationSniff.php
@@ -30,7 +30,7 @@ class FunctionDeclarationSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/InfoFiles/AutoAddedKeysSniff.php b/coder_sniffer/Drupal/Sniffs/InfoFiles/AutoAddedKeysSniff.php
index 2dc4665f4c7a2256de829fd3fa28411e42113fcf..571baed67ef4ad1e5f0da90f4d23d06c963a4f13 100644
--- a/coder_sniffer/Drupal/Sniffs/InfoFiles/AutoAddedKeysSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/InfoFiles/AutoAddedKeysSniff.php
@@ -27,7 +27,7 @@ class AutoAddedKeysSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/InfoFiles/ClassFilesSniff.php b/coder_sniffer/Drupal/Sniffs/InfoFiles/ClassFilesSniff.php
index e0a7465d9b41fea99cba52ed97cbc455612f1589..60c142bf9ca9638c5b2ad0422f7f21a258b6ddb4 100644
--- a/coder_sniffer/Drupal/Sniffs/InfoFiles/ClassFilesSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/InfoFiles/ClassFilesSniff.php
@@ -27,7 +27,7 @@ class ClassFilesSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
@@ -117,7 +117,7 @@ class ClassFilesSniff implements Sniff
*
* @param string $data The contents of the info file to parse
*
- * @return array The info array.
+ * @return array<mixed> The info array.
*/
public static function drupalParseInfoFormat($data)
{
diff --git a/coder_sniffer/Drupal/Sniffs/InfoFiles/DuplicateEntrySniff.php b/coder_sniffer/Drupal/Sniffs/InfoFiles/DuplicateEntrySniff.php
index 5be538738612bc090333803a259040ec56f3260a..364b3e20d53db7fc4f7c37e7d286e22d93b595e5 100644
--- a/coder_sniffer/Drupal/Sniffs/InfoFiles/DuplicateEntrySniff.php
+++ b/coder_sniffer/Drupal/Sniffs/InfoFiles/DuplicateEntrySniff.php
@@ -26,7 +26,7 @@ class DuplicateEntrySniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
@@ -71,7 +71,7 @@ class DuplicateEntrySniff implements Sniff
*
* @param string $data The contents of the info file to parse
*
- * @return array A list of configuration keys that appear more than once.
+ * @return array<string> A list of configuration keys that appear more than once.
*/
protected function findDuplicateInfoFileEntries($data)
{
diff --git a/coder_sniffer/Drupal/Sniffs/InfoFiles/RequiredSniff.php b/coder_sniffer/Drupal/Sniffs/InfoFiles/RequiredSniff.php
index b4bc02621556cba372b131933cfb12cc2a4f9711..3d1d922317651aa9c92b6faafb4414329def35bb 100644
--- a/coder_sniffer/Drupal/Sniffs/InfoFiles/RequiredSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/InfoFiles/RequiredSniff.php
@@ -27,7 +27,7 @@ class RequiredSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/NamingConventions/ValidClassNameSniff.php b/coder_sniffer/Drupal/Sniffs/NamingConventions/ValidClassNameSniff.php
index 0eb621fd3d8b0f3ecaa11190251e510f72c54689..bd36768932efc204fe255df87fc89811bc91ae94 100644
--- a/coder_sniffer/Drupal/Sniffs/NamingConventions/ValidClassNameSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/NamingConventions/ValidClassNameSniff.php
@@ -38,7 +38,7 @@ class ValidClassNameSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/NamingConventions/ValidGlobalSniff.php b/coder_sniffer/Drupal/Sniffs/NamingConventions/ValidGlobalSniff.php
index 730189f1035af63141ebac9ed82f5e57107ada1c..14fcbc752469e08f89398d8c6980dedeb9a708fe 100644
--- a/coder_sniffer/Drupal/Sniffs/NamingConventions/ValidGlobalSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/NamingConventions/ValidGlobalSniff.php
@@ -26,7 +26,7 @@ class ValidGlobalSniff implements Sniff
/**
* List of allowed Drupal core global variable names.
*
- * @var array
+ * @var array<string>
*/
public $coreGlobals = [
'$argc',
@@ -83,7 +83,7 @@ class ValidGlobalSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/ConstantNameSniff.php b/coder_sniffer/Drupal/Sniffs/Semantics/ConstantNameSniff.php
index 2e3f7c390f1d80ca6888fa2fb4711700d1215600..d04865fdda548df351a0bcc7bc51e046a75c1c27 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/ConstantNameSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/ConstantNameSniff.php
@@ -26,7 +26,7 @@ class ConstantNameSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionAliasSniff.php b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionAliasSniff.php
index 3fa1f3c18e2c6389b5554a0159f5969ee52144c7..bafc3c608f676ed114c811f4991e335eb342760f 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionAliasSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionAliasSniff.php
@@ -25,7 +25,7 @@ class FunctionAliasSniff extends FunctionCall
* Holds all PHP function name aliases (keys) and originals (values). See
* http://php.net/manual/en/aliases.php
*
- * @var array
+ * @var array<string, string>
*/
protected $aliases = [
'_' => 'gettext',
@@ -165,7 +165,7 @@ class FunctionAliasSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionCall.php b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionCall.php
index cf6d290a5a7e85c0840adc7d82e03987221d36cd..27c35a48dc3fba0b15fc51889ddba0052dbcb847 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionCall.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionCall.php
@@ -54,7 +54,7 @@ abstract class FunctionCall implements Sniff
/**
* Internal cache to save the calculated arguments of the function call.
*
- * @var array
+ * @var array<int, array>
*/
protected $arguments;
@@ -70,7 +70,7 @@ abstract class FunctionCall implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionDefinition.php b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionDefinition.php
index b285083d6a067c65a104ef0e366a84b8218aecee..31be9fb6437d081c178a5dabeb0b738cb374e12a 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionDefinition.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionDefinition.php
@@ -27,7 +27,7 @@ abstract class FunctionDefinition implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTSniff.php b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTSniff.php
index 9dd10ea70c8321f3a31b34c3f2eeb6f80aaa4d1f..4da9955f0b0a55ffa8030e304e45c02f765b9e32 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTSniff.php
@@ -34,7 +34,7 @@ class FunctionTSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTriggerErrorSniff.php b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTriggerErrorSniff.php
index e8e295ac306c239de45acbd60518377858754149..0f1b0388049cca6e26f2e9480d6d5757cbaa3753 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTriggerErrorSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionTriggerErrorSniff.php
@@ -25,7 +25,7 @@ class FunctionTriggerErrorSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionWatchdogSniff.php b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionWatchdogSniff.php
index 1602e40c7d60177cc2f99bd31bdb388c995029e8..322ae1a6e44e214bdfbe41c0a377334601d99bcf 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/FunctionWatchdogSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/FunctionWatchdogSniff.php
@@ -25,7 +25,7 @@ class FunctionWatchdogSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/LStringTranslatableSniff.php b/coder_sniffer/Drupal/Sniffs/Semantics/LStringTranslatableSniff.php
index 7ae3d58e6039d209298337e5d380038b9580f71b..d664a47d50b391c97c091e63a7d8400f3c2f77c9 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/LStringTranslatableSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/LStringTranslatableSniff.php
@@ -25,7 +25,7 @@ class LStringTranslatableSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/PregSecuritySniff.php b/coder_sniffer/Drupal/Sniffs/Semantics/PregSecuritySniff.php
index e6e5c37d78d01f23a0bebc6f71db4b269b43c42f..cfc822a73c8d482887fa1a3751f25633b16a96cd 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/PregSecuritySniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/PregSecuritySniff.php
@@ -26,7 +26,7 @@ class PregSecuritySniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/Drupal/Sniffs/Semantics/RemoteAddressSniff.php b/coder_sniffer/Drupal/Sniffs/Semantics/RemoteAddressSniff.php
index 3cd415e4fbf50a7e6f40bd4f086a721ea373c9ee..754269d981c6c74d7deb38db5a8cb4169753ec3f 100644
--- a/coder_sniffer/Drupal/Sniffs/Semantics/RemoteAddressSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Semantics/RemoteAddressSniff.php
@@ -27,7 +27,7 @@ class RemoteAddressSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/CloseBracketSpacingSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/CloseBracketSpacingSniff.php
index 5ba50d78be867493435168249d79d989c3112e60..752e618e91e427d174c157fadbd7906f398ff56c 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/CloseBracketSpacingSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/CloseBracketSpacingSniff.php
@@ -28,7 +28,7 @@ class CloseBracketSpacingSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = [
'PHP',
@@ -39,7 +39,7 @@ class CloseBracketSpacingSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/CommaSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/CommaSniff.php
index 65b63f9ea8062398c2573a681fc06f00a9634e0e..f16442718f56e1a67c2a19b56752eac3be80460a 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/CommaSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/CommaSniff.php
@@ -28,7 +28,7 @@ class CommaSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/EmptyLinesSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/EmptyLinesSniff.php
index 7be7f8c3a42b0ae506bc749484e87edfdc264586..341c27e92d482baf7a42fdff336d58a5d1f47c51 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/EmptyLinesSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/EmptyLinesSniff.php
@@ -27,7 +27,7 @@ class EmptyLinesSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = [
'PHP',
@@ -39,7 +39,7 @@ class EmptyLinesSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/NamespaceSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/NamespaceSniff.php
index b85b94c1bb1ce4f8b97fe2014fb3539ba028d71f..bbc3e56f05e7efc499e863dd4cf5a7c5dd1e688a 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/NamespaceSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/NamespaceSniff.php
@@ -26,7 +26,7 @@ class NamespaceSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
index 553f62c7d266efebfb8302db29e7aeb22f72f636..cc2244e24189aac62e302dfd576c308bfdb15a66 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
@@ -37,7 +37,7 @@ class ObjectOperatorIndentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
index bd34f3f509105cd99024cf8e791f1d2558824485..3810a0db23b976aefa59c71bedf64ebf696f1f05 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -31,7 +31,7 @@ class ObjectOperatorSpacingSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php
index 0bb9c254b40ec3c8bdaf2ab84acdd8660f1e09d6..74e58382a577185c6805103ee35cab09f9e74b1d 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php
@@ -27,7 +27,7 @@ class OpenBracketSpacingSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = [
'PHP',
@@ -38,7 +38,7 @@ class OpenBracketSpacingSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenTagNewlineSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenTagNewlineSniff.php
index c5a8339ba908bd157147f393bf7fa39de07bc131..74538a9bac11dea6455355376de73c82c4f76d26 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenTagNewlineSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenTagNewlineSniff.php
@@ -26,7 +26,7 @@ class OpenTagNewlineSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
index b58c2ae570da2f02300f31265800e4d04f037dd2..db38b8efc7ee58863bd17eabf406df895b85dec2 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
@@ -37,7 +37,7 @@ class ScopeClosingBraceSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeIndentSniff.php b/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeIndentSniff.php
index bcef42bdb38dd12a70d290e03d41435ae2493f03..4f99ee7375dc75f59ad40ac00b0104c3068691be 100644
--- a/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeIndentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -34,7 +34,7 @@ class ScopeIndentSniff implements Sniff
/**
* A list of tokenizers this sniff supports.
*
- * @var array
+ * @var array<string>
*/
public $supportedTokenizers = ['PHP'];
@@ -113,7 +113,7 @@ class ScopeIndentSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
@@ -1504,7 +1504,7 @@ class ScopeIndentSniff implements Sniff
$padding = '';
if ($length > 0) {
if ($this->tabIndent === true) {
- $numTabs = floor($length / $this->tabWidth);
+ $numTabs = (int) floor($length / $this->tabWidth);
if ($numTabs > 0) {
$numSpaces = ($length - ($numTabs * $this->tabWidth));
$padding = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
@@ -1542,7 +1542,7 @@ class ScopeIndentSniff implements Sniff
$padding = ($length + $change);
if ($padding > 0) {
if ($this->tabIndent === true) {
- $numTabs = floor($padding / $this->tabWidth);
+ $numTabs = (int) floor($padding / $this->tabWidth);
$numSpaces = ($padding - ($numTabs * $this->tabWidth));
$padding = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
} else {
diff --git a/coder_sniffer/Drupal/Test/Arrays/DisallowLongArraySyntaxUnitTest.php b/coder_sniffer/Drupal/Test/Arrays/DisallowLongArraySyntaxUnitTest.php
index 4040d705ba863097293dd346841409fbffe900c2..ef840c5d717c0455b3bbfefd900f8efc4335f546 100644
--- a/coder_sniffer/Drupal/Test/Arrays/DisallowLongArraySyntaxUnitTest.php
+++ b/coder_sniffer/Drupal/Test/Arrays/DisallowLongArraySyntaxUnitTest.php
@@ -53,9 +53,9 @@ class DisallowLongArraySyntaxUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/disallow_long_array_d7/DisallowLongArraySyntaxUnitTest.1.inc',
diff --git a/coder_sniffer/Drupal/Test/Classes/ClassFileNameUnitTest.php b/coder_sniffer/Drupal/Test/Classes/ClassFileNameUnitTest.php
index 373194cbebe29f9d818530b81a257bdc3f36dd63..7cc4349a03884ba6bfbd7e38a6810d3750e93504 100644
--- a/coder_sniffer/Drupal/Test/Classes/ClassFileNameUnitTest.php
+++ b/coder_sniffer/Drupal/Test/Classes/ClassFileNameUnitTest.php
@@ -52,9 +52,9 @@ class ClassFileNameUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/drupal8/ClassFileNameUnitTest.php',
diff --git a/coder_sniffer/Drupal/Test/Classes/FullyQualifiedNamespaceUnitTest.php b/coder_sniffer/Drupal/Test/Classes/FullyQualifiedNamespaceUnitTest.php
index 0286035a9d3c20eb8ab89b4c1c92dd4a0f57bda6..cd2be321abde81f0292288a2886cab9cac06fcd1 100644
--- a/coder_sniffer/Drupal/Test/Classes/FullyQualifiedNamespaceUnitTest.php
+++ b/coder_sniffer/Drupal/Test/Classes/FullyQualifiedNamespaceUnitTest.php
@@ -52,9 +52,9 @@ class FullyQualifiedNamespaceUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/FullyQualifiedNamespaceUnitTest.inc',
diff --git a/coder_sniffer/Drupal/Test/CoderSniffUnitTest.php b/coder_sniffer/Drupal/Test/CoderSniffUnitTest.php
index 3e0f98870f9ab53a32ac6cb27b0ad0efb6bb97db..0ab0a543743933fee2c1312549abf4c3d9298a1b 100644
--- a/coder_sniffer/Drupal/Test/CoderSniffUnitTest.php
+++ b/coder_sniffer/Drupal/Test/CoderSniffUnitTest.php
@@ -88,9 +88,9 @@ abstract class CoderSniffUnitTest extends TestCase
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return string[]
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
$testFiles = [];
@@ -234,10 +234,10 @@ abstract class CoderSniffUnitTest extends TestCase
*
* @param \PHP_CodeSniffer\Files\LocalFile $file The file being tested.
*
- * @return array
+ * @return array<string>
* @throws \PHP_CodeSniffer\Exceptions\RuntimeException
*/
- public function generateFailureMessages(LocalFile $file)
+ public function generateFailureMessages(LocalFile $file): array
{
$testFile = $file->getFilename();
diff --git a/coder_sniffer/Drupal/Test/InfoFiles/AutoAddedKeysUnitTest.php b/coder_sniffer/Drupal/Test/InfoFiles/AutoAddedKeysUnitTest.php
index 1acdccac4dcbe7faaab90db935ee1d63633bde57..7ee8e65c2557d20835ffbc934228afb8e18b3692 100644
--- a/coder_sniffer/Drupal/Test/InfoFiles/AutoAddedKeysUnitTest.php
+++ b/coder_sniffer/Drupal/Test/InfoFiles/AutoAddedKeysUnitTest.php
@@ -51,9 +51,9 @@ class AutoAddedKeysUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/drupal7/test.info',
diff --git a/coder_sniffer/Drupal/Test/InfoFiles/ClassFilesUnitTest.php b/coder_sniffer/Drupal/Test/InfoFiles/ClassFilesUnitTest.php
index a892a4edc677e9ed10aeb283a3d00c6b1a7cdda6..be90e700ab4e308afef7801b65da8cb996508717 100644
--- a/coder_sniffer/Drupal/Test/InfoFiles/ClassFilesUnitTest.php
+++ b/coder_sniffer/Drupal/Test/InfoFiles/ClassFilesUnitTest.php
@@ -47,9 +47,9 @@ class ClassFilesUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [__DIR__.'/drupal7/class_files.info'];
diff --git a/coder_sniffer/Drupal/Test/InfoFiles/DuplicateEntryUnitTest.php b/coder_sniffer/Drupal/Test/InfoFiles/DuplicateEntryUnitTest.php
index 772983484f5a3d21e6cb4685768a498bd7a3906f..f31cf43ac2b44e237419241570e7cd1383b9457b 100644
--- a/coder_sniffer/Drupal/Test/InfoFiles/DuplicateEntryUnitTest.php
+++ b/coder_sniffer/Drupal/Test/InfoFiles/DuplicateEntryUnitTest.php
@@ -53,9 +53,9 @@ class DuplicateEntryUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [__DIR__.'/drupal7/test.info'];
diff --git a/coder_sniffer/Drupal/Test/Semantics/ConstantNameUnitTest.php b/coder_sniffer/Drupal/Test/Semantics/ConstantNameUnitTest.php
index c10bc82dbd9c6b14a8715c3f16bc52d47606418e..26f8c2fb51b53811b108652daa4ddd6244fbf8e4 100644
--- a/coder_sniffer/Drupal/Test/Semantics/ConstantNameUnitTest.php
+++ b/coder_sniffer/Drupal/Test/Semantics/ConstantNameUnitTest.php
@@ -13,9 +13,9 @@ class ConstantNameUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/constant_test.install',
diff --git a/coder_sniffer/Drupal/Test/bad/BadUnitTest.php b/coder_sniffer/Drupal/Test/bad/BadUnitTest.php
index 4d6a121ee9669d78b927c135718bfc404cb1a821..67fc1114d6583adcd366e32522a2d587083effd0 100644
--- a/coder_sniffer/Drupal/Test/bad/BadUnitTest.php
+++ b/coder_sniffer/Drupal/Test/bad/BadUnitTest.php
@@ -438,9 +438,9 @@ class BadUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
$di = new \DirectoryIterator(__DIR__);
$testFiles = [];
diff --git a/coder_sniffer/Drupal/Test/good/GoodUnitTest.php b/coder_sniffer/Drupal/Test/good/GoodUnitTest.php
index ac75e10c965e3b18ed2c3031cbcfa19ae892ff96..7702c9252118a1d81d2bb67f55c4e518864a22bb 100644
--- a/coder_sniffer/Drupal/Test/good/GoodUnitTest.php
+++ b/coder_sniffer/Drupal/Test/good/GoodUnitTest.php
@@ -53,9 +53,9 @@ class GoodUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
$di = new \DirectoryIterator(__DIR__);
diff --git a/coder_sniffer/DrupalPractice/Sniffs/CodeAnalysis/VariableAnalysisSniff.php b/coder_sniffer/DrupalPractice/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
index 31167444a9cbb826e37c84ae2cf1422345e12332..286bbce29a9a606197047d38f3ddd48617689c89 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
@@ -659,7 +659,7 @@ class VariableAnalysisSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Commenting/AuthorTagSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Commenting/AuthorTagSniff.php
index 05621acf9687ff3ecee362b531e818a90245a79c..6a26f151fd2f3d7221b8e74d08931130a80a813b 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Commenting/AuthorTagSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Commenting/AuthorTagSniff.php
@@ -26,7 +26,7 @@ class AuthorTagSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Commenting/CommentEmptyLineSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Commenting/CommentEmptyLineSniff.php
index f2c2bf6c9f6671ba8426bc7f8298e9e36bff5caa..0ac3f4ede00d965b0b5b1f50500988645b73bfd0 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Commenting/CommentEmptyLineSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Commenting/CommentEmptyLineSniff.php
@@ -27,7 +27,7 @@ class CommentEmptyLineSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Commenting/ExpectedExceptionSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Commenting/ExpectedExceptionSniff.php
index 61a831b2e73ce83cca676d07b53b52832f6e64ac..81240893c9d0f0c9edc821874ad4324d3e8b34bd 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Commenting/ExpectedExceptionSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Commenting/ExpectedExceptionSniff.php
@@ -28,7 +28,7 @@ class ExpectedExceptionSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Constants/GlobalConstantSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Constants/GlobalConstantSniff.php
index 5013691ce2e90467002c477763ac892cc3213a41..4652c92be96bfafa04eb58501a973c40e8b59dea 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Constants/GlobalConstantSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Constants/GlobalConstantSniff.php
@@ -27,7 +27,7 @@ class GlobalConstantSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Constants/GlobalDefineSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Constants/GlobalDefineSniff.php
index 7c10d9ac22be4761a93596ba44881b6ac39c373b..4cf6e11ff609d6d40d94389b17f9bd090de4017e 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Constants/GlobalDefineSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Constants/GlobalDefineSniff.php
@@ -27,7 +27,7 @@ class GlobalDefineSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/CheckPlainSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/CheckPlainSniff.php
index ecc07e720991d776c3b7750949d6b2a90fbf783a..cde3312d6c0fe933b543ed7449d7543ac0915d6d 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/CheckPlainSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/CheckPlainSniff.php
@@ -26,7 +26,7 @@ class CheckPlainSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/CurlSslVerifierSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/CurlSslVerifierSniff.php
index 5fa07cfc9b09dcb50f22a4764cffa2b2258da72a..36daee356d9045a0cca880892457e50a2adc772e 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/CurlSslVerifierSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/CurlSslVerifierSniff.php
@@ -27,7 +27,7 @@ class CurlSslVerifierSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DbQuerySniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DbQuerySniff.php
index a8e66bb441bfd41dfb19b0f9ee1e1d40f3af8d01..9c62807ae3d2d4ac5300a901ea2018d78eaa1504 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DbQuerySniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DbQuerySniff.php
@@ -27,7 +27,7 @@ class DbQuerySniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DbSelectBracesSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DbSelectBracesSniff.php
index beeee36f3b794125281540448933bbb8e81fadf5..32b690a84178a4de36192daf89b330907dd29e18 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DbSelectBracesSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DbSelectBracesSniff.php
@@ -26,7 +26,7 @@ class DbSelectBracesSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DefaultValueSanitizeSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DefaultValueSanitizeSniff.php
index f83c55f882a83bceef4871b67f4a1be71b45dcd2..bdb917a9014b8ecb3e64ebba022fe5819b9e5150 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DefaultValueSanitizeSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/DefaultValueSanitizeSniff.php
@@ -28,7 +28,7 @@ class DefaultValueSanitizeSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/FormErrorTSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/FormErrorTSniff.php
index 46645429f8d0d4ce2de10c15df488f0acf63a560..a60e263e2e7f8bc52fe97f8341b29396abd3e591 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/FormErrorTSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/FormErrorTSniff.php
@@ -26,7 +26,7 @@ class FormErrorTSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/LCheckPlainSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/LCheckPlainSniff.php
index 143968c28ab88468ba2ad186e5c003bc5ed87c99..ac0dfbbfb7776a7a87fffefe21075bda12684f45 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/LCheckPlainSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/LCheckPlainSniff.php
@@ -26,7 +26,7 @@ class LCheckPlainSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/MessageTSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/MessageTSniff.php
index 429b25dde8fb8d33a496cf175bf964bc4a68011e..a04de3208648f0f4379d45fa046716227545eb7e 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/MessageTSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/MessageTSniff.php
@@ -26,7 +26,7 @@ class MessageTSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/TCheckPlainSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/TCheckPlainSniff.php
index 5e0fed34f5ecc469852f43cec2781f3ece3729e0..73ece1a2aec17fcfe682610314af4836252a5d5d 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/TCheckPlainSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/TCheckPlainSniff.php
@@ -27,7 +27,7 @@ class TCheckPlainSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/ThemeSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/ThemeSniff.php
index 0d46528d47699d678bfc79715257b02f66dad453..3675d117ecdb2743f2acfe8090fa4f93ba4457b9 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/ThemeSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/ThemeSniff.php
@@ -25,7 +25,7 @@ class ThemeSniff extends FunctionCall
/**
* List of functions starting with "theme_" that don't generate theme output.
*
- * @var array
+ * @var array<string>
*/
protected $reservedFunctions = [
'theme_get_registry',
diff --git a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/VariableSetSanitizeSniff.php b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/VariableSetSanitizeSniff.php
index fd3101be1b8403b9f999ee7f051b0cd31133652f..abc321628be422b00a04b9c433d2a87fd581eaed 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/VariableSetSanitizeSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/FunctionCalls/VariableSetSanitizeSniff.php
@@ -27,7 +27,7 @@ class VariableSetSanitizeSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/General/ClassNameSniff.php b/coder_sniffer/DrupalPractice/Sniffs/General/ClassNameSniff.php
index 7949b60e5c496f9a0835c823113330e45d007b56..3a7eb98f1e14a4050e911a8731b018c5e7449c5a 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/General/ClassNameSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/General/ClassNameSniff.php
@@ -28,7 +28,7 @@ class ClassNameSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/General/DescriptionTSniff.php b/coder_sniffer/DrupalPractice/Sniffs/General/DescriptionTSniff.php
index 4a2b4326ad08e2ce5261affc48b6430b548ceed1..43580e93056e82d49aa8159376f438972bc7583e 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/General/DescriptionTSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/General/DescriptionTSniff.php
@@ -26,7 +26,7 @@ class DescriptionTSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/General/FormStateInputSniff.php b/coder_sniffer/DrupalPractice/Sniffs/General/FormStateInputSniff.php
index 8400048ee4dbcd24d0920e4890ca97c92268f77b..0d8cee7f84da5820ba17d086827c7fc2dcdb86f5 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/General/FormStateInputSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/General/FormStateInputSniff.php
@@ -27,7 +27,7 @@ class FormStateInputSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/General/LanguageNoneSniff.php b/coder_sniffer/DrupalPractice/Sniffs/General/LanguageNoneSniff.php
index 5f123a47d608352727a89c2909fa763e2e27052b..d1fa525b4c8bc5de2bc8b16c330dae59dde959dc 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/General/LanguageNoneSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/General/LanguageNoneSniff.php
@@ -26,7 +26,7 @@ class LanguageNoneSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/General/OptionsTSniff.php b/coder_sniffer/DrupalPractice/Sniffs/General/OptionsTSniff.php
index d30b7ae2468979fc3595327828f3fa5115394282..259641df97b4fdc8ecd582a8aef6c49e76f172c4 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/General/OptionsTSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/General/OptionsTSniff.php
@@ -26,7 +26,7 @@ class OptionsTSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/General/VariableNameSniff.php b/coder_sniffer/DrupalPractice/Sniffs/General/VariableNameSniff.php
index 93eebbff404f05dfcde5f6012049f05563dd9613..ecd4512a0366346fcbe7108244e6efc467dd4e4a 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/General/VariableNameSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/General/VariableNameSniff.php
@@ -28,7 +28,7 @@ class VariableNameSniff extends FunctionCall
/**
* Returns an array of function names this test wants to listen for.
*
- * @return array
+ * @return array<string>
*/
public function registerFunctionNames()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/InfoFiles/CoreVersionRequirementSniff.php b/coder_sniffer/DrupalPractice/Sniffs/InfoFiles/CoreVersionRequirementSniff.php
index d356bfda71926154692f86f45daca1137aaaabdc..dfe9a1495a28d10bc52ab615a545592db1810905 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/InfoFiles/CoreVersionRequirementSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/InfoFiles/CoreVersionRequirementSniff.php
@@ -29,7 +29,7 @@ class CoreVersionRequirementSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/InfoFiles/NamespacedDependencySniff.php b/coder_sniffer/DrupalPractice/Sniffs/InfoFiles/NamespacedDependencySniff.php
index cd759b6f8e276f56d03529c31a7645629052a6a4..441c8da2206b10e0884b82c6e13144d0ae18d62a 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/InfoFiles/NamespacedDependencySniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/InfoFiles/NamespacedDependencySniff.php
@@ -29,7 +29,7 @@ class NamespacedDependencySniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Objects/GlobalClassSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Objects/GlobalClassSniff.php
index 1c362e313ec224daf6dc00890a7864d9487d90e4..94785d30a4a7c434b91e0e0af1e2a5814a5a85ca 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Objects/GlobalClassSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Objects/GlobalClassSniff.php
@@ -42,7 +42,7 @@ class GlobalClassSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Objects/GlobalDrupalSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Objects/GlobalDrupalSniff.php
index 77108fe9149375d508080a876f1c18d9c5ea3709..4148ba8ef579570bcf767ce4e07b94f2279db5e9 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Objects/GlobalDrupalSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Objects/GlobalDrupalSniff.php
@@ -47,7 +47,7 @@ class GlobalDrupalSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Variables/GetRequestDataSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Variables/GetRequestDataSniff.php
index 72449fc3eb9f38c5e0bf52925d3f66275f7e0444..2e1b4bb4ef4fba1bef330cfde9b1308819603580 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Variables/GetRequestDataSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Variables/GetRequestDataSniff.php
@@ -31,7 +31,7 @@ class GetRequestDataSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Sniffs/Yaml/RoutingAccessSniff.php b/coder_sniffer/DrupalPractice/Sniffs/Yaml/RoutingAccessSniff.php
index 1ef54b7ae0602cb6c8b9712ff63be64efa65ecbf..c9a701a793f23a07dc4912b98906ce93ac74a9b0 100644
--- a/coder_sniffer/DrupalPractice/Sniffs/Yaml/RoutingAccessSniff.php
+++ b/coder_sniffer/DrupalPractice/Sniffs/Yaml/RoutingAccessSniff.php
@@ -29,7 +29,7 @@ class RoutingAccessSniff implements Sniff
/**
* Returns an array of tokens this test wants to listen for.
*
- * @return array
+ * @return array<int|string>
*/
public function register()
{
diff --git a/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/AccessHookMenuUnitTest.php b/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/AccessHookMenuUnitTest.php
index 0d6e83f875a6acb8de4bf6558a926449d9542dd8..66bb341080f5c432c5a4a14b37c077ad2c92f44e 100644
--- a/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/AccessHookMenuUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/AccessHookMenuUnitTest.php
@@ -53,9 +53,9 @@ class AccessHookMenuUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [__DIR__.'/test.module'];
diff --git a/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/FormAlterDocUnitTest.php b/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/FormAlterDocUnitTest.php
index 8a3231374f7a5913ce2c30f180ff4fbc145b814d..c39549eb43e4d415c19de8819720e46d07fc4f75 100644
--- a/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/FormAlterDocUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/FormAlterDocUnitTest.php
@@ -47,9 +47,9 @@ class FormAlterDocUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [__DIR__.'/test.module'];
diff --git a/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/HookInitCssUnitTest.php b/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/HookInitCssUnitTest.php
index 9f59e70c91d05ee101023d887357f8f564245de5..c0c8e8b94808712335aa261bae308a01ea4096c0 100644
--- a/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/HookInitCssUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/HookInitCssUnitTest.php
@@ -56,9 +56,9 @@ class HookInitCssUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [__DIR__.'/test.module'];
diff --git a/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/InstallTUnitTest.php b/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/InstallTUnitTest.php
index 72ac8bf8861ad5397434fe32822baf07e2feb71c..4017da720d26f2518ac269b2f5696f776ed24847 100644
--- a/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/InstallTUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/FunctionDefinitions/InstallTUnitTest.php
@@ -53,9 +53,9 @@ class InstallTUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [__DIR__.'/test.install'];
diff --git a/coder_sniffer/DrupalPractice/Test/InfoFiles/CoreVersionRequirementUnitTest.php b/coder_sniffer/DrupalPractice/Test/InfoFiles/CoreVersionRequirementUnitTest.php
index 861e1308f0f6daf348bf5e2ee0133df5882a9d73..03b8b6d01780ae62caf42907c594aea2a024cfaf 100644
--- a/coder_sniffer/DrupalPractice/Test/InfoFiles/CoreVersionRequirementUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/InfoFiles/CoreVersionRequirementUnitTest.php
@@ -54,9 +54,9 @@ class CoreVersionRequirementUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/core_version.info.yml',
diff --git a/coder_sniffer/DrupalPractice/Test/InfoFiles/NamespacedDependencyUnitTest.php b/coder_sniffer/DrupalPractice/Test/InfoFiles/NamespacedDependencyUnitTest.php
index 660bd9dff57791fe7c6321e60b17b68300c83748..fac67b20c8e6835a3a4bb4667ea82c65ad02ca69 100644
--- a/coder_sniffer/DrupalPractice/Test/InfoFiles/NamespacedDependencyUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/InfoFiles/NamespacedDependencyUnitTest.php
@@ -58,9 +58,9 @@ class NamespacedDependencyUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/dependencies_test.info.yml',
diff --git a/coder_sniffer/DrupalPractice/Test/Objects/GlobalClassUnitTest.php b/coder_sniffer/DrupalPractice/Test/Objects/GlobalClassUnitTest.php
index d8e52bf8ba5f101421ff563ca05a6380ad6c778a..170ed6d7055c022dafd3f0718abceb635e1d8ebc 100644
--- a/coder_sniffer/DrupalPractice/Test/Objects/GlobalClassUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/Objects/GlobalClassUnitTest.php
@@ -56,9 +56,9 @@ class GlobalClassUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/GlobalClassUnitTest.inc',
diff --git a/coder_sniffer/DrupalPractice/Test/Objects/GlobalDrupalUnitTest.php b/coder_sniffer/DrupalPractice/Test/Objects/GlobalDrupalUnitTest.php
index 8f50e1dabf7acc9a1d344d7eca088ee18cf9765f..346e59de321a2e7403189544eceb22b80bc14035 100644
--- a/coder_sniffer/DrupalPractice/Test/Objects/GlobalDrupalUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/Objects/GlobalDrupalUnitTest.php
@@ -56,9 +56,9 @@ class GlobalDrupalUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/GlobalDrupalUnitTest.inc',
diff --git a/coder_sniffer/DrupalPractice/Test/Objects/GlobalFunctionUnitTest.php b/coder_sniffer/DrupalPractice/Test/Objects/GlobalFunctionUnitTest.php
index fdb120b0ff17d208f616b90e2c4024b1b230576b..7c4f775b99d087348d592ad162cb911a6a3023f1 100644
--- a/coder_sniffer/DrupalPractice/Test/Objects/GlobalFunctionUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/Objects/GlobalFunctionUnitTest.php
@@ -67,9 +67,9 @@ class GlobalFunctionUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [
__DIR__.'/drupal8/DeclareT.php',
diff --git a/coder_sniffer/DrupalPractice/Test/ProjectDetection/ProjectUnitTest.php b/coder_sniffer/DrupalPractice/Test/ProjectDetection/ProjectUnitTest.php
index 9d50ac641faf505654467c3d10c60d31f987440d..0e18db58d0893a24e6d15ed7428232cb66866c94 100644
--- a/coder_sniffer/DrupalPractice/Test/ProjectDetection/ProjectUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/ProjectDetection/ProjectUnitTest.php
@@ -90,9 +90,9 @@ class ProjectUnitTest extends TestCase
/**
* Data provider for testCoreVersion().
*
- * @return array
+ * @return array<int, array<int, string|int>>
*/
- public function coreVersionProvider()
+ public function coreVersionProvider(): array
{
return [
[
@@ -144,12 +144,12 @@ class ProjectUnitTest extends TestCase
/**
* Data provider for testProjectNameDetection().
*
- * @return array
+ * @return array<int, array<int, string|false>>
* An array of test cases, each test case an array with two elements:
* - The filename to check.
* - The expected project name.
*/
- public function projectNameDetectionProvider()
+ public function projectNameDetectionProvider(): array
{
return [
[
diff --git a/coder_sniffer/DrupalPractice/Test/Yaml/RoutingAccessUnitTest.php b/coder_sniffer/DrupalPractice/Test/Yaml/RoutingAccessUnitTest.php
index 22dfe2ea9dc7d45473dd34cbd2aea92edec149c3..ffc0eba97605d8ce2fe4d4e1eb71b8a0f93da584 100644
--- a/coder_sniffer/DrupalPractice/Test/Yaml/RoutingAccessUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/Yaml/RoutingAccessUnitTest.php
@@ -13,9 +13,9 @@ class RoutingAccessUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [__DIR__.'/routing_access_test.routing.yml'];
diff --git a/coder_sniffer/DrupalPractice/Test/good/GoodUnitTest.php b/coder_sniffer/DrupalPractice/Test/good/GoodUnitTest.php
index d347263336e1c88e7a1eec63b766fdd789930a48..508abda7075d15dda3a3847a27bd0b424e585713 100644
--- a/coder_sniffer/DrupalPractice/Test/good/GoodUnitTest.php
+++ b/coder_sniffer/DrupalPractice/Test/good/GoodUnitTest.php
@@ -53,9 +53,9 @@ class GoodUnitTest extends CoderSniffUnitTest
*
* @param string $testFileBase The base path that the unit tests files will have.
*
- * @return array The list of test files.
+ * @return array<string>
*/
- protected function getTestFiles($testFileBase)
+ protected function getTestFiles($testFileBase): array
{
return [__DIR__.'/good.php'];
diff --git a/phpstan.neon b/phpstan.neon
index 77f84fdd1e49a71c8e3ff45f6f9241f2964c9d34..66973316cec14e32affc7238fe63e79363cd73ef 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,5 +1,5 @@
parameters:
- level: 4
+ level: 6
paths:
- coder_sniffer
excludes_analyse:
@@ -91,3 +91,11 @@ parameters:
# evaluate to false. https://github.com/phpstan/phpstan/issues/2822
- '~^Strict comparison using === between .+ and .+ will always evaluate to false\.$~'
- "#^Result of \\|\\| is always false\\.$#"
+ # Data type declaration in PHPCS is not correct, see
+ # https://github.com/squizlabs/PHP_CodeSniffer/pull/2809
+ -
+ message: "#^Parameter \\#2 \\$ignore of method PHP_CodeSniffer\\\\Files\\\\File\\:\\:findStartOfStatement\\(\\) expects array\\|int\\|null, string given\\.$#"
+ count: 2
+ path: coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeIndentSniff.php
+ # We support PHP 7.0 which does not have the "void" return type hint.
+ - '#^Method .+ has no return typehint specified\.$#'