Skip to content

Commit 950c50a

Browse files
committed
Revert "Add psalm and phpstan prefixed annotations to param and return group"
This reverts commit 7dfeaa9. That commit has a lot of impact and as such, should go to 9.0.x
1 parent 378aa39 commit 950c50a

File tree

3 files changed

+8
-24
lines changed

3 files changed

+8
-24
lines changed

lib/Doctrine/ruleset.xml

+2-10
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,8 @@
174174
@ODM\,
175175
@PHPCR\,
176176
"/>
177-
<element value="
178-
@param,
179-
@psalm-param,
180-
@phpstan-param,
181-
"/>
182-
<element value="
183-
@return,
184-
@psalm-return,
185-
@phpstan-return,
186-
"/>
177+
<element value="@param"/>
178+
<element value="@return"/>
187179
<element value="@throws"/>
188180
</property>
189181
</properties>

tests/fixed/doc-comment-spacing.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,10 @@ public function c(iterable $foo): void
5656
* @PHPCR\Uuid
5757
* @PHPCR\Field
5858
*
59-
* @param int[] $foo
60-
* @param int[] $bar
61-
* @psalm-param array<string, int> $foo
62-
* @phpstan-param array<string, int> $foo
59+
* @param int[] $foo
60+
* @param int[] $bar
6361
*
64-
* @return int[]
65-
* @psalm-return array<string, int>
66-
* @phpstan-return array<string, int>
62+
* @return int[]
6763
*
6864
* @throws FooException
6965
* @throws BarException

tests/input/doc-comment-spacing.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,20 @@ public function c(iterable $foo): void
4343
* Description
4444
* More Description
4545
* @throws FooException
46-
* @param int[] $foo
46+
* @param int[] $foo
4747
* @uses other
4848
* @throws BarException
49-
* @return int[]
49+
* @return int[]
5050
* @ORM\Id
5151
* @internal
5252
* @link https://example.com
5353
* @ODM\Id
5454
* @deprecated
5555
* @PHPCR\Uuid
56-
* @param int[] $bar
56+
* @param int[] $bar
5757
* @PHPCR\Field
5858
* @ODM\Column
5959
* @ORM\Column
60-
* @psalm-param array<string, int> $foo
61-
* @phpstan-return array<string, int>
62-
* @phpstan-param array<string, int> $foo
63-
* @psalm-return array<string, int>
6460
* @see other
6561
*
6662
*/

0 commit comments

Comments
 (0)