Skip to content

fix use scramble #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Naneau/Obfuscator/Node/Visitor/ScrambleUse.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
}
}
}
Expand Down
13 changes: 12 additions & 1 deletion tests/before/Namespaces.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}

2 changes: 1 addition & 1 deletion tests/expected/Namespaces.php
Original file line number Diff line number Diff line change
@@ -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(); } }