added private property scrambler fixes

Author: Vyacheslav Gulyam

src/Naneau/Obfuscator/Node/Visitor/ScramblePrivateMethod.php

@@ -45,13 +45,6 @@ class ScramblePrivateMethod extends ScramblerVisitor
     use TrackingRenamerTrait;
     use SkipTrait;
 
-    /**
-     * Active class
-     *
-     * @var ClassNode|bool
-     **/
-    private $currentClassNode;
-
     /**
      * Before node traversal
      *
@@ -81,10 +74,6 @@ public function enterNode(Node $node)
             return;
         }
 
-        if ($node instanceof ClassNode) {
-            $this->currentClassNode = $node;
-        }
-
         // Scramble calls
         if (($node instanceof MethodCall && $node->var->name === 'this') || ($node instanceof StaticCall && $node->class instanceof Node\Name && $node->class->toString() === 'self')) {
             // Node wasn't renamed

src/Naneau/Obfuscator/Node/Visitor/ScramblePrivateProperty.php

@@ -78,7 +78,7 @@ public function enterNode(Node $node)
     {
         if ($node instanceof PropertyFetch) {
 
-            if (!is_string($node->name)) {
+            if (!is_string($node->name) || $node->var->name !== "this") {
                 return;
             }
 

tests/before/MultipleClasses.php

@@ -36,20 +36,24 @@ static public function anotherPublicMethod() {
 
 class ThirdClass {
 
+    private $publicProperty;
+
     static private function anotherPublicMethod() {
 
     }
 
     public function __construct(SecondClass $secondObject) {
         $secondObject->publicMethod();
         $secondObject::anotherPublicMethod();
+        $secondObject->publicProperty = 'test';
     }
 
     private function publicMethod() {
         echo 'test';
     }
 
     protected function someFunc() {
+        $this->publicProperty = 'test';
         $this->publicMethod();
         self::anotherPublicMethod();
     }

tests/expected/MultipleClasses.php

@@ -1,2 +1,2 @@
 <?php
-class FirstClass { protected $_protectedProperty; public $publicProperty; protected function _protectedMethod() { echo 'This is protected method of first class'; } public function publicMethod() { echo 'This is public method of first class'; } } class SecondClass extends FirstClass { private $sp8839d9; protected function _protectedMethod() { parent::_protectedMethod(); echo 'This is protected method of second class'; $this->sp8839d9 = parent::$_protectedProperty; } public function publicMethod() { parent::publicMethod(); echo 'This is public method of second class'; $this->sp8839d9 = parent::$publicProperty; } public static function anotherPublicMethod() { } } class ThirdClass { private static function spe81a11() { } public function __construct(SecondClass $spb91639) { $spb91639->publicMethod(); $spb91639::anotherPublicMethod(); } private function sp70ab23() { echo 'test'; } protected function someFunc() { $this->sp70ab23(); self::spe81a11(); } }
+class FirstClass { protected $_protectedProperty; public $publicProperty; protected function _protectedMethod() { echo 'This is protected method of first class'; } public function publicMethod() { echo 'This is public method of first class'; } } class SecondClass extends FirstClass { private $sp8839d9; protected function _protectedMethod() { parent::_protectedMethod(); echo 'This is protected method of second class'; $this->sp8839d9 = parent::$_protectedProperty; } public function publicMethod() { parent::publicMethod(); echo 'This is public method of second class'; $this->sp8839d9 = parent::$publicProperty; } public static function anotherPublicMethod() { } } class ThirdClass { private $spa36ab6; private static function spe81a11() { } public function __construct(SecondClass $spb91639) { $spb91639->publicMethod(); $spb91639::anotherPublicMethod(); $spb91639->publicProperty = 'test'; } private function sp70ab23() { echo 'test'; } protected function someFunc() { $this->spa36ab6 = 'test'; $this->sp70ab23(); self::spe81a11(); } }