Merge pull request #5 from Cheburon/CLOUD-11919-obfuscation-use-bug

fix use scramble

Author: Cheburon

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

@@ -138,7 +138,6 @@ public function enterNode(Node $node)
             || $node instanceof NewExpression
             || $node instanceof InstanceOfExpression
         ) {
-
             // We need to be in a class for this to work
             if (empty($this->classNode)) {
                 return;
@@ -160,6 +159,12 @@ public function enterNode(Node $node)
             if ($this->isRenamed($name)) {
                 $node->class = new Name($this->getNewName($name));
                 return $node;
+            } else {
+                if ($this->isRenamed($node->class->getFirst())) {
+                    reset($node->class->parts);
+                    $node->class->parts[key($node->class->parts)] = $this->getNewName($node->class->getFirst());
+                    return $node;
+                }
             }
         }
     }

tests/before/Namespaces.php

@@ -6,15 +6,26 @@ class classA {
 
 }
 
+namespace namespaceC\namespaceD;
+
+class classD {
+
+}
+
 namespace namespaceB;
 
 use namespaceA\classA as classC;
+use namespaceC\namespaceD as namespaceDAlias;
 
 class classB {
 
     private $_objectA;
 
+    private $_objectB;
+
     public function __construct() {
         $this->_objectA = new classC();
+        $this->_objectB = new namespaceDAlias\classD();
     }
-}
+}
+

tests/expected/Namespaces.php

@@ -1,2 +1,2 @@
 <?php
-namespace namespaceA; class classA { } namespace namespaceB; use namespaceA\classA as spf0f507; class classB { private $spa26210; public function __construct() { $this->spa26210 = new spf0f507(); } }
+namespace namespaceA; class classA { } namespace namespaceC\namespaceD; class classD { } namespace namespaceB; use namespaceA\classA as spf0f507; use namespaceC\namespaceD as sp63627e; class classB { private $spa26210; private $sp2e1034; public function __construct() { $this->spa26210 = new spf0f507(); $this->sp2e1034 = new sp63627e\classD(); } }