From 4bf544b199805ef93f0c555ef8ca8c13390f97b1 Mon Sep 17 00:00:00 2001
From: Jean-Luc Herren <jlh@gmx.ch>
Date: Sat, 29 Jan 2022 18:10:47 +0100
Subject: [PATCH] PhpDocNode: Swap array_column() and array_filter()

See phpstan/phpstan-src#948
---
 src/Ast/PhpDoc/PhpDocNode.php | 162 +++++++++++++++++-----------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/src/Ast/PhpDoc/PhpDocNode.php b/src/Ast/PhpDoc/PhpDocNode.php
index 1d08b888..e3b4cfaa 100644
--- a/src/Ast/PhpDoc/PhpDocNode.php
+++ b/src/Ast/PhpDoc/PhpDocNode.php
@@ -50,11 +50,11 @@ public function getTagsByName(string $tagName): array
 	 */
 	public function getVarTagValues(string $tagName = '@var'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof VarTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof VarTagValueNode;
+			}
 		);
 	}
 
@@ -64,11 +64,11 @@ public function getVarTagValues(string $tagName = '@var'): array
 	 */
 	public function getParamTagValues(string $tagName = '@param'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof ParamTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof ParamTagValueNode;
+			}
 		);
 	}
 
@@ -78,11 +78,11 @@ public function getParamTagValues(string $tagName = '@param'): array
 	 */
 	public function getTemplateTagValues(string $tagName = '@template'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof TemplateTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof TemplateTagValueNode;
+			}
 		);
 	}
 
@@ -92,11 +92,11 @@ public function getTemplateTagValues(string $tagName = '@template'): array
 	 */
 	public function getExtendsTagValues(string $tagName = '@extends'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof ExtendsTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof ExtendsTagValueNode;
+			}
 		);
 	}
 
@@ -106,11 +106,11 @@ public function getExtendsTagValues(string $tagName = '@extends'): array
 	 */
 	public function getImplementsTagValues(string $tagName = '@implements'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof ImplementsTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof ImplementsTagValueNode;
+			}
 		);
 	}
 
@@ -120,11 +120,11 @@ public function getImplementsTagValues(string $tagName = '@implements'): array
 	 */
 	public function getUsesTagValues(string $tagName = '@use'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof UsesTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof UsesTagValueNode;
+			}
 		);
 	}
 
@@ -134,11 +134,11 @@ public function getUsesTagValues(string $tagName = '@use'): array
 	 */
 	public function getReturnTagValues(string $tagName = '@return'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof ReturnTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof ReturnTagValueNode;
+			}
 		);
 	}
 
@@ -148,11 +148,11 @@ public function getReturnTagValues(string $tagName = '@return'): array
 	 */
 	public function getThrowsTagValues(string $tagName = '@throws'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof ThrowsTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof ThrowsTagValueNode;
+			}
 		);
 	}
 
@@ -162,25 +162,25 @@ public function getThrowsTagValues(string $tagName = '@throws'): array
 	 */
 	public function getMixinTagValues(string $tagName = '@mixin'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof MixinTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof MixinTagValueNode;
+			}
 		);
 	}
 
 
 	/**
-	 * @return \PHPStan\PhpDocParser\Ast\PhpDoc\DeprecatedTagValueNode[]
+	 * @return DeprecatedTagValueNode[]
 	 */
 	public function getDeprecatedTagValues(): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName('@deprecated'), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof DeprecatedTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName('@deprecated'), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof DeprecatedTagValueNode;
+			}
 		);
 	}
 
@@ -190,11 +190,11 @@ public function getDeprecatedTagValues(): array
 	 */
 	public function getPropertyTagValues(string $tagName = '@property'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof PropertyTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof PropertyTagValueNode;
+			}
 		);
 	}
 
@@ -204,11 +204,11 @@ public function getPropertyTagValues(string $tagName = '@property'): array
 	 */
 	public function getPropertyReadTagValues(string $tagName = '@property-read'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof PropertyTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof PropertyTagValueNode;
+			}
 		);
 	}
 
@@ -218,11 +218,11 @@ public function getPropertyReadTagValues(string $tagName = '@property-read'): ar
 	 */
 	public function getPropertyWriteTagValues(string $tagName = '@property-write'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof PropertyTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof PropertyTagValueNode;
+			}
 		);
 	}
 
@@ -232,11 +232,11 @@ public function getPropertyWriteTagValues(string $tagName = '@property-write'):
 	 */
 	public function getMethodTagValues(string $tagName = '@method'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof MethodTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof MethodTagValueNode;
+			}
 		);
 	}
 
@@ -246,11 +246,11 @@ public function getMethodTagValues(string $tagName = '@method'): array
 	 */
 	public function getTypeAliasTagValues(string $tagName = '@phpstan-type'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof TypeAliasTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof TypeAliasTagValueNode;
+			}
 		);
 	}
 
@@ -260,11 +260,11 @@ public function getTypeAliasTagValues(string $tagName = '@phpstan-type'): array
 	 */
 	public function getTypeAliasImportTagValues(string $tagName = '@phpstan-import-type'): array
 	{
-		return array_column(
-			array_filter($this->getTagsByName($tagName), static function (PhpDocTagNode $tag): bool {
-				return $tag->value instanceof TypeAliasImportTagValueNode;
-			}),
-			'value'
+		return array_filter(
+			array_column($this->getTagsByName($tagName), 'value'),
+			static function (PhpDocTagValueNode $value): bool {
+				return $value instanceof TypeAliasImportTagValueNode;
+			}
 		);
 	}