Merge pull request #7 from Cheburon/CLOUD-11922-obfuscate-error

fix obfuscator error

Author: Cheburon

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

@@ -57,7 +57,9 @@ public function beforeTraverse(array $nodes)
             ->resetRenamed()
             ->skip($this->variableMethodCallsUsed($nodes));
 
-        $this->scanMethodDefinitions($nodes);
+        if (!$this->shouldSkip()) {
+            $this->scanMethodDefinitions($nodes);
+        }
 
         return $nodes;
     }
@@ -95,7 +97,7 @@ public function enterNode(Node $node)
     private function variableMethodCallsUsed(array $nodes)
     {
         foreach ($nodes as $node) {
-            if ($node instanceof MethodCall && $node->name instanceof Variable) {
+            if ($node instanceof MethodCall && $node->name instanceof Variable && $node->var->name === "this") {
                 // A method call uses a Variable as its name
                 return true;
             }

tests/before/SimpleClass.php

@@ -37,6 +37,9 @@ public function publicMethod() {
         $this->publicProperty = $localVar;
         $this->_protectedMethod();
         $this->_privateMethod();
+        $dt = new \DateTime();
+        $dtMethodName = "getTimestamp";
+        $dt->$dtMethodName();
     }
 }
 

tests/expected/SimpleClass.php

@@ -1,2 +1,2 @@
 <?php
-class SimpleClass { const CONSTANT_VARIABLE = "test"; public static $publicStaticProperty = "test"; protected static $protectedStaticProperty = "test"; private static $sp39db2b = "test"; private $sp8839d9; protected $_protectedProperty; public $publicProperty; private function sp51fa3f() { $spd8dce8 = "test"; $this->sp8839d9 = $spd8dce8; $this->_protectedProperty = $spd8dce8; $this->publicProperty = $spd8dce8; self::$publicStaticProperty = "test"; self::$protectedStaticProperty = "test"; self::$sp39db2b = "test"; } protected function _protectedMethod() { $spd8dce8 = "test"; $this->sp8839d9 = $spd8dce8; $this->_protectedProperty = $spd8dce8; $this->publicProperty = $spd8dce8; } public function publicMethod() { $spd8dce8 = "test"; $this->sp8839d9 = $spd8dce8; $this->_protectedProperty = $spd8dce8; $this->publicProperty = $spd8dce8; $this->_protectedMethod(); $this->sp51fa3f(); } } $sp5de0e2 = new SimpleClass(); $sp5de0e2->publicMethod();
+class SimpleClass { const CONSTANT_VARIABLE = "test"; public static $publicStaticProperty = "test"; protected static $protectedStaticProperty = "test"; private static $sp39db2b = "test"; private $sp8839d9; protected $_protectedProperty; public $publicProperty; private function sp51fa3f() { $spd8dce8 = "test"; $this->sp8839d9 = $spd8dce8; $this->_protectedProperty = $spd8dce8; $this->publicProperty = $spd8dce8; self::$publicStaticProperty = "test"; self::$protectedStaticProperty = "test"; self::$sp39db2b = "test"; } protected function _protectedMethod() { $spd8dce8 = "test"; $this->sp8839d9 = $spd8dce8; $this->_protectedProperty = $spd8dce8; $this->publicProperty = $spd8dce8; } public function publicMethod() { $spd8dce8 = "test"; $this->sp8839d9 = $spd8dce8; $this->_protectedProperty = $spd8dce8; $this->publicProperty = $spd8dce8; $this->_protectedMethod(); $this->sp51fa3f(); $spce0ae5 = new \DateTime(); $sp167220 = "getTimestamp"; $spce0ae5->{$sp167220}(); } } $sp5de0e2 = new SimpleClass(); $sp5de0e2->publicMethod();