Fix merge

Author: kylekatarnls

src/main/php/PHPMD/Rule/AbstractLocalVariable.php

@@ -305,10 +305,7 @@ protected function isPassedByReference($variable)
             return false;
         }
 
-        $argumentPosition = min(
-            array_search($this->getNode($variable), $parent->getChildren()),
-            count($parameters) - 1
-        );
+        $argumentPosition = array_search($this->getNode($variable), $parent->getChildren());
         $function = $this->getNode($parent->getParent());
         $functionParent = $this->getNode($function->getParent());
         $functionName = $function->getImage();
@@ -325,6 +322,7 @@ protected function isPassedByReference($variable)
         }
 
         $parameters = $reflectionFunction->getParameters();
+        $argumentPosition = min($argumentPosition, count($parameters) - 1);
 
         return isset($parameters[$argumentPosition]) && $parameters[$argumentPosition]->isPassedByReference();
     }