Fix MultiDirnameRector (#6796)

Author: carlos-granados

rules-tests/Php70/Rector/FuncCall/MultiDirnameRector/Fixture/fixture.php.inc

@@ -7,16 +7,6 @@ function multiDirname()
     dirname(dirname($path));
 
     new dirname(dirname(dirname($path)));
-
-
-// untouched
-    dirname(dirname($path, $level));
-
-    dirname("foo/" . dirname($path));
-
-    dirname(dirname($path) . $foo);
-
-    foo\dirname(dirname($path));
 }
 
 ?>
@@ -30,16 +20,6 @@ function multiDirname()
     dirname($path, 2);
 
     new dirname(dirname($path, 2));
-
-
-// untouched
-    dirname(dirname($path, $level));
-
-    dirname("foo/" . dirname($path));
-
-    dirname(dirname($path) . $foo);
-
-    foo\dirname(dirname($path));
 }
 
 ?>

rules-tests/Php70/Rector/FuncCall/MultiDirnameRector/Fixture/skip.php.inc

@@ -0,0 +1,22 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\FuncCall\MultiDirnameRector\Fixture;
+
+function multiDirname()
+{
+    dirname(dirname($path, $level));
+
+    dirname("foo/" . dirname($path));
+
+    dirname(dirname($path) . $foo);
+
+    foo\dirname(dirname($path));
+
+    dirname($path, 1);
+
+    dirname($path, 2);
+
+    dirname(getcwd(), 2);
+}
+
+?>

rules/Php70/Rector/FuncCall/MultiDirnameRector.php

@@ -56,12 +56,14 @@ public function refactor(Node $node): ?Node
         $activeFuncCallNode = $node;
         $lastFuncCallNode = $node;
 
+        $shouldUpdate = false;
         while (($activeFuncCallNode = $this->matchNestedDirnameFuncCall($activeFuncCallNode)) instanceof FuncCall) {
             $lastFuncCallNode = $activeFuncCallNode;
+            $shouldUpdate = true;
         }
 
         // nothing to improve
-        if ($this->shouldSkip()) {
+        if (! $shouldUpdate || $this->shouldSkip()) {
             return null;
         }