From 29dd54be902bbf574f9102e7f074689ba66f5470 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Wed, 24 Jul 2024 23:37:17 +0200
Subject: [PATCH] Fix iterator type mallform (#53)

* add failing iterator fixture

* fix
---
 .../SwitchedTypeAndNameMalformWorker.php      |  2 +-
 .../Fixture/iterator_flip.php.inc             | 19 +++++++++++++++++++
 .../ParamReturnAndVarTagMalformsFixerTest.php |  3 ---
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/Fixture/iterator_flip.php.inc

diff --git a/src/TokenRunner/DocBlock/MalformWorker/SwitchedTypeAndNameMalformWorker.php b/src/TokenRunner/DocBlock/MalformWorker/SwitchedTypeAndNameMalformWorker.php
index 0cf3ede31..b9cb60953 100644
--- a/src/TokenRunner/DocBlock/MalformWorker/SwitchedTypeAndNameMalformWorker.php
+++ b/src/TokenRunner/DocBlock/MalformWorker/SwitchedTypeAndNameMalformWorker.php
@@ -16,7 +16,7 @@ final class SwitchedTypeAndNameMalformWorker implements MalformWorkerInterface
      * @var string
      * @see https://regex101.com/r/4us32A/1
      */
-    private const NAME_THEN_TYPE_REGEX = '#@((?:psalm-|phpstan-)?(?:param|var))(\s+)(?<name>\$\w+)(\s+)(?<type>[|\\\\\w\[\]]+)#';
+    private const NAME_THEN_TYPE_REGEX = '#@((?:psalm-|phpstan-)?(?:param|var))(\s+)(?<name>\$\w+)(\s+)(?<type>[|\\\\\w\[\]\<\>]+)#';
 
     /**
      * @param Tokens<Token> $tokens
diff --git a/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/Fixture/iterator_flip.php.inc b/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/Fixture/iterator_flip.php.inc
new file mode 100644
index 000000000..be381142e
--- /dev/null
+++ b/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/Fixture/iterator_flip.php.inc
@@ -0,0 +1,19 @@
+<?php
+
+function test($value): string
+{
+    /* @var $value Iterator<SomeType> */
+    return $value;
+}
+
+?>
+-----
+<?php
+
+function test($value): string
+{
+    /** @var Iterator<SomeType> $value */
+    return $value;
+}
+
+?>
diff --git a/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php b/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php
index baa16e6f5..393d45318 100644
--- a/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php
+++ b/tests/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php
@@ -8,9 +8,6 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
-/**
- * @mimic https://github.com/rectorphp/rector/pull/807/files
- */
 final class ParamReturnAndVarTagMalformsFixerTest extends AbstractCheckerTestCase
 {
     #[DataProvider('provideData')]