Merge pull request #940 from PHPCSStandards/feature/squiz-variablecomment-allow-for-dnf-types

PHP 8.2 | Squiz/VariableComment: bug fix - allow for DNF typed properties

Author: jrfnl

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

@@ -30,24 +30,26 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $ignore = [
-            T_PUBLIC            => T_PUBLIC,
-            T_PRIVATE           => T_PRIVATE,
-            T_PROTECTED         => T_PROTECTED,
-            T_VAR               => T_VAR,
-            T_STATIC            => T_STATIC,
-            T_READONLY          => T_READONLY,
-            T_WHITESPACE        => T_WHITESPACE,
-            T_STRING            => T_STRING,
-            T_NS_SEPARATOR      => T_NS_SEPARATOR,
-            T_NAMESPACE         => T_NAMESPACE,
-            T_NULLABLE          => T_NULLABLE,
-            T_TYPE_UNION        => T_TYPE_UNION,
-            T_TYPE_INTERSECTION => T_TYPE_INTERSECTION,
-            T_NULL              => T_NULL,
-            T_TRUE              => T_TRUE,
-            T_FALSE             => T_FALSE,
-            T_SELF              => T_SELF,
-            T_PARENT            => T_PARENT,
+            T_PUBLIC                 => T_PUBLIC,
+            T_PRIVATE                => T_PRIVATE,
+            T_PROTECTED              => T_PROTECTED,
+            T_VAR                    => T_VAR,
+            T_STATIC                 => T_STATIC,
+            T_READONLY               => T_READONLY,
+            T_WHITESPACE             => T_WHITESPACE,
+            T_STRING                 => T_STRING,
+            T_NS_SEPARATOR           => T_NS_SEPARATOR,
+            T_NAMESPACE              => T_NAMESPACE,
+            T_NULLABLE               => T_NULLABLE,
+            T_TYPE_UNION             => T_TYPE_UNION,
+            T_TYPE_INTERSECTION      => T_TYPE_INTERSECTION,
+            T_TYPE_OPEN_PARENTHESIS  => T_TYPE_OPEN_PARENTHESIS,
+            T_TYPE_CLOSE_PARENTHESIS => T_TYPE_CLOSE_PARENTHESIS,
+            T_NULL                   => T_NULL,
+            T_TRUE                   => T_TRUE,
+            T_FALSE                  => T_FALSE,
+            T_SELF                   => T_SELF,
+            T_PARENT                 => T_PARENT,
         ];
 
         for ($commentEnd = ($stackPtr - 1); $commentEnd >= 0; $commentEnd--) {

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

@@ -454,3 +454,11 @@ class MoreMissingButSupportedTypes
      */
     private namespace\SomeClass $variableName;
 }
+
+class DNFTypes
+{
+    /**
+     * @var mixed
+     */
+    private (\Iterator&namespace\Countable)|false|null $variableName;
+}

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

@@ -454,3 +454,11 @@ class MoreMissingButSupportedTypes
      */
     private namespace\SomeClass $variableName;
 }
+
+class DNFTypes
+{
+    /**
+     * @var mixed
+     */
+    private (\Iterator&namespace\Countable)|false|null $variableName;
+}