Allow to rename function and method arguments

Author: K-Phoen

features/rename_local_variable.feature

@@ -91,6 +91,46 @@ Feature: Rename Local Variable
 
             """
 
+    Scenario: Rename a method argument
+        Given a PHP File named "src/MethodArgument.php" with:
+            """
+            <?php
+            class MethodArgument
+            {
+                public function operation($varsecond = 5)
+                {
+                    $var = 2;
+
+                    return $var + $varsecond;
+                }
+            }
+            """
+        When I use refactoring "rename-local-variable" with:
+            | arg       | value                  |
+            | file      | src/MethodArgument.php |
+            | line      | 4                      |
+            | name      | varsecond              |
+            | new-name  | multiplier             |
+        Then the PHP File "src/MethodArgument.php" should be refactored:
+            """
+            --- a/vfs://project/src/MethodArgument.php
+            +++ b/vfs://project/src/MethodArgument.php
+            @@ -1,10 +1,10 @@
+             <?php
+             class MethodArgument
+             {
+            -    public function operation($varsecond = 5)
+            +    public function operation($multiplier = 5)
+                 {
+                     $var = 2;
+
+            -        return $var + $varsecond;
+            +        return $var + $multiplier;
+                 }
+             }
+
+            """
+
     Scenario: Rename Variable In functions
         Given a PHP File named "src/Foo.php" with:
             """
@@ -131,4 +171,44 @@ Feature: Rename Local Variable
             -    return $var * $var;
             +    return $number * $number;
              }
+            """
+
+    Scenario: Rename a function's parameter
+        Given a PHP File named "src/Foo.php" with:
+            """
+            <?php
+            function operation($number)
+            {
+                $var = 2;
+
+                for ($i = 0; $i < 3; $i++) {
+                    $var = pow($var, $number);
+                }
+
+                return $var * $var;
+            }
+            """
+        When I use refactoring "rename-local-variable" with:
+            | arg       | value       |
+            | file      | src/Foo.php |
+            | line      | 2           |
+            | name      | number      |
+            | new-name  | power       |
+        Then the PHP File "src/Foo.php" should be refactored:
+            """
+            --- a/vfs://project/src/Foo.php
+            +++ b/vfs://project/src/Foo.php
+            @@ -1,10 +1,10 @@
+             <?php
+            -function operation($number)
+            +function operation($power)
+             {
+                 $var = 2;
+
+                 for ($i = 0; $i < 3; $i++) {
+            -        $var = pow($var, $number);
+            +        $var = pow($var, $power);
+                 }
+
+                 return $var * $var;
             """

src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php

@@ -159,7 +159,7 @@ private function findMatchingMethod(File $file, LineRange $range)
         foreach ($file->getNamespaces() as $namespace) {
             foreach ($namespace->getClasses() as $class) {
                 foreach ($class->getMethods() as $method) {
-                    if ($method->getStartLine() < $lastLine && $lastLine < $method->getEndLine()) {
+                    if ($method->getStartLine() <= $lastLine && $lastLine <= $method->getEndLine()) {
                         $foundMethod = $method;
                         break;
                     }
@@ -180,7 +180,7 @@ private function findMatchingFunction(File $file, LineRange $range)
 
         foreach ($file->getNamespaces() as $namespace) {
             foreach ($namespace->getFunctions() as $function) {
-                if ($function->getStartLine() < $lastLine && $lastLine < $function->getEndLine()) {
+                if ($function->getStartLine() <= $lastLine && $lastLine <= $function->getEndLine()) {
                     $foundFunction = $function;
                     break;
                 }