update lock clucknut
All checks were successful
All checks were successful
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
/*
|
||||
* This file is part of Psy Shell.
|
||||
*
|
||||
* (c) 2012-2025 Justin Hileman
|
||||
* (c) 2012-2026 Justin Hileman
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
@@ -13,7 +13,6 @@
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Identifier;
|
||||
use PhpParser\Node\Name; // @phan-suppress-current-line PhanUnreferencedUseNormal - used for type checks
|
||||
use PhpParser\Node\Stmt\Namespace_;
|
||||
use PhpParser\Node\Stmt\Use_;
|
||||
use PhpParser\Node\Stmt\UseItem;
|
||||
@@ -70,9 +69,9 @@ public function beforeTraverse(array $nodes)
|
||||
// Only re-inject use statements if this is a wrapper created by NamespacePass.
|
||||
// This matches PHP behavior: explicit namespace declaration clears use statements.
|
||||
if ($node->getAttribute('psyshReinjected')) {
|
||||
$aliases = $this->cleaner->getAliasesForNamespace($node->name);
|
||||
if (!empty($aliases)) {
|
||||
$useStatements = $this->createUseStatements($aliases);
|
||||
$aliasesByType = $this->cleaner->getAliasesByTypeForNamespace($node->name);
|
||||
if (!empty($aliasesByType)) {
|
||||
$useStatements = $this->createUseStatements($aliasesByType);
|
||||
$node->stmts = \array_merge($useStatements, $node->stmts ?? []);
|
||||
}
|
||||
}
|
||||
@@ -84,9 +83,9 @@ public function beforeTraverse(array $nodes)
|
||||
|
||||
// No namespace declaration in input, or re-applied by NamespacePass; re-inject use
|
||||
// statements for the empty namespace.
|
||||
$aliases = $this->cleaner->getAliasesForNamespace(null);
|
||||
if (!empty($aliases)) {
|
||||
$useStatements = $this->createUseStatements($aliases);
|
||||
$aliasesByType = $this->cleaner->getAliasesByTypeForNamespace(null);
|
||||
if (!empty($aliasesByType)) {
|
||||
$useStatements = $this->createUseStatements($aliasesByType);
|
||||
$nodes = \array_merge($useStatements, $nodes);
|
||||
}
|
||||
|
||||
@@ -106,8 +105,8 @@ public function afterTraverse(array $nodes)
|
||||
}
|
||||
|
||||
// Persist aliases if they're at the global level (not inside any namespace)
|
||||
if (!empty($this->aliases)) {
|
||||
$this->cleaner->setAliasesForNamespace(null, $this->aliases);
|
||||
if (!empty($this->aliasesByType)) {
|
||||
$this->cleaner->setAliasesByTypeForNamespace(null, $this->aliasesByType);
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -122,32 +121,40 @@ public function afterTraverse(array $nodes)
|
||||
*/
|
||||
private function validateUseStatement(Use_ $stmt): void
|
||||
{
|
||||
$seenAliases = [];
|
||||
|
||||
foreach ($stmt->uses as $useItem) {
|
||||
$alias = \strtolower($useItem->getAlias());
|
||||
$type = $this->getUseImportType($stmt, $useItem);
|
||||
|
||||
if (isset($this->aliases[$alias])) {
|
||||
if (isset($seenAliases[$type][$alias]) || isset($this->getAliasesForType($type)[$alias])) {
|
||||
throw new FatalErrorException(\sprintf('Cannot use %s as %s because the name is already in use', $useItem->name->toString(), $useItem->getAlias()), 0, \E_ERROR, null, $stmt->getStartLine());
|
||||
}
|
||||
|
||||
$seenAliases[$type][$alias] = true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create use statement nodes from stored aliases.
|
||||
*
|
||||
* @param array $aliases Map of lowercase alias names to Name nodes
|
||||
* @param array $aliasesByType Map of Use_::TYPE_* constants to alias maps
|
||||
*
|
||||
* @return Use_[] Array of use statement nodes
|
||||
*/
|
||||
private function createUseStatements(array $aliases): array
|
||||
private function createUseStatements(array $aliasesByType): array
|
||||
{
|
||||
$useStatements = [];
|
||||
foreach ($aliases as $alias => $name) {
|
||||
// Create UseItem (PHP-Parser 5.x) or UseUse (PHP-Parser 4.x)
|
||||
$useItem = \class_exists(UseItem::class)
|
||||
? new UseItem($name, new Identifier($alias))
|
||||
: new UseUse($name, $alias);
|
||||
// Mark as re-injected so we don't validate it
|
||||
$useStatements[] = new Use_([$useItem], Use_::TYPE_NORMAL, ['psyshReinjected' => true]);
|
||||
|
||||
foreach ([Use_::TYPE_NORMAL, Use_::TYPE_FUNCTION, Use_::TYPE_CONSTANT] as $type) {
|
||||
foreach ($aliasesByType[$type] ?? [] as $alias => $name) {
|
||||
// Create UseItem (PHP-Parser 5.x) or UseUse (PHP-Parser 4.x)
|
||||
$useItem = \class_exists(UseItem::class)
|
||||
? new UseItem($name, new Identifier($alias))
|
||||
: new UseUse($name, $alias);
|
||||
// Mark as re-injected so we don't validate it
|
||||
$useStatements[] = new Use_([$useItem], $type, ['psyshReinjected' => true]);
|
||||
}
|
||||
}
|
||||
|
||||
return $useStatements;
|
||||
|
||||
Reference in New Issue
Block a user