wip

Author: patinthehat

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to `php-code-search` will be documented in this file.
 
 ---
 
+## 1.6.0 - 2021-07-07
+
+- all function call, static method call, method call nodes have an `args` property containing the value node(s) of the parsed arguments.
+- assignment nodes now have a `value` property and `value()` method.
+- strings and numbers are converted to `StringNode` and `NumberNode` nodes, respectively.
+- most values converted to Node classes that implement either `ResultNode`, `ValueNode`, or both.
+- operations (addition, concat, etc.) converted to Node classes that implement `OperationNode`.
+- fixed several bugs related to non-matches being returned as matches.
+
 ## 1.5.3 - 2021-07-07
 
 - fix issues with `Assignment` nodes

src/Results/Nodes/ArrayItemNode.php

@@ -6,7 +6,7 @@
 
 class ArrayItemNode implements ValueNode, ResultNode
 {
-    /** @var mixed|int|string */
+    /** @var mixed|int|string|null */
     public $key;
 
     /** @var array|mixed|ResultNode|ValueNode  */

src/Results/Nodes/AssignmentOperationNode.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Permafrost\PhpCodeSearch\Results\Nodes;
+
+use Permafrost\PhpCodeSearch\Support\Transformer;
+use PhpParser\Node\Expr\AssignOp;
+
+class AssignmentOperationNode implements ResultNode, ValueNode
+{
+    /** @var string */
+    public $name;
+
+    /** @var mixed|ResultNode|ValueNode */
+    public $value;
+
+    public function __construct(AssignOp $node)
+    {
+        $this->name = $node->var->name;
+        $this->value = Transformer::parserNodeToResultNode($node->expr);
+    }
+
+    public function name(): string
+    {
+        return $this->name;
+    }
+
+    public function value()
+    {
+        return $this->value;
+    }
+
+}

src/Results/Nodes/BinaryOperationNode.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Permafrost\PhpCodeSearch\Results\Nodes;
+
+use Permafrost\PhpCodeSearch\Support\Transformer;
+use PhpParser\Node\Expr\BinaryOp;
+
+class BinaryOperationNode implements OperationNode
+{
+    /** @var string */
+    public $symbol;
+
+    /** @var mixed|ResultNode|ValueNode */
+    public $left;
+
+    /** @var mixed|ResultNode|ValueNode */
+    public $right;
+
+    public function __construct(BinaryOp $node)
+    {
+        $this->symbol = $node->getOperatorSigil();
+        $this->left = Transformer::parserNodeToResultNode($node->left);
+        $this->right = Transformer::parserNodeToResultNode($node->right);
+    }
+
+    public function symbol(): string
+    {
+        return $this->symbol;
+    }
+
+    public function left()
+    {
+        return $this->left;
+    }
+
+    public function right()
+    {
+        return $this->right;
+    }
+
+}

src/Results/Nodes/OperationNode.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace Permafrost\PhpCodeSearch\Results\Nodes;
+
+
+interface OperationNode
+{
+    public function symbol(): string;
+
+    /** @var mixed|ResultNode|ValueNode|OperationNode */
+    public function left();
+
+    /** @var mixed|ResultNode|ValueNode|OperationNode */
+    public function right();
+}

src/Support/Transformer.php

@@ -5,6 +5,8 @@
 use Permafrost\PhpCodeSearch\Results\Nodes\ArrayItemNode;
 use Permafrost\PhpCodeSearch\Results\Nodes\ArrayNode;
 use Permafrost\PhpCodeSearch\Results\Nodes\AssignmentNode;
+use Permafrost\PhpCodeSearch\Results\Nodes\AssignmentOperationNode;
+use Permafrost\PhpCodeSearch\Results\Nodes\BinaryOperationNode;
 use Permafrost\PhpCodeSearch\Results\Nodes\FunctionCallNode;
 use Permafrost\PhpCodeSearch\Results\Nodes\MethodCallNode;
 use Permafrost\PhpCodeSearch\Results\Nodes\PropertyAccessNode;
@@ -16,6 +18,8 @@
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\AssignOp;
+use PhpParser\Node\Expr\BinaryOp;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\PropertyFetch;
@@ -93,6 +97,14 @@ public static function parserNodeToResultNode($node)
             return new PropertyAccessNode($value->var->name, $value->name->toString());
         }
 
+        if ($value instanceof BinaryOp) {
+            return new BinaryOperationNode($value);
+        }
+
+        if ($value instanceof AssignOp) {
+            return new AssignmentOperationNode($value);
+        }
+
         return $node;
     }
 }

tests/SearcherTest.php

@@ -165,6 +165,33 @@ public function it_finds_complex_assignments()
         $this->assertMatchesSnapshot($results->results);
     }
 
+    /** @test */
+    public function it_finds_binary_operations()
+    {
+        $results = (new Searcher())
+            ->assignments(['obj'])
+            ->searchCode('<?' . "php
+                \$obj = 1 + 3;
+            ");
+
+        $this->assertCount(1, $results->results);
+        $this->assertMatchesSnapshot($results->results);
+    }
+
+    /** @test */
+    public function it_finds_assign_operations()
+    {
+        $results = (new Searcher())
+            ->assignments(['obj'])
+            ->searchCode('<?' . "php
+                \$obj = 'hello ' . 'world';
+            ");
+
+        $this->assertCount(1, $results->results);
+        $this->assertMatchesSnapshot($results->results);
+    }
+
+
     /** @test */
     public function it_finds_variables()
     {

tests/__snapshots__/SearcherTest__it_finds_assign_operations__1.yml

@@ -0,0 +1,4 @@
+-
+    location: { column: 0, endLine: 2, startLine: 2 }
+    node: { variableName: obj, value: { symbol: ., left: { value: 'hello ' }, right: { value: world } }, name: obj }
+    snippet: { code: { 1: '<?php', 2: '                $obj = ''hello '' . ''world'';' } }

tests/__snapshots__/SearcherTest__it_finds_binary_operations__1.yml

@@ -0,0 +1,4 @@
+-
+    location: { column: 0, endLine: 2, startLine: 2 }
+    node: { variableName: obj, value: { symbol: +, left: { value: 1 }, right: { value: 3 } }, name: obj }
+    snippet: { code: { 1: '<?php', 2: '                $obj = 1 + 3;' } }