D'oh! Fix @extends tag

src/Writer/FileWriter.php

@@ -10,10 +10,12 @@
 use Kynx\Laminas\FormShape\Psalm\UseCollector;
 use Kynx\Laminas\FormShape\TypeNamerInterface;
 use Kynx\Laminas\FormShape\Writer\Tag\Method;
+use Kynx\Laminas\FormShape\Writer\Tag\PsalmImplements;
 use Kynx\Laminas\FormShape\Writer\Tag\PsalmImportType;
-use Kynx\Laminas\FormShape\Writer\Tag\PsalmTemplateExtends;
+use Kynx\Laminas\FormShape\Writer\Tag\PsalmExtends;
 use Kynx\Laminas\FormShape\Writer\Tag\PsalmType;
 use Kynx\Laminas\FormShape\Writer\Tag\ReturnType;
+use Laminas\Form\Form;
 use Laminas\Form\FormInterface;
 use Nette\PhpGenerator\PhpFile;
 use Nette\PhpGenerator\PhpNamespace;
@@ -97,10 +99,10 @@ public function write(
         }
 
         if ($reflection->implementsInterface(FormInterface::class)) {
-            $classDocBlock = $classDocBlock->withTag(new PsalmTemplateExtends(
-                $reflection->getParentClass()->getShortName(),
-                $typeName
-            ));
+            $tag = $reflection->getParentClass() === false
+                ? new PsalmImplements('FormInterface', $typeName)
+                : new PsalmExtends($reflection->getParentClass()->getShortName(), $typeName);
+            $classDocBlock = $classDocBlock->withTag($tag);
         }
 
         $class->setComment($classDocBlock->getContents());

src/Writer/Tag/PsalmTemplateExtends.php → src/Writer/Tag/PsalmExtends.php

@@ -14,15 +14,15 @@
  * @psalm-internal Kynx\Laminas\FormShape
  * @psalm-internal KynxTest\Laminas\FormShape
  */
-final readonly class PsalmTemplateExtends implements TagInterface
+final readonly class PsalmExtends implements TagInterface
 {
     public function __construct(private string $parent, private string $type)
     {
     }
 
     public function __toString(): string
     {
-        return sprintf('@psalm-template-extends %s<%s>', $this->parent, $this->type);
+        return sprintf('@extends %s<%s>', $this->parent, $this->type);
     }
 
     public function isBefore(TagInterface $tag): bool
@@ -32,6 +32,6 @@ public function isBefore(TagInterface $tag): bool
 
     public function matches(TagInterface $tag): bool
     {
-        return str_starts_with(trim((string) $tag), '@psalm-template-extends ');
+        return str_starts_with(trim((string) $tag), '@extends ');
     }
 }

src/Writer/Tag/PsalmImplements.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kynx\Laminas\FormShape\Writer\Tag;
+
+use function sprintf;
+use function trim;
+
+final readonly class PsalmImplements implements TagInterface
+{
+    public function __construct(private string $interface, private string $type)
+    {
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('@implements %s<%s>', $this->interface, $this->type);
+    }
+
+    public function isBefore(TagInterface $tag): bool
+    {
+        return false;
+    }
+
+    public function matches(TagInterface $tag): bool
+    {
+        return str_starts_with(trim((string) $tag), '@implements ');
+    }
+}

test/Writer/FileWriterTest.php

@@ -167,7 +167,7 @@ final class NoClassDocBlock extends Form
                  * @psalm-type TNoClassDocBlockArray = array{
                  *     foo: int,
                  * }
