fix: handle comments in classes when parsing types imports

CuyZ · Oct 18, 2023 · 3b663a9 · 3b663a9
1 parent 004eb16
commit 3b663a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Utility/Reflection/DocParser.php b/src/Utility/Reflection/DocParser.php
@@ -231,11 +231,16 @@ private static function splitStringBy(string $string, string ...$cases): array
         $result = [$string];
 
         foreach ($cases as $case) {
-            foreach ($result as $value) {
+            $previousResult = $result;
+            $result = [];
+            foreach ($previousResult as $value) {
                 $result = array_merge($result, explode($case, $value));
             }
         }
 
+        // Remove the first segment of the docs before the first `$cases` string
+        array_shift($result);
+
         return $result;
     }
 }
diff --git a/tests/Integration/Mapping/Object/LocalTypeAliasMappingTest.php b/tests/Integration/Mapping/Object/LocalTypeAliasMappingTest.php
@@ -74,6 +74,9 @@ class GenericObjectWithPhpStanLocalAlias
 }
 
 /**
+ * Comment:
+ * Some comment before types
+ *
  * @phpstan-type AliasWithEqualsSign = int
  * @phpstan-type AliasWithoutEqualsSign int
  * @phpstan-type AliasShapedArray = array{foo: string, bar: int}
@@ -111,6 +114,9 @@ class AnotherPhpStanLocalAlias
 }
 
 /**
+ * Comment:
+ * Some comment before import
+ *
  * @phpstan-import-type AliasWithEqualsSign from PhpStanLocalAliases
  * @phpstan-import-type AliasWithoutEqualsSign from AnotherPhpStanLocalAlias
  */
@@ -134,6 +140,9 @@ class GenericObjectWithPsalmLocalAlias
 }
 
 /**
+ * Comment:
+ * Some comment before types
+ *
  * @psalm-type AliasWithEqualsSign = int
  * @psalm-type AliasWithoutEqualsSign int
  * @psalm-type AliasShapedArray = array{foo: string, bar: int}
@@ -171,6 +180,9 @@ class AnotherPsalmLocalAliases
 }
 
 /**
+ * Comment:
+ * Some comment before import
+ *
  * @psalm-import-type AliasWithEqualsSign from PsalmLocalAliases
  * @psalm-import-type AliasWithoutEqualsSign from AnotherPsalmLocalAliases
  */