Include NullSafe operator in calculation for Cyclomatic Complexity Sniff, with appropriate unit tests

Author: MarkBaker

src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php

@@ -71,18 +71,19 @@ public function process(File $phpcsFile, $stackPtr)
 
         // Predicate nodes for PHP.
         $find = [
-            T_CASE           => true,
-            T_DEFAULT        => true,
-            T_CATCH          => true,
-            T_IF             => true,
-            T_FOR            => true,
-            T_FOREACH        => true,
-            T_WHILE          => true,
-            T_ELSEIF         => true,
-            T_INLINE_THEN    => true,
-            T_COALESCE       => true,
-            T_COALESCE_EQUAL => true,
-            T_MATCH_ARROW    => true,
+            T_CASE                     => true,
+            T_DEFAULT                  => true,
+            T_CATCH                    => true,
+            T_IF                       => true,
+            T_FOR                      => true,
+            T_FOREACH                  => true,
+            T_WHILE                    => true,
+            T_ELSEIF                   => true,
+            T_INLINE_THEN              => true,
+            T_COALESCE                 => true,
+            T_COALESCE_EQUAL           => true,
+            T_MATCH_ARROW              => true,
+            T_NULLSAFE_OBJECT_OPERATOR => true,
         ];
 
         $complexity = 1;

src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.inc

@@ -433,4 +433,22 @@ function complexityFourteenWithMatch()
     };
 }
 
+
+function complexitySevenWithNullSafeOperator()
+{
+    $foo = $object1->getX()?->getY()?->getZ();
+    $bar = $object2->getX()?->getY()?->getZ();
+    $baz = $object3->getX()?->getY()?->getZ();
+}
+
+
+function complexityElevenWithNullSafeOperator()
+{
+    $foo = $object1->getX()?->getY()?->getZ();
+    $bar = $object2->getX()?->getY()?->getZ();
+    $baz = $object3->getX()?->getY()?->getZ();
+    $bacon = $object4->getX()?->getY()?->getZ();
+    $bits = $object5->getX()?->getY()?->getZ();
+}
+
 ?>

src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php

@@ -49,6 +49,7 @@ public function getWarningList()
             333 => 1,
             381 => 1,
             417 => 1,
+            445 => 1,
         ];
 
     }//end getWarningList()