changed the previous commit. Now the array arguments are processed #5

Author: oscarotero

src/PhpNodeVisitor.php

@@ -5,6 +5,7 @@
 
 use PhpParser\Comment;
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
 use PhpParser\NodeVisitor;
@@ -14,7 +15,6 @@ class PhpNodeVisitor implements NodeVisitor
     protected $validFunctions;
     protected $filename;
     protected $functions = [];
-    protected $argumentsHandlers = [];
 
     public function __construct(string $filename, array $validFunctions = null)
     {
@@ -77,32 +77,12 @@ protected function createFunction(FuncCall $node): ParsedFunction
                 $function->addComment(static::getComment($comment));
             }
 
-            $type = $value->getType();
-
-            if (isset($this->argumentsHandlers[$type])) {
-                call_user_func($this->argumentsHandlers[$type], $function, $value);
-                continue;
-            }
-
-            switch ($type) {
-                case 'Scalar_String':
-                case 'Scalar_LNumber':
-                case 'Scalar_DNumber':
-                    $function->addArgument($value->value);
-                    break;
-                default:
-                    $function->addArgument();
-            }
+            $function->addArgument(static::getValue($value));
         }
 
         return $function;
     }
 
-    public function setArgumentsHandler(string $type, callable $handler)
-    {
-        $this->argumentsHandlers[$type] = $handler;
-    }
-
     protected static function getComment(Comment $comment): string
     {
         $text = $comment->getReformattedText();
@@ -115,4 +95,31 @@ protected static function getComment(Comment $comment): string
 
         return trim(implode("\n", $lines));
     }
+
+    protected static function getValue(Expr $value)
+    {
+        $type = $value->getType();
+
+        switch ($type) {
+            case 'Scalar_String':
+            case 'Scalar_LNumber':
+            case 'Scalar_DNumber':
+                return $value->value;
+            case 'Expr_Array':
+                $arr = [];
+
+                foreach ($value->items as $item) {
+                    $value = static::getValue($item->value);
+
+                    if ($item->key === null) {
+                        $arr[] = $value;
+                    } else {
+                        $key = static::getValue($item->key);
+                        $arr[$key] = $value;
+                    }
+                }
+
+                return $arr;
+        }
+    }
 }

tests/PhpFunctionsScannerTest.php

@@ -23,7 +23,7 @@ public function testPhpFunctionsExtractor()
         $code = file_get_contents($file);
         $functions = $scanner->scan($code, $file);
 
-        $this->assertCount(11, $functions);
+        $this->assertCount(12, $functions);
 
         //fn1
         $function = array_shift($functions);
@@ -81,7 +81,7 @@ public function testPhpFunctionsExtractor()
         $function = array_shift($functions);
         $this->assertSame('fn6', $function->getName());
         $this->assertSame(1, $function->countArguments());
-        $this->assertSame([null], $function->getArguments());
+        $this->assertSame([['arr']], $function->getArguments());
         $this->assertSame(7, $function->getLine());
         $this->assertSame(7, $function->getLastLine());
         $this->assertSame($file, $function->getFilename());
@@ -151,6 +151,20 @@ public function testPhpFunctionsExtractor()
         $this->assertSame("Related comment\nnumber one", array_shift($comments));
         $this->assertSame('Related comment 2', array_shift($comments));
         $this->assertSame('ALLOW: Related comment 3', array_shift($comments));
+
+        //fn13
+        $function = array_shift($functions);
+        $this->assertSame('fn13', $function->getName());
+        $this->assertSame(3, $function->countArguments());
+        $this->assertSame([
+            'Translatable string',
+            '',
+            ['context' => 'Context string', 'foo'],
+        ], $function->getArguments());
+        $this->assertSame(30, $function->getLine());
+        $this->assertSame(30, $function->getLastLine());
+        $this->assertSame($file, $function->getFilename());
+        $this->assertCount(0, $function->getComments());
     }
 
     public function _testPhpFunctionsScannerWithDisabledComments()

tests/assets/functions.php

@@ -26,3 +26,5 @@
     'arg12'
     /* No Related comment 4 */
 );
+
+fn13("Translatable string","",["context"=>"Context string", 'foo']);