update lock clucknut

vendor/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php

@@ -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.
@@ -29,6 +29,7 @@ abstract class NamespaceAwarePass extends CodeCleanerPass
     protected array $namespace = [];
     protected array $currentScope = [];
     protected array $aliases = [];
+    protected array $aliasesByType = [];
     protected ?CodeCleaner $cleaner = null;
 
     /**
@@ -51,6 +52,7 @@ public function beforeTraverse(array $nodes)
     {
         $this->namespace = [];
         $this->currentScope = [];
+        $this->aliasesByType = [];
 
         return null;
     }
@@ -71,23 +73,25 @@ public function enterNode(Node $node)
             // Only restore use statement aliases for PsySH re-injected namespaces.
             // Explicit namespace declarations start with a clean slate.
             if ($this->cleaner && $node->getAttribute('psyshReinjected')) {
-                $this->aliases = $this->cleaner->getAliasesForNamespace($node->name);
+                $this->aliasesByType = $this->cleaner->getAliasesByTypeForNamespace($node->name);
+                $this->aliases = $this->aliasesByType[Use_::TYPE_NORMAL] ?? [];
             } else {
                 $this->aliases = [];
+                $this->aliasesByType = [];
             }
         }
 
         // Track use statements for alias resolution
         if ($node instanceof Use_) {
             foreach ($node->uses as $useItem) {
-                $this->aliases[\strtolower($useItem->getAlias())] = $useItem->name;
+                $this->setAliasForType(\strtolower($useItem->getAlias()), $useItem->name, $this->getUseImportType($node, $useItem));
             }
         }
 
         // Track group use statements
         if ($node instanceof GroupUse) {
             foreach ($node->uses as $useItem) {
-                $this->aliases[\strtolower($useItem->getAlias())] = Name::concat($node->prefix, $useItem->name);
+                $this->setAliasForType(\strtolower($useItem->getAlias()), Name::concat($node->prefix, $useItem->name), $this->getUseImportType($node, $useItem));
             }
         }
 
@@ -108,14 +112,17 @@ public function enterNode(Node $node)
     public function leaveNode(Node $node)
     {
         if ($node instanceof Namespace_) {
+            $this->syncCompatAliases();
+
             // Open namespaces (like `namespace Foo;`) have kind == KIND_SEMICOLON.
             if ($node->getAttribute('kind') === Namespace_::KIND_SEMICOLON || $node->getAttribute('psyshReinjected')) {
                 if ($this->cleaner) {
-                    $this->cleaner->setAliasesForNamespace($node->name, $this->aliases);
+                    $this->cleaner->setAliasesByTypeForNamespace($node->name, $this->aliasesByType);
                 }
             }
 
             $this->aliases = [];
+            $this->aliasesByType = [];
         }
 
         return null;
@@ -130,6 +137,8 @@ public function leaveNode(Node $node)
      */
     protected function getFullyQualifiedName($name): string
     {
+        $this->syncCompatAliases();
+
         if ($name instanceof FullyQualifiedName) {
             return \implode('\\', $this->getParts($name));
         }
@@ -166,4 +175,54 @@ protected function getParts(Name $name): array
     {
         return \method_exists($name, 'getParts') ? $name->getParts() : $name->parts;
     }
+
+    protected function getAliasesForType(int $type): array
+    {
+        $this->syncCompatAliases();
+
+        return $this->aliasesByType[$type] ?? [];
+    }
+
+    private function setAliasForType(string $alias, Name $name, int $type): void
+    {
+        $this->aliasesByType[$type][$alias] = $name;
+        if ($type === Use_::TYPE_NORMAL) {
+            $this->aliases[$alias] = $name;
+        }
+    }
+
+    /**
+     * Sync $aliases into $aliasesByType[TYPE_NORMAL] for subclasses that read $aliases directly.
+     */
+    private function syncCompatAliases(): void
+    {
+        if ($this->aliases === []) {
+            unset($this->aliasesByType[Use_::TYPE_NORMAL]);
+
+            return;
+        }
+
+        $this->aliasesByType[Use_::TYPE_NORMAL] = $this->aliases;
+    }
+
+    /**
+     * Resolve the import type for a use item across PHP-Parser 4.x and 5.x.
+     *
+     * Individual use items may specify their own type (e.g. in group use
+     * statements), otherwise fall back to the parent statement type.
+     */
+    protected function getUseImportType(Node $node, Node $useItem): int
+    {
+        $itemType = $useItem->type ?? null;
+        if (\is_int($itemType) && $itemType !== Use_::TYPE_UNKNOWN) {
+            return $itemType;
+        }
+
+        $nodeType = $node->type ?? null;
+        if (\is_int($nodeType) && $nodeType !== Use_::TYPE_UNKNOWN) {
+            return $nodeType;
+        }
+
+        return Use_::TYPE_NORMAL;
+    }
 }