Revert "Add psalm and phpstan prefixed annotations to param and retur…

…n group" This reverts commit 7dfeaa9. That commit has a lot of impact and as such, should go to 9.0.x
doctrine · Apr 3, 2021 · 950c50a · 950c50a
1 parent 378aa39
commit 950c50a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml
@@ -174,16 +174,8 @@
                     @ODM\,
                     @PHPCR\,
                 "/>
-                <element value="
-                    @param,
-                    @psalm-param,
-                    @phpstan-param,
-                "/>
-                <element value="
-                    @return,
-                    @psalm-return,
-                    @phpstan-return,
-                "/>
+                <element value="@param"/>
+                <element value="@return"/>
                 <element value="@throws"/>
             </property>
         </properties>

diff --git a/tests/fixed/doc-comment-spacing.php b/tests/fixed/doc-comment-spacing.php
@@ -56,14 +56,10 @@ public function c(iterable $foo): void
      * @PHPCR\Uuid
      * @PHPCR\Field
      *
-     * @param         int[] $foo
-     * @param         int[] $bar
-     * @psalm-param   array<string, int> $foo
-     * @phpstan-param array<string, int> $foo
+     * @param int[] $foo
+     * @param int[] $bar
      *
-     * @return         int[]
-     * @psalm-return   array<string, int>
-     * @phpstan-return array<string, int>
+     * @return int[]
      *
      * @throws FooException
      * @throws BarException

diff --git a/tests/input/doc-comment-spacing.php b/tests/input/doc-comment-spacing.php
@@ -43,24 +43,20 @@ public function c(iterable $foo): void
      * Description
      * More Description
      * @throws FooException
-     * @param         int[] $foo
+     * @param int[] $foo
      * @uses other
      * @throws BarException
-     * @return         int[]
+     * @return int[]
      * @ORM\Id
      * @internal
      * @link https://example.com
      * @ODM\Id
      * @deprecated
      * @PHPCR\Uuid
-     * @param         int[] $bar
+     * @param int[] $bar
      * @PHPCR\Field
      * @ODM\Column
      * @ORM\Column
-     * @psalm-param   array<string, int> $foo
-     * @phpstan-return array<string, int>
-     * @phpstan-param array<string, int> $foo
-     * @psalm-return   array<string, int>
      * @see  other
      *
      */