PSR12/NullableTypeDeclaration: fix sniff to work with the PHP 8 identifier tokens

Includes minor update to pre-existing tests to ensure all identifier name types are covered.

Author: jrfnl

src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php

@@ -21,15 +21,17 @@ class NullableTypeDeclarationSniff implements Sniff
      * @var array
      */
     private $validTokens = [
-        T_STRING       => true,
-        T_NS_SEPARATOR => true,
-        T_CALLABLE     => true,
-        T_SELF         => true,
-        T_PARENT       => true,
-        T_STATIC       => true,
-        T_NULL         => true,
-        T_FALSE        => true,
-        T_TRUE         => true,
+        T_STRING               => true,
+        T_NAME_QUALIFIED       => true,
+        T_NAME_FULLY_QUALIFIED => true,
+        T_NAME_RELATIVE        => true,
+        T_CALLABLE             => true,
+        T_SELF                 => true,
+        T_PARENT               => true,
+        T_STATIC               => true,
+        T_NULL                 => true,
+        T_FALSE                => true,
+        T_TRUE                 => true,
     ];
 
 

src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.inc

@@ -8,10 +8,10 @@ class MyClass {
     {
     }
 
-    public function validWithFQN(
+    public function validWithQualifiedNames(
         ?\MyNameSpace\MyArray $array = null,
-        ?\MyNameSpace\MyObject $object
-    ): ?\MyNameSpace\MyObject
+        ?MyNameSpace\MyObject $object
+    ): ?namespace\MyObject
     {
     }
 
@@ -26,10 +26,10 @@ class MyClass {
     {
     }
 
-    public function invalidWithFQNTooMuchWhitespace(
+    public function invalidWithQualifiedNamesTooMuchWhitespace(
         ? \MyNameSpace\MyArray $array = null,
-        ? \MyNameSpace\MyObject
-    ):? \MyNameSpace\MyObject
+        ? MyNameSpace\MyObject
+    ):? namespace\MyObject
     {
     }
 }

src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.inc.fixed

@@ -8,10 +8,10 @@ class MyClass {
     {
     }
 
-    public function validWithFQN(
+    public function validWithQualifiedNames(
         ?\MyNameSpace\MyArray $array = null,
-        ?\MyNameSpace\MyObject $object
-    ): ?\MyNameSpace\MyObject
+        ?MyNameSpace\MyObject $object
+    ): ?namespace\MyObject
     {
     }
 
@@ -26,10 +26,10 @@ class MyClass {
     {
     }
 
-    public function invalidWithFQNTooMuchWhitespace(
+    public function invalidWithQualifiedNamesTooMuchWhitespace(
         ?\MyNameSpace\MyArray $array = null,
-        ?\MyNameSpace\MyObject
-    ):?\MyNameSpace\MyObject
+        ?MyNameSpace\MyObject
+    ):?namespace\MyObject
     {
     }
 }