wip

Author: patinthehat

src/Searcher.php

@@ -18,7 +18,6 @@
 use Permafrost\PhpCodeSearch\Visitors\VariableReferenceVisitor;
 use PhpParser\Error;
 use PhpParser\Node;
-use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Stmt;
 use PhpParser\NodeFinder;
 use PhpParser\NodeTraverser;
@@ -33,19 +32,19 @@ class Searcher
     protected $ast = [];
 
     /** @var array */
-    protected $functions = [];
+    protected $assignments = [];
 
     /** @var array */
-    protected $methods = [];
+    protected $classes = [];
 
     /** @var array */
-    protected $classes = [];
+    protected $functions = [];
 
     /** @var array */
-    protected $static = [];
+    protected $methods = [];
 
     /** @var array */
-    protected $assignments = [];
+    protected $static = [];
 
     /** @var array */
     protected $variables = [];
@@ -58,48 +57,44 @@ public function __construct($parser = null)
         $this->parser = $parser ?? (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
     }
 
-    public function functions(array $names): self
+    public function assignments(array $varNames): self
     {
-        $this->functions = array_merge($this->functions, $names);
+        $this->assignments = array_merge($this->assignments, $varNames);
 
         return $this;
     }
 
-    public function methods(array $names): self
+    public function classes(array $names): self
     {
-        $this->methods = array_merge($this->methods, $names);
+        $this->classes = array_merge($this->classes, $names);
 
         return $this;
     }
 
-    public function variables(array $names): self
+    public function functions(array $names): self
     {
-        $this->variables = array_merge($this->variables, $names);
+        $this->functions = array_merge($this->functions, $names);
 
         return $this;
     }
 
-    public function static(array $names): self
+    public function methods(array $names): self
     {
-        $this->static = array_merge($this->static, $names);
+        $this->methods = array_merge($this->methods, $names);
 
         return $this;
     }
 
-    public function assignments(array $varNames): self
+    public function static(array $names): self
     {
-        $varNames = array_map(function ($item) {
-            return ltrim($item, '$');
-        }, $varNames);
-
-        $this->assignments = array_merge($this->assignments, $varNames);
+        $this->static = array_merge($this->static, $names);
 
         return $this;
     }
 
-    public function classes(array $names): self
+    public function variables(array $names): self
     {
-        $this->classes = array_merge($this->classes, $names);
+        $this->variables = array_merge($this->variables, $names);
 
         return $this;
     }
@@ -117,19 +112,18 @@ public function withoutSnippets(): self
      */
     public function search($file): FileSearchResults
     {
-        if (is_string($file)) {
-            $file = new File($file);
-        }
+        $file = is_string($file) ? new File($file) : $file;
 
         $results = new FileSearchResults($file, $this->withSnippets);
 
         if (! $this->parseFile($file, $results)) {
             return $results;
         }
 
-        $calls = $this->findAllReferences($this->ast);
-
-        $this->traverseNodes($results, $calls);
+        $this->traverseNodes(
+            $results,
+            $this->findAllReferences($this->ast)
+        );
 
         return $results;
     }