[TASK] Replace UseUse with UseItem

Since nikic/php-parser version 5 some classes got renamed. This change aligns the extender with the new names of the classes.
evoWeb · Nov 23, 2024 · e8d8874 · e8d8874
1 parent 95389c7
commit e8d8874
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/Classes/Composer/Generator/PropertyGenerator.php b/Classes/Composer/Generator/PropertyGenerator.php
@@ -21,7 +21,6 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Property;
-use PhpParser\Node\Stmt\UseUse;
 
 class PropertyGenerator implements GeneratorInterface
 {

diff --git a/Classes/Composer/Generator/UseGenerator.php b/Classes/Composer/Generator/UseGenerator.php
@@ -19,7 +19,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Use_;
-use PhpParser\Node\Stmt\UseUse;
+use PhpParser\Node\UseItem;
 
 class UseGenerator implements GeneratorInterface
 {
@@ -42,7 +42,7 @@ public function generate(array $statements, array $fileSegments): array
 
     /**
      * @param FileSegments[] $fileSegments
-     * @return UseUse[]
+     * @return UseItem[]
      */
     protected function getUniqueUses(array $fileSegments): array
     {

diff --git a/Classes/Parser/FileSegments.php b/Classes/Parser/FileSegments.php
@@ -21,7 +21,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\Stmt\TraitUse;
-use PhpParser\Node\Stmt\UseUse;
+use PhpParser\Node\UseItem;
 use PhpParser\Node;
 
 class FileSegments implements \JsonSerializable
@@ -40,7 +40,7 @@ class FileSegments implements \JsonSerializable
     protected ?Name $namespace = null;
 
     /**
-     * @var UseUse[]
+     * @var UseItem[]
      */
     protected array $uses = [];
 
@@ -127,24 +127,24 @@ public function setNamespace(?Name $namespace): void
     }
 
     /**
-     * @return UseUse[]
+     * @return UseItem[]
      */
     public function getUses(): array
     {
         return $this->uses;
     }
 
     /**
-     * @param UseUse[] $uses
+     * @param UseItem[] $uses
      */
     public function setUses(array $uses): void
     {
         $this->uses = $uses;
     }
 
-    public function addUseUse(UseUse $useUse): void
+    public function addUse(UseItem $use): void
     {
-        $this->uses[] = $useUse;
+        $this->uses[] = $use;
     }
 
     public function getClass(): ?Class_

diff --git a/Classes/Parser/Visitor/UseVisitor.php b/Classes/Parser/Visitor/UseVisitor.php
@@ -16,7 +16,7 @@
 namespace Evoweb\Extender\Parser\Visitor;
 
 use PhpParser\Node;
-use PhpParser\Node\Stmt\UseUse;
+use PhpParser\Node\UseItem;
 
 class UseVisitor extends AbstractVisitor
 {
@@ -25,8 +25,8 @@ class UseVisitor extends AbstractVisitor
      */
     public function enterNode(Node $node): int|null|Node|array
     {
-        if ($node instanceof UseUse) {
-            $this->fileSegment->addUseUse($node);
+        if ($node instanceof UseItem) {
+            $this->fileSegment->addUse($node);
         }
         return $node;
     }

diff --git a/Tests/Functional/Composer/ClassComposerTest.php b/Tests/Functional/Composer/ClassComposerTest.php
@@ -18,7 +18,9 @@
 use Evoweb\Extender\Parser\FileSegments;
 use Evoweb\Extender\Tests\Functional\AbstractTestBase;
 use PhpParser\Node;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
+use PhpParser\Node\UseItem;
 use PHPUnit\Framework\Attributes\Test;
 use PhpParser\Node\PropertyItem;
 use PhpParser\Node\Stmt\Property;
@@ -38,10 +40,10 @@ public function composeMergedFileCode(): void
         $fileSegments->setFilePath($basePath);
         $fileSegments->setBaseClass(true);
         $fileSegments->setCode($code);
-        $fileSegments->setNamespace(new Node\Name('EvowebTests\BaseExtension\Domain\Model'));
-        $fileSegments->addUseUse(new Stmt\UseUse(new Node\Name('Evoweb\Domain\Model\Test')));
+        $fileSegments->setNamespace(new Name('EvowebTests\BaseExtension\Domain\Model'));
+        $fileSegments->addUse(new UseItem(new Name('Evoweb\Domain\Model\Test')));
         $fileSegments->setClass(new Stmt\Class_('ComposeMergedFileCode'));
-        $fileSegments->addTrait(new Stmt\TraitUse([new Node\Name('Evoweb\TestTrait')]));
+        $fileSegments->addTrait(new Stmt\TraitUse([new Name('Evoweb\TestTrait')]));
         // @phpstan-ignore argument.type
         $fileSegments->addProperty(new Property(2, [new PropertyItem('testProperty')]));
         $fileSegments->setConstructor(new Stmt\ClassMethod('__construct'));
@@ -74,13 +76,13 @@ public function addFileStatement(
             }
         };
 
-        $namespaceName = new Node\Name('EvowebTests\BaseExtension\Domain\Model');
+        $namespaceName = new Name('EvowebTests\BaseExtension\Domain\Model');
 
         $fileSegments = new FileSegments();
         $fileSegments->setBaseClass(true);
         $fileSegments->setNamespace($namespaceName);
 
-        $expected = [new Node\Stmt\Namespace_($namespaceName)];
+        $expected = [new Stmt\Namespace_($namespaceName)];
 
         $actual = $subject->addFileStatement([], [$fileSegments], NamespaceGenerator::class);