Merge 2c42642 into c06ae32

goaop · Feb 25, 2021 · f6f3ee4 · f6f3ee4
2 parents c06ae32 + 2c42642
commit f6f3ee4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/src/ValueResolver/NodeExpressionResolver.php b/src/ValueResolver/NodeExpressionResolver.php
@@ -142,6 +142,17 @@ protected function resolveScalarLNumber(LNumber $node): int
         return $node->value;
     }
 
+    protected function resolveExprUnaryMinus(Expr\UnaryMinus $node)
+    {
+        $value = $this->resolve($node->expr);
+        return -1 * $value;
+    }
+
+    protected function resolveExprUnaryPlus(Expr\UnaryMinus $node)
+    {
+        return $this->resolve($node->expr);
+    }
+
     protected function resolveScalarString(String_ $node): string
     {
         return $node->value;

diff --git a/tests/ReflectionMethodTest.php b/tests/ReflectionMethodTest.php
@@ -20,15 +20,15 @@ public function testGetClosureMethod()
     public function testInvokeMethod()
     {
         $refMethod = $this->parsedRefClass->getMethod('funcWithReturnArgs');
-        $retValue  = $refMethod->invoke(null, 1, 2, 3);
-        $this->assertEquals([1, 2, 3], $retValue);
+        $retValue  = $refMethod->invoke(null, 1, 2, 3, -100, -10.5);
+        $this->assertEquals([1, 2, 3, -100, -10.5], $retValue);
     }
 
     public function testInvokeArgsMethod()
     {
         $refMethod = $this->parsedRefClass->getMethod('funcWithReturnArgs');
-        $retValue  = $refMethod->invokeArgs(null, [1, 2, 3]);
-        $this->assertEquals([1, 2, 3], $retValue);
+        $retValue  = $refMethod->invokeArgs(null, [1, 2, 3, -100, -10.5]);
+        $this->assertEquals([1, 2, 3, -100, -10.5], $retValue);
     }
 
     public function testDebugInfoMethod()

diff --git a/tests/Stub/FileWithClasses55.php b/tests/Stub/FileWithClasses55.php
@@ -9,6 +9,7 @@ abstract class ImplicitAbstractClass
     private $a = 'foo';
     protected $b = 'bar';
     public $c = 'baz';
+    public $d = -1;
 
     abstract function test();
 }
@@ -39,6 +40,7 @@ protected static function prototypeMethod()
 abstract class AbstractClassWithMethods extends BaseClass
 {
     const TEST = 5;
+    const TEST2 = -5;
 
     public function __construct(){}
     public function __destruct(){}
@@ -56,14 +58,14 @@ final function finalFunc(){}
      */
     public static function funcWithDocAndBody()
     {
-        static $a =5, $test = '1234';
+        static $a =5, $b = -5, $test = '1234';
 
         return 'hello';
     }
 
-    public static function funcWithReturnArgs($a, $b = 100, $c = 10.0)
+    public static function funcWithReturnArgs($a, $b = 100, $c = 10.0, $d = -100, $e = -10.5)
     {
-        return [$a, $b, $c];
+        return [$a, $b, $c, $d, $e];
     }
 
     public static function prototypeMethod()
@@ -102,6 +104,7 @@ class ClassWithProperties
     private $privateProperty = 123;
     protected $protectedProperty = 'a';
     public $publicProperty = 42.0;
+    private $privateProperty2 = -123;
 
     /**
      * Some message to test docBlock
@@ -228,6 +231,8 @@ class ClassWithScalarConstants
     const C = 'foo';
     const D = false;
     const E = null;
+    const F = -5;
+    const G = -6.123;
 }
 
 class ClassWithMagicConstants

diff --git a/tests/Stub/FileWithClasses71.php b/tests/Stub/FileWithClasses71.php
@@ -58,6 +58,7 @@ class ClassWithPhp71Features
     private const PRIVATE_CONST = 4;
 
     public const CALCULATED_CONST = 1 + 1;
+    public const CALCULATED_CONST2 = -1 + -1;
 
     public function returnsVoid() : void {}
     public function acceptsIterable(iterable $iterable) : iterable {}