Skip to content

Commit 21a7d14

Browse files
committed
Squiz/VariableComment: fix sniff to work with the PHP 8 identifier tokens
Includes extra unit test covering the change in so far it wasn't already covered.
1 parent 1529566 commit 21a7d14

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,15 @@ public function __construct()
4141
public function processMemberVar(File $phpcsFile, $stackPtr)
4242
{
4343
$tokens = $phpcsFile->getTokens();
44-
$ignore = [
45-
T_PUBLIC => T_PUBLIC,
46-
T_PRIVATE => T_PRIVATE,
47-
T_PROTECTED => T_PROTECTED,
44+
45+
$ignore = Tokens::$scopeModifiers;
46+
$ignore += Tokens::$nameTokens;
47+
$ignore += [
4848
T_VAR => T_VAR,
4949
T_STATIC => T_STATIC,
5050
T_READONLY => T_READONLY,
5151
T_FINAL => T_FINAL,
5252
T_WHITESPACE => T_WHITESPACE,
53-
T_STRING => T_STRING,
54-
T_NS_SEPARATOR => T_NS_SEPARATOR,
55-
T_NAMESPACE => T_NAMESPACE,
5653
T_NULLABLE => T_NULLABLE,
5754
T_TYPE_UNION => T_TYPE_UNION,
5855
T_TYPE_INTERSECTION => T_TYPE_INTERSECTION,

src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,13 @@ class MoreMissingButSupportedTypes
453453
* @var SomeClass
454454
*/
455455
private namespace\SomeClass $variableName;
456+
457+
public static ?\Folder\ClassName $FQNTypeDecl_noComment = null;
458+
459+
/**
460+
* @var \Folder\ClassName|null
461+
*/
462+
public ?\Folder\ClassName $FQNTypeDecl_withComment = null;
456463
}
457464

458465
class DNFTypes

src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.inc.fixed

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,13 @@ class MoreMissingButSupportedTypes
453453
* @var SomeClass
454454
*/
455455
private namespace\SomeClass $variableName;
456+
457+
public static ?\Folder\ClassName $FQNTypeDecl_noComment = null;
458+
459+
/**
460+
* @var \Folder\ClassName|null
461+
*/
462+
public ?\Folder\ClassName $FQNTypeDecl_withComment = null;
456463
}
457464

458465
class DNFTypes

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public function getErrorList()
6565
364 => 1,
6666
399 => 1,
6767
403 => 1,
68+
457 => 1,
6869
];
6970

7071
}//end getErrorList()

0 commit comments

Comments
 (0)