Fix class detail parsing for function types

Author: thekid

ChangeLog.md

@@ -7,6 +7,8 @@ XP Framework Core ChangeLog
 
 ### Bugfixes
 
+* Fixed class detail parsing for function types
+  (@thekid)
 * Fixed Type::forName() to also work for the `callable` type union.
   (@thekid)
 * Fixed issue #74: Ambiguity in function types

src/main/php/lang/reflect/ClassParser.class.php

@@ -322,6 +322,12 @@ public static function typeIn($text) {
       $p= self::matching($text, '(', ')');
       $p+= strspn($text, ': ', $p);
       return substr($text, 0, $p).self::typeIn(substr($text, $p));
+    } else if (0 === strncmp($text, '(function(', 10)) {
+      $p= self::matching($text, '(', ')');
+      return substr($text, 0, $p).self::typeIn(substr($text, $p));
+    } else if ('[' === $text{0}) {
+      $p= self::matching($text, '[', ']');
+      return substr($text, 0, $p);
     } else if (strstr($text, '<')) {
       $p= self::matching($text, '<', '>');
       return substr($text, 0, $p);

src/main/resources/VERSION

@@ -1 +1 @@
-6.2.3-dev
+6.2.2

src/test/php/net/xp_framework/unittest/reflection/ClassDetailsTest.class.php

@@ -134,6 +134,30 @@ public function function_returning_generic() {
     $this->assertEquals('function(): util.Filter<string>', $details[DETAIL_ARGUMENTS][0]);
   }
 
+  #[@test]
+  public function function_returning_array() {
+    $details= $this->parseComment('/** @param  function(): int[] param1 */');
+    $this->assertEquals('function(): int[]', $details[DETAIL_ARGUMENTS][0]);
+  }
+
+  #[@test]
+  public function array_of_functions() {
+    $details= $this->parseComment('/** @param  (function(): int)[] param1 */');
+    $this->assertEquals('(function(): int)[]', $details[DETAIL_ARGUMENTS][0]);
+  }
+
+  #[@test]
+  public function map_of_functions() {
+    $details= $this->parseComment('/** @param  [:function(): int] param1 */');
+    $this->assertEquals('[:function(): int]', $details[DETAIL_ARGUMENTS][0]);
+  }
+
+  #[@test]
+  public function map_of_functions_with_braces() {
+    $details= $this->parseComment('/** @param  [:(function(): int)] param1 */');
+    $this->assertEquals('[:(function(): int)]', $details[DETAIL_ARGUMENTS][0]);
+  }
+
   #[@test]
   public function throwsList() {
     $details= $this->parseComment('