-                 * @psalm-template-extends Form<TNoClassDocBlockArray>
+                 * @extends Form<TNoClassDocBlockArray>
                  */
                 final class NoClassDocBlock extends Form
                 {
@@ -200,7 +200,7 @@ final class NoClassDocBlockWithAttribute extends Form
                  * @psalm-type TNoClassDocBlockWithAttributeArray = array{
                  *     foo: int,
                  * }
-                 * @psalm-template-extends Form<TNoClassDocBlockWithAttributeArray>
+                 * @extends Form<TNoClassDocBlockWithAttributeArray>
                  */
                 #[TestAttribute]
                 final class NoClassDocBlockWithAttribute extends Form
@@ -241,7 +241,7 @@ final class ExistingClassDocBlock extends Form
                  * @psalm-type TExistingClassDocBlockArray = array{
                  *     foo: int,
                  * }
-                 * @psalm-template-extends Form<TExistingClassDocBlockArray>
+                 * @extends Form<TExistingClassDocBlockArray>
                  */
                 final class ExistingClassDocBlock extends Form
                 {
@@ -282,7 +282,7 @@ final class ExistingClassDocBlockWithAttribute extends Form
                  * @psalm-type TExistingClassDocBlockWithAttributeArray = array{
                  *     foo: int,
                  * }
-                 * @psalm-template-extends Form<TExistingClassDocBlockWithAttributeArray>
+                 * @extends Form<TExistingClassDocBlockWithAttributeArray>
                  */
                 #[TestAttribute]
                 final class ExistingClassDocBlockWithAttribute extends Form
@@ -315,7 +315,7 @@ final class GetDataNotOverridden extends Form
                  * @psalm-type TGetDataNotOverriddenArray = array{
                  *     foo: int,
                  * }
-                 * @psalm-template-extends Form<TGetDataNotOverriddenArray>
+                 * @extends Form<TGetDataNotOverriddenArray>
                  */
                 final class GetDataNotOverridden extends Form
                 {
@@ -355,7 +355,7 @@ public function getData(int \$flag = FormInterface::VALUES_NORMALIZED)
                  * @psalm-type TGetDataReturnTypeArray = array{
                  *     foo: int,
                  * }
-                 * @psalm-template-extends Form<TGetDataReturnTypeArray>
+                 * @extends Form<TGetDataReturnTypeArray>
                  */
                 final class GetDataReturnType extends Form
                 {
@@ -395,7 +395,7 @@ final class GetDataMethod extends Form
                  * @psalm-type TGetDataMethodArray = array{
                  *     foo: int,
                  * }
-                 * @psalm-template-extends Form<TGetDataMethodArray>
+                 * @extends Form<TGetDataMethodArray>
                  */
                 final class GetDataMethod extends Form
                 {

test/Writer/Tag/PsalmTemplateExtendsTest.php → test/Writer/Tag/PsalmExtendsTest.php

@@ -5,27 +5,27 @@
 namespace KynxTest\Laminas\FormShape\Writer\Tag;
 
 use Kynx\Laminas\FormShape\Writer\Tag\GenericTag;
-use Kynx\Laminas\FormShape\Writer\Tag\PsalmTemplateExtends;
+use Kynx\Laminas\FormShape\Writer\Tag\PsalmExtends;
 use Kynx\Laminas\FormShape\Writer\Tag\TagInterface;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
-#[CoversClass(PsalmTemplateExtends::class)]
-final class PsalmTemplateExtendsTest extends TestCase
+#[CoversClass(PsalmExtends::class)]
+final class PsalmExtendsTest extends TestCase
 {
     public function testToStringReturnsTag(): void
     {
-        $expected = '@psalm-template-extends Form<TFormArray>';
-        $tag      = new PsalmTemplateExtends('Form', 'TFormArray');
+        $expected = '@extends Form<TFormArray>';
+        $tag      = new PsalmExtends('Form', 'TFormArray');
         $actual   = (string) $tag;
         self::assertSame($expected, $actual);
     }
 
     #[DataProvider('isBeforeProvider')]
     public function testIsBefore(TagInterface $match, bool $expected): void
     {
-        $tag    = new PsalmTemplateExtends('Form', 'TFormArray');
+        $tag    = new PsalmExtends('Form', 'TFormArray');
         $actual = $tag->isBefore($match);
         self::assertSame($expected, $actual);
     }
@@ -41,15 +41,15 @@ public static function isBeforeProvider(): array
     #[DataProvider('matchProvider')]
     public function testMatches(TagInterface $match, bool $expected): void
     {
-        $tag    = new PsalmTemplateExtends('Form', 'TFormArray');
+        $tag    = new PsalmExtends('Form', 'TFormArray');
         $actual = $tag->matches($match);
         self::assertSame($expected, $actual);
     }
 
     public static function matchProvider(): array
     {
         return [
-            'psalm-template-extends' => [new GenericTag('@psalm-template-extends Foo<Bar>'), true],
+            'extends' => [new GenericTag('@extends Foo<Bar>'), true],
             'psalm-type'             => [new GenericTag('@psalm-type TFoo = array<int>'), false],
         ];
     }

test/Writer/Tag/PsalmImplementsTest.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KynxTest\Laminas\FormShape\Writer\Tag;
+
+use Kynx\Laminas\FormShape\Writer\Tag\GenericTag;
+use Kynx\Laminas\FormShape\Writer\Tag\PsalmImplements;
+use Kynx\Laminas\FormShape\Writer\Tag\TagInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(PsalmImplements::class)]
+final class PsalmImplementsTest extends TestCase
+{
+    public function testToStringReturnsTag(): void
+    {
+        $expected = '@implements FormInterface<TFormArray>';
+        $tag      = new PsalmImplements('FormInterface', 'TFormArray');
+        $actual   = (string) $tag;
+        self::assertSame($expected, $actual);
+    }
+
+    #[DataProvider('isBeforeProvider')]
+    public function testIsBefore(TagInterface $match, bool $expected): void
+    {
+        $tag    = new PsalmImplements('FormInterface', 'TFormArray');
+        $actual = $tag->isBefore($match);
+        self::assertSame($expected, $actual);
+    }
+
+    public static function isBeforeProvider(): array
+    {
+        return [
+            'internal'   => [new GenericTag('@internal'), false],
+            'psalm-type' => [new GenericTag('@psalm-type TFoo = array<int>'), false],
+        ];
+    }
+
+    #[DataProvider('matchProvider')]
+    public function testMatches(TagInterface $match, bool $expected): void
+    {
+        $tag    = new PsalmImplements('FormInterface', 'TFormArray');
+        $actual = $tag->matches($match);
+        self::assertSame($expected, $actual);
+    }
+
+    public static function matchProvider(): array
+    {
+        return [
+            'extends' => [new GenericTag('@implements Foo<Bar>'), true],
+            'psalm-type'             => [new GenericTag('@psalm-type TFoo = array<int>'), false],
+        ];
+    }
+}