From 25dfbac696d7e9cedda05dc9b5791a2f31039519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Sun, 30 Jan 2022 16:53:20 +0100
Subject: [PATCH] Fix: DocBlock

---
 psalm-baseline.xml                                          | 6 +-----
 test/Unit/Format/IndentTest.php                             | 4 ++--
 test/Unit/JsonEncodeNormalizerTest.php                      | 2 +-
 test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php    | 4 ++--
 test/Unit/Vendor/Composer/ConfigHashNormalizerTest.php      | 2 +-
 test/Unit/Vendor/Composer/PackageHashNormalizerTest.php     | 2 +-
 .../Vendor/Composer/VersionConstraintNormalizerTest.php     | 4 ++--
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 5c66abf2..981e80d9 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -155,7 +155,7 @@
   <file src="test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php">
     <MixedInferredReturnType occurrences="2">
       <code>Normalizer</code>
-      <code>Normalizer[]</code>
+      <code>array&lt;int, Normalizer&gt;</code>
     </MixedInferredReturnType>
     <MixedReturnStatement occurrences="2">
       <code>$property-&gt;getValue($normalizer)</code>
@@ -179,9 +179,5 @@
       <code>\Generator&lt;array&lt;string&gt;&gt;</code>
       <code>\Generator&lt;array&lt;string&gt;&gt;</code>
     </MixedInferredReturnType>
-    <MixedReturnTypeCoercion occurrences="2">
-      <code>\Generator&lt;array&lt;string&gt;&gt;</code>
-      <code>\Generator&lt;array&lt;string&gt;&gt;</code>
-    </MixedReturnTypeCoercion>
   </file>
 </files>
diff --git a/test/Unit/Format/IndentTest.php b/test/Unit/Format/IndentTest.php
index 5dafb97d..aa07bcb1 100644
--- a/test/Unit/Format/IndentTest.php
+++ b/test/Unit/Format/IndentTest.php
@@ -309,7 +309,7 @@ public function testFromJsonReturnsIndentWithDefaultsWhenIndentCouldNotBeSniffed
     }
 
     /**
-     * @return int[]
+     * @return array<string, int>
      */
     private static function sizes(): array
     {
@@ -320,7 +320,7 @@ private static function sizes(): array
     }
 
     /**
-     * @return string[]
+     * @return array<string, string>
      */
     private static function characters(): array
     {
diff --git a/test/Unit/JsonEncodeNormalizerTest.php b/test/Unit/JsonEncodeNormalizerTest.php
index 38c80131..6ff1416a 100644
--- a/test/Unit/JsonEncodeNormalizerTest.php
+++ b/test/Unit/JsonEncodeNormalizerTest.php
@@ -96,7 +96,7 @@ static function (int $jsonEncodeFlag, int $jsonEncodeOptions): int {
     /**
      * @see https://docstore.mik.ua/orelly/webprog/pcook/ch04_25.htm
      *
-     * @param int[] $elements
+     * @param array<int, int> $elements
      *
      * @return array<array<int>>
      */
diff --git a/test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php b/test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php
index 2b36419e..5c23a30f 100644
--- a/test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php
+++ b/test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php
@@ -238,7 +238,7 @@ private static function assertComposesNormalizer(
     }
 
     /**
-     * @param string[] $classNames
+     * @param array<int, string> $classNames
      *
      * @throws \ReflectionException
      */
@@ -280,7 +280,7 @@ private static function composedNormalizer(Normalizer $normalizer): Normalizer
     /**
      *@throws \ReflectionException
      *
-     * @return Normalizer[]
+     * @return array<int, Normalizer>
      */
     private static function composedNormalizers(Normalizer $normalizer): array
     {
diff --git a/test/Unit/Vendor/Composer/ConfigHashNormalizerTest.php b/test/Unit/Vendor/Composer/ConfigHashNormalizerTest.php
index aeb81973..b776c6fe 100644
--- a/test/Unit/Vendor/Composer/ConfigHashNormalizerTest.php
+++ b/test/Unit/Vendor/Composer/ConfigHashNormalizerTest.php
@@ -372,7 +372,7 @@ public function provideProperty(): \Generator
     }
 
     /**
-     * @return string[]
+     * @return array<int, string>
      */
     private static function properties(): array
     {
diff --git a/test/Unit/Vendor/Composer/PackageHashNormalizerTest.php b/test/Unit/Vendor/Composer/PackageHashNormalizerTest.php
index 805a084e..5ee27838 100644
--- a/test/Unit/Vendor/Composer/PackageHashNormalizerTest.php
+++ b/test/Unit/Vendor/Composer/PackageHashNormalizerTest.php
@@ -132,7 +132,7 @@ public function provideProperty(): \Generator
     }
 
     /**
-     * @return string[]
+     * @return array<int, string>
      */
     private static function propertiesWhereKeysOfHashArePackages(): array
     {
diff --git a/test/Unit/Vendor/Composer/VersionConstraintNormalizerTest.php b/test/Unit/Vendor/Composer/VersionConstraintNormalizerTest.php
index 8a2345cc..bef9f22d 100644
--- a/test/Unit/Vendor/Composer/VersionConstraintNormalizerTest.php
+++ b/test/Unit/Vendor/Composer/VersionConstraintNormalizerTest.php
@@ -217,7 +217,7 @@ public function providePropertyAndUntrimmedVersionConstraint(): \Generator
     }
 
     /**
-     * @return string[]
+     * @return array<int, string>
      */
     private static function propertiesWhereValuesOfHashAreVersionConstraints(): array
     {
@@ -233,7 +233,7 @@ private static function propertiesWhereValuesOfHashAreVersionConstraints(): arra
     /**
      * @see https://getcomposer.org/doc/articles/versions.md
      *
-     * @return string[]
+     * @return array<string, string>
      */
     private static function versionConstraints(): array
     {