Merge branch 'master' into gh-pages

Conflicts:
	.gitignore

1 files changed, 4 insertions, 4 deletions

diff --git a/php/env.php b/php/env.php
index 61bedaf..a660d3b 100644
--- a/php/env.php
+++ b/php/env.php
@@ -31,7 +31,7 @@ class Env {
         }
     }
     public function find($key) {
-        if (array_key_exists($key, $this->data)) {
+        if (array_key_exists($key->value, $this->data)) {
             return $this;
         } elseif ($this->outer) {
             return $this->outer->find($key);
@@ -40,15 +40,15 @@ class Env {
         }
     }
     public function set($key, $value) {
-        $this->data[$key] = $value;
+        $this->data[$key->value] = $value;
         return $value;
     }
     public function get($key) {
         $env = $this->find($key);
         if (!$env) {
-            throw new Exception("'" . $key . "' not found");
+            throw new Exception("'" . $key->value . "' not found");
         } else {
-            return $env->data[$key];
+            return $env->data[$key->value];
         }
     }
 }