Allow extending classes and implementing interfaces from modules

Author: thekid

src/main/php/lang/ClassLoader.class.php

@@ -134,7 +134,7 @@ public static function registerLoader(IClassLoader $l, $before= false) {
    */
   public static function declareModule($l) {
     $moduleInfo= $l->getResource('module.xp');
-    if (!preg_match('/module ([a-z_\/\.-]+)(\(([^\)]+)\))?\s*{/', $moduleInfo, $m)) {
+    if (!preg_match('/module ([a-z_\/\.-]+)(.*){/', $moduleInfo, $m)) {
       raise('lang.ElementNotFoundException', 'Missing or malformed module-info in '.$l->toString());
     }
 
@@ -145,9 +145,15 @@ public static function declareModule($l) {
       $class= $decl;
     }
 
+    if (strstr($m[2], 'extends')) {
+      $parent= $m[2];
+    } else {
+      $parent= ' extends \lang\reflect\Module '.$m[2];
+    }
+
     $dyn= DynamicClassLoader::instanceFor('modules');
     $dyn->setClassBytes($class, strtr($moduleInfo, [
-      $m[0] => 'class '.$decl.' extends \lang\reflect\Module {',
+      $m[0] => 'class '.$decl.$parent.'{',
       '<?php' => '', '?>' => ''
     ]));
     return $dyn->loadClass($class)->newInstance($m[1], $l);

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

@@ -85,4 +85,22 @@ public function initialize() {
     }']));
     $this->assertEquals(1, Module::forName('xp-framework/initialized')->initialized);
   }
+
+  #[@test]
+  public function module_inheritance() {
+    $cl= ClassLoader::defineClass('net.xp_framework.unittest.reflection.BaseModule', 'lang.reflect.Module', []);
+    $this->register(new LoaderProviding([
+      'module.xp' => '<?php module xp-framework/child extends net\xp_framework\unittest\reflection\BaseModule { }'
+    ]));
+    $this->assertEquals($cl, Module::forName('xp-framework/child')->getClass()->getParentclass());
+  }
+
+  #[@test]
+  public function module_implementation() {
+    $cl= ClassLoader::defineInterface('net.xp_framework.unittest.reflection.IModule', []);
+    $this->register(new LoaderProviding([
+      'module.xp' => '<?php module xp-framework/impl implements net\xp_framework\unittest\reflection\IModule { }'
+    ]));
+    $this->assertTrue(in_array($cl, Module::forName('xp-framework/impl')->getClass()->getInterfaces()));
+  }
 }