Merge pull request #934 from PHPCSStandards/feature/generic-lower-uppercaseconstants-support-dnf-types

PHP 8.2 | Generic/[Lower|Upper]CaseConstant: bug fix - ignore DNF property types

Author: jrfnl

src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php

@@ -43,21 +43,23 @@ class LowerCaseConstantSniff implements Sniff
      * @var array<int|string, int|string>
      */
     private $propertyTypeTokens = [
-        T_CALLABLE             => T_CALLABLE,
-        T_SELF                 => T_SELF,
-        T_PARENT               => T_PARENT,
-        T_FALSE                => T_FALSE,
-        T_TRUE                 => T_TRUE,
-        T_NULL                 => T_NULL,
-        T_STRING               => T_STRING,
-        T_NAME_QUALIFIED       => T_NAME_QUALIFIED,
-        T_NAME_FULLY_QUALIFIED => T_NAME_FULLY_QUALIFIED,
-        T_NAME_RELATIVE        => T_NAME_RELATIVE,
-        T_NS_SEPARATOR         => T_NS_SEPARATOR,
-        T_NAMESPACE            => T_NAMESPACE,
-        T_TYPE_UNION           => T_TYPE_UNION,
-        T_TYPE_INTERSECTION    => T_TYPE_INTERSECTION,
-        T_NULLABLE             => T_NULLABLE,
+        T_CALLABLE               => T_CALLABLE,
+        T_SELF                   => T_SELF,
+        T_PARENT                 => T_PARENT,
+        T_FALSE                  => T_FALSE,
+        T_TRUE                   => T_TRUE,
+        T_NULL                   => T_NULL,
+        T_STRING                 => T_STRING,
+        T_NAME_QUALIFIED         => T_NAME_QUALIFIED,
+        T_NAME_FULLY_QUALIFIED   => T_NAME_FULLY_QUALIFIED,
+        T_NAME_RELATIVE          => T_NAME_RELATIVE,
+        T_NS_SEPARATOR           => T_NS_SEPARATOR,
+        T_NAMESPACE              => T_NAMESPACE,
+        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_NULLABLE               => T_NULLABLE,
     ];
 
 

src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.1.inc

@@ -151,3 +151,7 @@ class TypedConstants {
 
 // Global constants can not be typed.
 const MYCONST = TRUE;
+
+class SkipOverPHP82DNFTypes {
+    protected (\FullyQualified&Partially\Qualified)|TRUE $propertyC;
+}

src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.1.inc.fixed

@@ -151,3 +151,7 @@ class TypedConstants {
 
 // Global constants can not be typed.
 const MYCONST = true;
+
+class SkipOverPHP82DNFTypes {
+    protected (\FullyQualified&Partially\Qualified)|TRUE $propertyC;
+}

src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc

@@ -96,3 +96,7 @@ class TypedThings {
 }
 
 $cl = function (int|false $param = null, Type|null $obj = new MyObj(false)) : string|false|null {};
+
+class SkipOverPHP82DNFTypes {
+    protected (\FullyQualified&Partially\Qualified)|false $propertyC;
+}

src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc.fixed

@@ -96,3 +96,7 @@ class TypedThings {
 }
 
 $cl = function (int|false $param = NULL, Type|null $obj = new MyObj(FALSE)) : string|false|null {};
+
+class SkipOverPHP82DNFTypes {
+    protected (\FullyQualified&Partially\Qualified)|false $propertyC;
+}