Fix non-generic and untyped parameters not being taken into account

Author: thekid

ChangeLog.md

@@ -3,6 +3,11 @@ XP generics for PHP - ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 2.0.1 / 2024-08-03
+
+* Fixed non-generic and untyped parameters not being taken into account
+  (@thekid)
+
 ## 2.0.0 / 2024-03-24
 
 * Dropped support for PHP 7.0 - 7.3 - @thekid

src/main/php/lang/ast/syntax/php/Generics.class.php

@@ -134,6 +134,8 @@ public static function method($method, $components) {
       if ($parameter->type && ($generic= self::generic($parameter->type, $components))) {
         $params[]= $generic.($parameter->variadic ? '...' : '');
         $parameter->type= null;
+      } else {
+        $params[]= '';
       }
     }
     $params && $r[]= [new Literal("'params'"), new Literal("'".implode(', ', $params)."'")];

src/test/php/lang/ast/syntax/php/unittest/MethodsTest.class.php

@@ -24,8 +24,8 @@ class MethodsTest extends EmittingTest {
    * @param  string $method
    * @return lang.Type
    */
-  private function parameterType($type, $method) {
-    return Reflection::type($type)->method($method)->parameter(0)->constraint()->type();
+  private function parameterType($type, $method, $position= 0) {
+    return Reflection::type($type)->method($method)->parameter($position)->constraint()->type();
   }
 
   /**
@@ -49,6 +49,16 @@ public function push(E $element) { }
     Assert::equals($c, $this->parameterType($t->newGenericType([$c]), 'push'));
   }
 
+  #[Test]
+  public function generic_parameter_type_following_non_generic() {
+    $t= $this->type('class %T<E> {
+      public function map(string $name, E $element) { }
+    }');
+
+    $c= typeof($this);
+    Assert::equals($c, $this->parameterType($t->newGenericType([$c]), 'map', 1));
+  }
+
   #[Test]
   public function generic_type_union() {
     $t= $this->type('class %T<E> {