Replace all $_ENV accesses by getenv()

Fixes #10

Author: thekid

ChangeLog.md

@@ -3,6 +3,12 @@ AWS Lambda change log
 
 ## ?.?.? / ????-??-??
 
+## 2.1.1 / 2021-09-15
+
+* Fixed issue #10: lang.IndexOutOfBoundsException (Undefined index: XP_VERSION)
+  on systems where the PHP *variables_order* setting does not include `E`.
+  (@thekid)
+
 ## 2.1.0 / 2021-08-30
 
 * Sped up build by using `-j $(nproc)` flag for `make`, see #7 - @thekid

src/main/php/com/amazon/aws/lambda/Environment.class.php

@@ -15,8 +15,9 @@ class Environment {
   public $root, $writer, $properties;
 
   /** Creates a new environment */
-  public function __construct(string $root, StringWriter $writer= null) {
+  public function __construct(string $root, StringWriter $writer= null, array $variables= null) {
     $this->root= $root;
+    $this->variables= $variables ?? (PHP_VERSION_ID >= 70100 ? getenv() : $_SERVER);
     $this->writer= $writer ?? Console::$out;
     $this->properties= new FilesystemPropertySource($root);
   }
@@ -29,8 +30,8 @@ public function path(string $path): Path { return new Path($this->root, $path);
 
   /** Returns temporary directory */
   public function tempDir(): Path {
-    foreach (['TEMP', 'TMP', 'TMPDIR', 'TEMPDIR'] as $variant) {
-      if (isset($_ENV[$variant])) return new Path($_ENV[$variant]);
+    foreach (['TEMP', 'TMP', 'TMPDIR', 'TEMPDIR'] as $variable) {
+      if (isset($this->variables[$variable])) return new Path($this->variables[$variable]);
     }
     return new Path(sys_get_temp_dir());
   }
@@ -42,7 +43,7 @@ public function tempDir(): Path {
    * @return ?string
    */
   public function variable($name) {
-    return $_ENV[$name] ?? null;
+    return $this->variables[$name] ?? null;
   }
 
   /**

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

@@ -3,7 +3,7 @@
 use Throwable;
 use com\amazon\aws\lambda\{Context, Environment};
 use io\IOException;
-use lang\{XPClass, XPException};
+use lang\{XPClass, XPException, Environment as System};
 use peer\http\{HttpConnection, RequestData};
 use text\json\{Json, StreamInput};
 use util\cmd\Console;
@@ -16,25 +16,32 @@
 class AwsRunner {
 
   /**
-   * Returns the lambda handler class using the `_HANDLER` environment
-   * variable.
+   * Returns the lambda handler instance using the `_HANDLER` and
+   * `LAMBDA_TASK_ROOT` environment variables.
    *
-   * @return lang.XPClass
+   * @param  [:string] $environment
+   * @param  io.streams.StringWriter $writer
+   * @return com.amazon.aws.lambda.Handler
    */
-  private static function handler() {
-    return XPClass::forName($_ENV['_HANDLER']);
+  private static function handler($environment, $writer) {
+    return XPClass::forName($environment['_HANDLER'])->newInstance(new Environment(
+      $environment['LAMBDA_TASK_ROOT'] ?? '.',
+      $writer,
+      $environment
+    ));
   }
 
   /**
    * Returns a lambda API endpoint using the `AWS_LAMBDA_RUNTIME_API`
    * environment variable.
    *
    * @see    https://docs.aws.amazon.com/lambda/latest/dg/runtimes-api.html
+   * @param  [:string] $environment
    * @param  string $path
    * @return peer.http.HttpConnection
    */
-  private static function endpoint($path) {
-    $c= new HttpConnection("http://{$_ENV['AWS_LAMBDA_RUNTIME_API']}/2018-06-01/runtime/{$path}");
+  private static function endpoint($environment, $path) {
+    $c= new HttpConnection("http://{$environment['AWS_LAMBDA_RUNTIME_API']}/2018-06-01/runtime/{$path}");
 
     // Use a 15 minute timeout, this is the maximum lambda runtime, see
     // https://docs.aws.amazon.com/lambda/latest/dg/gettingstarted-limits.html
@@ -95,12 +102,13 @@ private static function error($e) {
    * @return int
    */
   public static function main($args) {
+    $environment= System::variables();
 
     // Initialization
     try {
-      $lambda= self::handler()->newInstance(new Environment($_ENV['LAMBDA_TASK_ROOT'], Console::$out))->lambda();
+      $lambda= self::handler($environment, Console::$out)->lambda();
     } catch (Throwable $t) {
-      self::endpoint('init/error')->post(
+      self::endpoint($environment, 'init/error')->post(
         new RequestData(self::error($t)),
         ['Content-Type' => 'application/json']
       );
@@ -110,13 +118,13 @@ public static function main($args) {
     // Process events using the lambda runtime interface
     do {
       try {
-        $r= self::endpoint('invocation/next')->get();
+        $r= self::endpoint($environment, 'invocation/next')->get();
       } catch (IOException $e) {
         Console::$err->writeLine($e);
         break;
       }
 
-      $context= new Context($r->headers(), $_ENV);
+      $context= new Context($r->headers(), $environment);
       try {
         $event= 0 === $context->payloadLength ? null : self::read($r->in());
 
@@ -127,7 +135,7 @@ public static function main($args) {
         $response= self::error($t);
       }
 
-      self::endpoint("invocation/{$context->awsRequestId}/{$type}")->post(
+      self::endpoint($environment, "invocation/{$context->awsRequestId}/{$type}")->post(
         new RequestData($response),
         ['Content-Type' => 'application/json']
       );

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

@@ -20,7 +20,7 @@ private function image(string $name, string $version, array $dependencies= [], b
     if (empty($out)) {
 
       // Support 3-digit `6.1.0` as well as 4-digit `6.1.0.1234` formats
-      $runners= preg_replace('/^(\d+\.\d+\.\d+)(.*)/', '$1', $_ENV['XP_VERSION']);
+      $runners= preg_replace('/^(\d+\.\d+\.\d+)(.*)/', '$1', getenv('XP_VERSION'));
 
       // Ensure dependencies exist
       foreach ($dependencies as $dependency => $transitive) {

src/test/php/com/amazon/aws/lambda/unittest/EnvironmentTest.class.php

@@ -5,24 +5,10 @@
 use io\{Path, File, Files};
 use lang\ElementNotFoundException;
 use lang\Environment as System;
-use unittest\{Assert, After, Before, Test};
+use unittest\{Assert, Test};
 use util\Properties;
 
 class EnvironmentTest {
-  private $temp= [];
-
-  #[Before]
-  public function cleanTemp() {
-    foreach (['TEMP', 'TMP', 'TMPDIR', 'TEMPDIR'] as $variable) {
-      $this->temp[$variable]= $_ENV[$variable] ?? null;
-      unset($_ENV[$variable]);
-    }
-  }
-
-  #[After]
-  public function restoreTemp() {
-    $_ENV += $this->temp;
-  }
 
   #[Test]
   public function can_create() {
@@ -41,26 +27,22 @@ public function path() {
 
   #[Test]
   public function tempDir_prefers_using_environment() {
-    $_ENV['TEMP']= 'tmp';
-    Assert::equals(new Path('tmp'), (new Environment('.'))->tempDir());
+    Assert::equals(new Path('tmp'), (new Environment('.', null, ['TEMP' => 'tmp']))->tempDir());
   }
 
   #[Test]
   public function tempDir_falls_back_to_sys_get_temp_dir() {
-    unset($_ENV['TEMP']);
-    Assert::equals(new Path(sys_get_temp_dir()), (new Environment('.'))->tempDir());
+    Assert::equals(new Path(sys_get_temp_dir()), (new Environment('.', null, []))->tempDir());
   }
 
   #[Test]
   public function variable() {
-    $_ENV['TEST']= 'true';
-    Assert::equals('true', (new Environment('.'))->variable('TEST'));
+    Assert::equals('true', (new Environment('.', null, ['TEST' => 'true']))->variable('TEST'));
   }
 
   #[Test]
   public function non_existant_variable() {
-    unset($_ENV['TEST']);
-    Assert::null((new Environment('.'))->variable('TEST'));
+    Assert::null((new Environment('.', null, []))->variable('TEST'));
   }
 
   #[Test]