MFH 4.6.0-RELEASE

Author: thekid

ChangeLog.md

@@ -3,6 +3,14 @@ AWS Lambda change log
 
 ## ?.?.? / ????-??-??
 
+## 4.6.0 / 2023-06-17
+
+* Sticking to the principle *Be liberal in what you accept*, made it
+  possible to use pass class filenames to `xp lambda run`.
+  (@thekid)
+* Fixed issue #24: Syntax error in PHP 7.0...7.3: `unexpected '...'`
+  (@thekid)
+
 ## 4.5.0 / 2023-06-11
 
 * Check whether configured / passed handler extends the `Handler` base

src/main/php/xp/lambda/PackageLambda.class.php

@@ -51,7 +51,7 @@ public function run(): int {
     Console::writeLine('[+] Creating ', $this->target, ' (compression: ', $this->compression, ')');
     $z= ZipFile::create($this->target->asFile()->out());
 
-    $sources= [...$this->sources];
+    $sources= iterator_to_array($this->sources);
     $total= sizeof($sources) + 1;
     foreach ($sources as $i => $source) {
       Console::writef("\e[34m => [%d/%d] ", $i + 1, $total);

src/main/php/xp/lambda/RunLambda.class.php

@@ -1,7 +1,7 @@
 <?php namespace xp\lambda;
 
-use com\amazon\aws\lambda\{Context, Environment, Handler, InvokeMode, Stream, RuntimeApi};
-use lang\{XPClass, Throwable, IllegalArgumentException};
+use com\amazon\aws\lambda\{Context, Environment, Handler};
+use lang\{ClassLoader, Throwable, IllegalArgumentException};
 use util\UUID;
 use util\cmd\Console;
 
@@ -21,12 +21,17 @@ class RunLambda {
    * Creates a new `run` subcommand
    *
    * @param  string $handler
-   * @param  string... $events
+   * @param  string[] $events
    * @throws lang.ClassLoadingException
    * @throws lang.IllegalArgumentException
    */
-  public function __construct($handler= 'Handler', ... $events) {
-    $this->impl= XPClass::forName($handler);
+  public function __construct($handler, array $events= []) {
+    if (is_file($handler)) {
+      $this->impl= ClassLoader::getDefault()->loadUri($handler);
+    } else {
+      $this->impl= ClassLoader::getDefault()->loadClass($handler);
+    }
+
     if (!$this->impl->isSubclassOf(Handler::class)) {
       throw new IllegalArgumentException('Class '.$handler.' is not a lambda handler');
     }

src/main/php/xp/lambda/Runner.class.php

@@ -66,21 +66,39 @@ private static function resolve(string $version= null): string {
   }
 
   /** Returns the command instance for the given name and arguments */
-  private static function command(string $name, array $args): object {
+  private static function command(string $name, array $args) {
     sscanf($name, "%[^:]:%[^\r]", $command, $version);
     switch ($command) {
-      case 'package': return new PackageLambda(new Path('function.zip'), new Sources(new Path('.'), [...$args, 'vendor']));
-      case 'run': return new RunLambda(...$args);
-      case 'runtime': return new CreateRuntime(self::resolve($version), new Path('runtime-%s.zip'), in_array('-b', $args));
-      case 'test': return new TestLambda(self::resolve($version), new Path('.'), $args);
-      default: return new DisplayError('Unknown command "'.$args[0].'"');
+      case 'package': $args[]= 'vendor'; return new PackageLambda(
+        new Path('function.zip'),
+        new Sources(new Path('.'), $args)
+      );
+
+      case 'run': $handler= array_shift($args); return new RunLambda(
+        $handler,
+        $args
+      );
+
+      case 'runtime': return new CreateRuntime(
+        self::resolve($version),
+        new Path('runtime-%s.zip'),
+        in_array('-b', $args)
+      );
+
+      case 'test': return new TestLambda(
+        self::resolve($version),
+        new Path('.'),
+        $args
+      );
+
+      default: return new DisplayError('Unknown lambda command "'.$name.'"');
     }
   }
 
   /** Entry point */
   public static function main(array $args): int {
     if (empty($args)) {
-      $c= new DisplayError('Missing command, expecting `xp lambda runtime`, `xp lambda test` or `xp lambda package`');
+      $c= new DisplayError('Missing command, expecting `xp lambda [run|package|runtime|test]`');
     } else {
       $c= self::command($args[0], array_slice($args, 1));
     }