From 3d05983b0b8faa03e383386709120f3c8f96c11e Mon Sep 17 00:00:00 2001
From: Klaus Purer <klaus.purer@protonmail.ch>
Date: Fri, 10 Jan 2020 12:49:07 +0100
Subject: [PATCH] refactor(phpstan): Fix PHPStan reports for level 5 and 6
(#3104477)
---
coder_sniffer/Drupal/Sniffs/Arrays/ArraySniff.php | 2 +-
.../Sniffs/CSS/ClassDefinitionNameSpacingSniff.php | 2 +-
.../Drupal/Sniffs/CSS/ColourDefinitionSniff.php | 4 ++--
.../Drupal/Sniffs/Classes/ClassCreateInstanceSniff.php | 2 +-
.../Drupal/Sniffs/Classes/ClassDeclarationSniff.php | 2 +-
.../Drupal/Sniffs/Classes/ClassFileNameSniff.php | 2 +-
.../Sniffs/Classes/FullyQualifiedNamespaceSniff.php | 2 +-
.../Drupal/Sniffs/Classes/InterfaceNameSniff.php | 2 +-
.../Drupal/Sniffs/Classes/UnusedUseStatementSniff.php | 2 +-
.../Drupal/Sniffs/Classes/UseLeadingBackslashSniff.php | 2 +-
.../Drupal/Sniffs/Commenting/ClassCommentSniff.php | 2 +-
.../Sniffs/Commenting/DataTypeNamespaceSniff.php | 2 +-
.../Drupal/Sniffs/Commenting/DeprecatedSniff.php | 2 +-
.../Sniffs/Commenting/DocCommentAlignmentSniff.php | 2 +-
.../Drupal/Sniffs/Commenting/DocCommentSniff.php | 4 ++--
.../Drupal/Sniffs/Commenting/DocCommentStarSniff.php | 2 +-
.../Drupal/Sniffs/Commenting/FileCommentSniff.php | 4 ++--
.../Drupal/Sniffs/Commenting/FunctionCommentSniff.php | 6 +++---
.../Sniffs/Commenting/GenderNeutralCommentSniff.php | 2 +-
.../Drupal/Sniffs/Commenting/HookCommentSniff.php | 2 +-
.../Drupal/Sniffs/Commenting/InlineCommentSniff.php | 4 ++--
.../Sniffs/Commenting/PostStatementCommentSniff.php | 4 ++--
.../Sniffs/ControlStructures/ControlSignatureSniff.php | 2 +-
.../Drupal/Sniffs/ControlStructures/ElseIfSniff.php | 2 +-
.../Drupal/Sniffs/Files/EndFileNewlineSniff.php | 6 +++---
.../Drupal/Sniffs/Files/FileEncodingSniff.php | 4 ++--
coder_sniffer/Drupal/Sniffs/Files/LineLengthSniff.php | 2 +-
.../Drupal/Sniffs/Files/TxtFileLineLengthSniff.php | 2 +-
.../Sniffs/Formatting/MultiLineAssignmentSniff.php | 4 ++--
.../Drupal/Sniffs/Formatting/SpaceInlineIfSniff.php | 2 +-
.../Sniffs/Formatting/SpaceUnaryOperatorSniff.php | 2 +-
.../Sniffs/Functions/DiscouragedFunctionsSniff.php | 2 +-
.../Sniffs/Functions/FunctionDeclarationSniff.php | 2 +-
.../Drupal/Sniffs/InfoFiles/AutoAddedKeysSniff.php | 2 +-
.../Drupal/Sniffs/InfoFiles/ClassFilesSniff.php | 4 ++--
.../Drupal/Sniffs/InfoFiles/DuplicateEntrySniff.php | 4 ++--
.../Drupal/Sniffs/InfoFiles/RequiredSniff.php | 2 +-
.../Sniffs/NamingConventions/ValidClassNameSniff.php | 2 +-
.../Sniffs/NamingConventions/ValidGlobalSniff.php | 4 ++--
.../Drupal/Sniffs/Semantics/ConstantNameSniff.php | 2 +-
.../Drupal/Sniffs/Semantics/FunctionAliasSniff.php | 4 ++--
coder_sniffer/Drupal/Sniffs/Semantics/FunctionCall.php | 4 ++--
.../Drupal/Sniffs/Semantics/FunctionDefinition.php | 2 +-
.../Drupal/Sniffs/Semantics/FunctionTSniff.php | 2 +-
.../Sniffs/Semantics/FunctionTriggerErrorSniff.php | 2 +-
.../Drupal/Sniffs/Semantics/FunctionWatchdogSniff.php | 2 +-
.../Sniffs/Semantics/LStringTranslatableSniff.php | 2 +-
.../Drupal/Sniffs/Semantics/PregSecuritySniff.php | 2 +-
.../Drupal/Sniffs/Semantics/RemoteAddressSniff.php | 2 +-
.../Sniffs/WhiteSpace/CloseBracketSpacingSniff.php | 4 ++--
coder_sniffer/Drupal/Sniffs/WhiteSpace/CommaSniff.php | 2 +-
.../Drupal/Sniffs/WhiteSpace/EmptyLinesSniff.php | 4 ++--
.../Drupal/Sniffs/WhiteSpace/NamespaceSniff.php | 2 +-
.../Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php | 2 +-
.../Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php | 2 +-
.../Sniffs/WhiteSpace/OpenBracketSpacingSniff.php | 4 ++--
.../Drupal/Sniffs/WhiteSpace/OpenTagNewlineSniff.php | 2 +-
.../Sniffs/WhiteSpace/ScopeClosingBraceSniff.php | 2 +-
.../Drupal/Sniffs/WhiteSpace/ScopeIndentSniff.php | 8 ++++----
.../Test/Arrays/DisallowLongArraySyntaxUnitTest.php | 4 ++--
.../Drupal/Test/Classes/ClassFileNameUnitTest.php | 4 ++--
.../Test/Classes/FullyQualifiedNamespaceUnitTest.php | 4 ++--
coder_sniffer/Drupal/Test/CoderSniffUnitTest.php | 8 ++++----
.../Drupal/Test/InfoFiles/AutoAddedKeysUnitTest.php | 4 ++--
.../Drupal/Test/InfoFiles/ClassFilesUnitTest.php | 4 ++--
.../Drupal/Test/InfoFiles/DuplicateEntryUnitTest.php | 4 ++--
.../Drupal/Test/Semantics/ConstantNameUnitTest.php | 4 ++--
coder_sniffer/Drupal/Test/bad/BadUnitTest.php | 4 ++--
coder_sniffer/Drupal/Test/good/GoodUnitTest.php | 4 ++--
.../Sniffs/CodeAnalysis/VariableAnalysisSniff.php | 2 +-
.../Sniffs/Commenting/AuthorTagSniff.php | 2 +-
.../Sniffs/Commenting/CommentEmptyLineSniff.php | 2 +-
.../Sniffs/Commenting/ExpectedExceptionSniff.php | 2 +-
.../Sniffs/Constants/GlobalConstantSniff.php | 2 +-
.../Sniffs/Constants/GlobalDefineSniff.php | 2 +-
.../Sniffs/FunctionCalls/CheckPlainSniff.php | 2 +-
.../Sniffs/FunctionCalls/CurlSslVerifierSniff.php | 2 +-
.../Sniffs/FunctionCalls/DbQuerySniff.php | 2 +-
.../Sniffs/FunctionCalls/DbSelectBracesSniff.php | 2 +-
.../Sniffs/FunctionCalls/DefaultValueSanitizeSniff.php | 2 +-
.../Sniffs/FunctionCalls/FormErrorTSniff.php | 2 +-
.../Sniffs/FunctionCalls/LCheckPlainSniff.php | 2 +-
.../Sniffs/FunctionCalls/MessageTSniff.php | 2 +-
.../Sniffs/FunctionCalls/TCheckPlainSniff.php | 2 +-
.../DrupalPractice/Sniffs/FunctionCalls/ThemeSniff.php | 2 +-
.../Sniffs/FunctionCalls/VariableSetSanitizeSniff.php | 2 +-
.../DrupalPractice/Sniffs/General/ClassNameSniff.php | 2 +-
.../Sniffs/General/DescriptionTSniff.php | 2 +-
.../Sniffs/General/FormStateInputSniff.php | 2 +-
.../Sniffs/General/LanguageNoneSniff.php | 2 +-
.../DrupalPractice/Sniffs/General/OptionsTSniff.php | 2 +-
.../Sniffs/General/VariableNameSniff.php | 2 +-
.../Sniffs/InfoFiles/CoreVersionRequirementSniff.php | 2 +-
.../Sniffs/InfoFiles/NamespacedDependencySniff.php | 2 +-
.../DrupalPractice/Sniffs/Objects/GlobalClassSniff.php | 2 +-
.../Sniffs/Objects/GlobalDrupalSniff.php | 2 +-
.../Sniffs/Variables/GetRequestDataSniff.php | 2 +-
.../DrupalPractice/Sniffs/Yaml/RoutingAccessSniff.php | 2 +-
.../FunctionDefinitions/AccessHookMenuUnitTest.php | 4 ++--
.../Test/FunctionDefinitions/FormAlterDocUnitTest.php | 4 ++--
.../Test/FunctionDefinitions/HookInitCssUnitTest.php | 4 ++--
.../Test/FunctionDefinitions/InstallTUnitTest.php | 4 ++--
.../Test/InfoFiles/CoreVersionRequirementUnitTest.php | 4 ++--
.../Test/InfoFiles/NamespacedDependencyUnitTest.php | 4 ++--
.../Test/Objects/GlobalClassUnitTest.php | 4 ++--
.../Test/Objects/GlobalDrupalUnitTest.php | 4 ++--
.../Test/Objects/GlobalFunctionUnitTest.php | 4 ++--
.../Test/ProjectDetection/ProjectUnitTest.php | 8 ++++----
.../DrupalPractice/Test/Yaml/RoutingAccessUnitTest.php | 4 ++--
.../DrupalPractice/Test/good/GoodUnitTest.php | 4 ++--
phpstan.neon | 10 +++++++++-
111 files changed, 167 insertions(+), 159 deletions(-)
diff --git a/coder_sniffer/Drupal/Sniffs/Arrays/ArraySniff.php b/coder_sniffer/Drupal/Sniffs/Arrays/ArraySniff.php
index f0a6f350..f911571c 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 996d5ed5..f66bea5b 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 8f622bfc..941fbdfb 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 febe0110..4c2dc082 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 b3a1da81..8e0b5b66 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 aa5b02c1..23ee7545 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 ba81c73d..4dc885be 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 689f4ae1..a9c6aeda 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 7964d3a4..7b325a23 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 4979210b..1b0f1013 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 8eaca41d..7998d512 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 a6c13b6e..1644ee2c 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 f0c1bf93..637e3fc8 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 0986fb6d..c455f66f 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 16c0738c..d82686d4 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 b3c99db0..1d0a8e3f 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 f2196eb0..dd34fa72 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 20819a6a..bc089266 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 324ada5a..cb1f41d9 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 ba5d4e24..8d6ac34e 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 69aaffd5..b398f3a8 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 ea16f665..a6a199b7 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 8b651727..d1738546 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 6455a070..4d41827d 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 b131bbc1..aa47b82f 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 982a6daa..983365d5 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 a812bce5..73911969 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 c904c182..66f93c83 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 0ad7c73c..b30b9ea3 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 5cd20242..e9f4ac04 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 ada0c0a9..ef23bfc6 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 30bb1b68..df8f342d 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 a3cea5c7..b4cdcdd0 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 2dc4665f..571baed6 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 e0a7465d..60c142bf 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 5be53873..364b3e20 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 b4bc0262..3d1d9223 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 0eb621fd..bd367689 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 730189f1..14fcbc75 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 2e3f7c39..d04865fd 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 3fa1f3c1..bafc3c60 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 cf6d290a..27c35a48 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 b285083d..31be9fb6 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 9dd10ea7..4da9955f 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 e8e295ac..0f1b0388 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 1602e40c..322ae1a6 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 7ae3d58e..d664a47d 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 e6e5c37d..cfc822a7 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 3cd415e4..754269d9 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 5ba50d78..752e618e 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 65b63f9e..f1644271 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 7be7f8c3..341c27e9 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 b85b94c1..bbc3e56f 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 553f62c7..cc2244e2 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 bd34f3f5..3810a0db 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 0bb9c254..74e58382 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 c5a8339b..74538a9b 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 b58c2ae5..db38b8ef 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 bcef42bd..4f99ee73 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 4040d705..ef840c5d 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 373194cb..7cc4349a 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 0286035a..cd2be321 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 3e0f9887..0ab0a543 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 1acdccac..7ee8e65c 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 a892a4ed..be90e700 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 77298348..f31cf43a 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 c10bc82d..26f8c2fb 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 4d6a121e..67fc1114 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 ac75e10c..7702c925 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 31167444..286bbce2 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 05621acf..6a26f151 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 f2c2bf6c..0ac3f4ed 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 61a831b2..81240893 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 5013691c..4652c92b 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 7c10d9ac..4cf6e11f 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 ecc07e72..cde3312d 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 5fa07cfc..36daee35 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 a8e66bb4..9c62807a 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 beeee36f..32b690a8 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 f83c55f8..bdb917a9 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 46645429..a60e263e 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 143968c2..ac0dfbbf 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 429b25dd..a04de320 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 5e0fed34..73ece1a2 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 0d46528d..3675d117 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 fd3101be..abc32162 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 7949b60e..3a7eb98f 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 4a2b4326..43580e93 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 8400048e..0d8cee7f 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 5f123a47..d1fa525b 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 d30b7ae2..259641df 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 93eebbff..ecd4512a 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 d356bfda..dfe9a149 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 cd759b6f..441c8da2 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 1c362e31..94785d30 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 77108fe9..4148ba8e 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 72449fc3..2e1b4bb4 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 1ef54b7a..c9a701a7 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 0d6e83f8..66bb3410 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 8a323137..c39549eb 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 9f59e70c..c0c8e8b9 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 72ac8bf8..4017da72 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 861e1308..03b8b6d0 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 660bd9df..fac67b20 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 d8e52bf8..170ed6d7 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 8f50e1da..346e59de 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 fdb120b0..7c4f775b 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 9d50ac64..0e18db58 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 22dfe2ea..ffc0eba9 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 d3472633..508abda7 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 77f84fdd..66973316 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\.$#'
--
GitLab