scan methods calls

Author: oscarotero

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0] - Unreleased
+### Added
+- Function scanner extracts not only functions calls but also class methods calls.
+
 ## [1.1.1] - 2019-11-25
 ### Fixed
 - Extract comments of functions prepended with echo, print or return [#6]
@@ -25,6 +29,7 @@ First version
 [#5]: https://github.com/php-gettext/PHP-Scanner/issues/5
 [#6]: https://github.com/php-gettext/PHP-Scanner/issues/6
 
+[1.2.0]: https://github.com/php-gettext/PHP-Scanner/compare/v1.1.1...HEAD
 [1.1.1]: https://github.com/php-gettext/PHP-Scanner/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/php-gettext/PHP-Scanner/compare/v1.0.1...v1.1.0
 [1.0.1]: https://github.com/php-gettext/PHP-Scanner/compare/v1.0.0...v1.0.1

src/PhpNodeVisitor.php

@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\NodeVisitor;
 
@@ -30,18 +31,17 @@ public function beforeTraverse(array $nodes)
 
     public function enterNode(Node $node)
     {
-        if ($node instanceof FuncCall) {
-            $name = ($node->name instanceof Name) ? $node->name->getLast() : null;
-
-            if ($name && ($this->validFunctions === null || in_array($name, $this->validFunctions))) {
-                $this->functions[] = $this->createFunction($node);
-            } elseif ($node->getComments()) {
-                $this->bufferComments = $node;
-            }
-            return null;
-        }
-
         switch ($node->getType()) {
+            case 'Expr_MethodCall':
+            case 'Expr_FuncCall':
+                $name = static::getName($node);
+
+                if ($name && ($this->validFunctions === null || in_array($name, $this->validFunctions))) {
+                    $this->functions[] = $this->createFunction($node);
+                } elseif ($node->getComments()) {
+                    $this->bufferComments = $node;
+                }
+                return null;
             case 'Stmt_Echo':
             case 'Stmt_Return':
             case 'Expr_Print':
@@ -67,10 +67,13 @@ public function getFunctions(): array
         return $this->functions;
     }
 
-    protected function createFunction(FuncCall $node): ParsedFunction
+    /**
+     * @param FuncCall|MethodCall $node
+     */
+    protected function createFunction(Expr $node): ParsedFunction
     {
         $function = new ParsedFunction(
-            $node->name->getLast(),
+            static::getName($node),
             $this->filename,
             $node->getStartLine(),
             $node->getEndLine()
@@ -114,6 +117,21 @@ protected static function getComment(Comment $comment): string
         return trim(implode("\n", $lines));
     }
 
+    protected static function getName(Node $node): ?string
+    {
+        $name = $node->name;
+
+        if ($name instanceof Name) {
+            return $name->getLast();
+        }
+
+        if ($name instanceof Identifier) {
+            return (string) $name;
+        }
+
+        return null;
+    }
+
     protected static function getValue(Expr $value)
     {
         $type = $value->getType();

tests/assets/functions.php

@@ -1,7 +1,7 @@
 <?php
 //This comment is related with the first function
 
-print(fn1('arg1', 'arg2', 3));
+print($fn->fn1('arg1', 'arg2', 3));
 fn2($var);
 fn3(fn4('arg4'), 'arg5', fn5(6, 7.5));
 fn6(['arr']);
@@ -13,7 +13,7 @@
 /* Comment to fn10 */ fn10();
 
 //Related comment 1
-fn11(/* ALLOW: Related comment 2 */ 'arg9', 'arg10' /* No related comment 3 */);
+$trans->fn11(/* ALLOW: Related comment 2 */ 'arg9', 'arg10' /* No related comment 3 */);
 
 /*
     Related comment