Fix the support for array<key, value> syntax

src/Constraint/Typehint/PhpDocParser.php

@@ -41,7 +41,8 @@ public function getReturnTypehint(string $originalDocComment): ?string
  return null;
  }
 
- $docComment = preg_replace('/array<(.*?),\s(.*?)>/', 'array<$1,$2>', $docComment);
+ // Convert array<int, string> to array<int,string>
+ $docComment = preg_replace('/(\w+)<(.*?),\s(.*?)>/', '$1<$2,$3>', $docComment);
  if ($docComment === null) {
  return null; // @codeCoverageIgnore
  }

tests/Integration/data/success/Regular/Types/CompoundTypes/IterableTypedFullProperty.php

@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+namespace DigitalRevolution\AccessorPairConstraint\Tests\Integration\data\success\Regular\Types\CompoundTypes;
+
+class IterableTypedFullProperty
+{
+ /** @var iterable<int, stdClass> */
+ private $property = false;
+
+ /**
+ * @return iterable<int, stdClass>
+ */
+ public function getProperty(): iterable
+ {
+ return $this->property;
+ }
+
+ /**
+ * @param iterable<int, stdClass> $property
+ */
+ public function setProperty(iterable $property): self
+ {
+ $this->property = $property;
+
+ return $this;
+ }
+}

tests/Unit/Constraint/Typehint/data/All/DocComment/IteratorTypedFull.php

@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace DigitalRevolution\AccessorPairConstraint\Tests\Unit\Constraint\Typehint\data\All\DocComment;
+
+use ArrayIterator;
+use DigitalRevolution\AccessorPairConstraint\Tests\Unit\Constraint\Typehint\DataInterface;
+use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Collection;
+use phpDocumentor\Reflection\Types\String_;
+
+class IteratorTypedFull implements DataInterface
+{
+ /**
+ * @param ArrayIterator<string, string> $param
+ *
+ * @return ArrayIterator<string, string>
+ */
+ public function testMethod(ArrayIterator $param): ArrayIterator
+ {
+ return $param;
+ }
+
+ public function getExpectedType(): Type
+ {
+ return new Collection(new Fqsen('\\' . ArrayIterator::class), new String_(), new String_());
+ }
+}