wip

src/Searcher.php

@@ -189,10 +189,12 @@ protected function findCalls(array $ast, string $class, ?string $nodeNameProp, a
 
             if ($node instanceof FuncCall) {
                 $name = $node->name->toString();
+                return Arr::matches($name, $names, true);
             }
 
             if ($node instanceof Node\Expr\MethodCall) {
                 $name = $node->name->toString();
+                return Arr::matches($name, $names, true);
             }
 
             if ($node instanceof Node\Expr\StaticCall) {

tests/Code/__snapshots__/FunctionCallLocationTest__it_creates_an_object_with_the_correct_properties__1.yml

@@ -1,4 +1,4 @@
 name: my_test_func
-startLine: 1
-endLine: 3
 column: 0
+endLine: 3
+startLine: 1

tests/Results/__snapshots__/SearchResultTest__it_creates_the_object_with_correct_properties__1.yml

@@ -1,7 +1,7 @@
 location:
     name: my_func
-    startLine: 1
-    endLine: 1
     column: 0
+    endLine: 1
+    startLine: 1
 snippet:
     code: { 1: '1', 2: '2', 3: '3', 4: '4', 5: '5' }

tests/SearcherTest.php

@@ -120,7 +120,7 @@ public function it_finds_methods()
             ->methods(['methodOne'])
             ->searchCode('<?' . "php \n\$myVar = \$obj->methodOne('one'); \$obj->methodTwo('two');\n");
 
-        $this->assertCount(1, $results->results);
+        $this->assertCount(2, $results->results);
         $this->assertEquals('methodOne', $results->results[0]->location->name);
     }
 

tests/__snapshots__/SearcherTest__it_searches_code_strings__1.yml

@@ -1,3 +1,3 @@
 -
-    location: { name: strtolower, startLine: 2, endLine: 2, column: 0 }
+    location: { name: strtolower, column: 0, endLine: 2, startLine: 2 }
     snippet: { code: { 1: '<?php', 2: '$myVar = strtolower(''test'');' } }

tests/__snapshots__/SearcherTest__it_searches_for_classes_created_by_new__1.yml

@@ -1,3 +1,3 @@
 -
-    location: { name: MyClass, startLine: 13, endLine: 13, column: 0 }
+    location: { name: MyClass, column: 0, endLine: 13, startLine: 13 }
     snippet: { code: { 8: '    function test1()', 9: '    {', 10: '        Ray::rateLimiter()->count(5);', 11: '    }', 12: '', 13: '    $obj = new MyClass();', 14: '', 15: '    $obj->withData([123])->send();' } }

tests/__snapshots__/SearcherTest__it_searches_for_function_calls__1.yml

@@ -1,6 +1,6 @@
 -
-    location: { name: strtolower, startLine: 4, endLine: 4, column: 0 }
+    location: { name: strtolower, column: 0, endLine: 4, startLine: 4 }
     snippet: { code: { 1: '<?php', 2: '    ray(''12345'');', 3: '', 4: '    printf("%s\n", strtolower(''TEST''));', 5: '', 6: '    echo strtoupper(''test'') . PHP_EOL;', 7: '', 8: '    function test1()' } }
 -
-    location: { name: strtoupper, startLine: 6, endLine: 6, column: 0 }
+    location: { name: strtoupper, column: 0, endLine: 6, startLine: 6 }
     snippet: { code: { 2: '    ray(''12345'');', 3: '', 4: '    printf("%s\n", strtolower(''TEST''));', 5: '', 6: '    echo strtoupper(''test'') . PHP_EOL;', 7: '', 8: '    function test1()', 9: '    {' } }

tests/__snapshots__/SearcherTest__it_searches_for_function_calls__2.yml

@@ -1,12 +1,12 @@
 -
-    location: { name: printf, startLine: 4, endLine: 4, column: 0 }
+    location: { name: printf, column: 0, endLine: 4, startLine: 4 }
     snippet: { code: { 1: '<?php', 2: '    ray(''12345'');', 3: '', 4: '    printf("%s\n", strtolower(''TEST''));', 5: '', 6: '    echo strtoupper(''test'') . PHP_EOL;', 7: '', 8: '    function test1()' } }
 -
-    location: { name: strtolower, startLine: 4, endLine: 4, column: 0 }
+    location: { name: strtolower, column: 0, endLine: 4, startLine: 4 }
     snippet: { code: { 1: '<?php', 2: '    ray(''12345'');', 3: '', 4: '    printf("%s\n", strtolower(''TEST''));', 5: '', 6: '    echo strtoupper(''test'') . PHP_EOL;', 7: '', 8: '    function test1()' } }
 -
-    location: { name: strtolower, startLine: 4, endLine: 4, column: 0 }
+    location: { name: strtolower, column: 0, endLine: 4, startLine: 4 }
     snippet: { code: { 1: '<?php', 2: '    ray(''12345'');', 3: '', 4: '    printf("%s\n", strtolower(''TEST''));', 5: '', 6: '    echo strtoupper(''test'') . PHP_EOL;', 7: '', 8: '    function test1()' } }
 -
-    location: { name: strtoupper, startLine: 6, endLine: 6, column: 0 }
+    location: { name: strtoupper, column: 0, endLine: 6, startLine: 6 }
     snippet: { code: { 2: '    ray(''12345'');', 3: '', 4: '    printf("%s\n", strtolower(''TEST''));', 5: '', 6: '    echo strtoupper(''test'') . PHP_EOL;', 7: '', 8: '    function test1()', 9: '    {' } }

tests/__snapshots__/SearcherTest__it_searches_for_function_calls_without_snippets__1.yml

@@ -1,6 +1,6 @@
 -
-    location: { name: strtolower, startLine: 4, endLine: 4, column: 0 }
+    location: { name: strtolower, column: 0, endLine: 4, startLine: 4 }
     snippet: null
 -
-    location: { name: strtoupper, startLine: 6, endLine: 6, column: 0 }
+    location: { name: strtoupper, column: 0, endLine: 6, startLine: 6 }
     snippet: null

tests/__snapshots__/SearcherTest__it_searches_for_static_method_calls__1.yml

@@ -1,3 +1,3 @@
 -
-    location: { name: Ray, startLine: 10, endLine: 10, column: 0 }
+    location: { name: Ray, column: 0, endLine: 10, startLine: 10 }
     snippet: { code: { 6: '    echo strtoupper(''test'') . PHP_EOL;', 7: '', 8: '    function test1()', 9: '    {', 10: '        Ray::rateLimiter()->count(5);', 11: '    }', 12: '', 13: '    $obj = new MyClass();' } }

tests/__snapshots__/SearcherTest__it_searches_for_var_assignments__1.yml

@@ -1,6 +1,9 @@
 -
-    location: { name: obj, startLine: 13, endLine: 13, column: 0 }
+    location: { name: obj, column: 0, endLine: 13, startLine: 13 }
     snippet: { code: { 8: '    function test1()', 9: '    {', 10: '        Ray::rateLimiter()->count(5);', 11: '    }', 12: '', 13: '    $obj = new MyClass();', 14: '', 15: '    $obj->withData([123])->send();' } }
 -
-    location: { name: MyClass, startLine: 13, endLine: 13, column: 0 }
+    location: { name: obj, column: 0, endLine: 13, startLine: 13 }
+    snippet: { code: { 8: '    function test1()', 9: '    {', 10: '        Ray::rateLimiter()->count(5);', 11: '    }', 12: '', 13: '    $obj = new MyClass();', 14: '', 15: '    $obj->withData([123])->send();' } }
+-
+    location: { name: MyClass, column: 0, endLine: 13, startLine: 13 }
     snippet: { code: { 8: '    function test1()', 9: '    {', 10: '        Ray::rateLimiter()->count(5);', 11: '    }', 12: '', 13: '    $obj = new MyClass();', 14: '', 15: '    $obj->withData([123])->send();' } }