Implement "array access" getters, as well as the "property access" getters.

Author: cscott

src/node_php_jsobject_class.cc

@@ -186,6 +186,27 @@ PHP_METHOD(JsObject, __get) {
     msg.retval_.ToPhp(obj->channel, return_value, return_value_ptr TSRMLS_CC);
 }
 
+/* Use (slightly thunked) versions of the has/read/write property handlers
+ * for dimensions as well, so that $obj['foo'] acts like $obj->foo. */
+static int node_php_jsobject_has_dimension(zval *obj, zval *idx, int chk_type TSRMLS_DC) {
+    // thunk!
+    if (chk_type == 0) { chk_type = 2; }
+    // use standard has_property method with new chk_type
+    return node_php_jsobject_handlers.has_property(obj, idx, chk_type ZEND_HASH_KEY_NULL TSRMLS_CC);
+}
+static zval *node_php_jsobject_read_dimension(zval *obj, zval *off, int type TSRMLS_DC) {
+    // use standard read_property method
+    return node_php_jsobject_handlers.read_property(obj, off, type ZEND_HASH_KEY_NULL TSRMLS_CC);
+}
+static void node_php_jsobject_write_dimension(zval *obj, zval *off, zval *val TSRMLS_DC) {
+    // use standard write_property method
+    node_php_jsobject_handlers.write_property(obj, off, val ZEND_HASH_KEY_NULL TSRMLS_CC);
+}
+static void node_php_jsobject_unset_dimension(zval *obj, zval *off TSRMLS_DC) {
+    // use standard unset_property method
+    node_php_jsobject_handlers.unset_property(obj, off ZEND_HASH_KEY_NULL TSRMLS_CC);
+}
+
 static void node_php_jsobject_free_storage(void *object, zend_object_handle handle TSRMLS_DC) {
     node_php_jsobject *c = (node_php_jsobject *) object;
 
@@ -310,5 +331,11 @@ PHP_MINIT_FUNCTION(node_php_jsobject_class) {
     node_php_jsobject_handlers.get_closure = node_php_jsobject_get_closure;
     */
 
+    /* Array access handlers: slightly thunked versions of property handlers. */
+    node_php_jsobject_handlers.read_dimension = node_php_jsobject_read_dimension;
+    node_php_jsobject_handlers.write_dimension = node_php_jsobject_write_dimension;
+    node_php_jsobject_handlers.has_dimension = node_php_jsobject_has_dimension;
+    node_php_jsobject_handlers.unset_dimension = node_php_jsobject_unset_dimension;
+
     return SUCCESS;
 }

test/context.js

@@ -67,37 +67,44 @@ describe('Passing context object from JS to PHP', function() {
 			}
 		}).then(function(v) {
 			out.toString().should.equal(
-				'a: int(0)\n' +
+				'->a: int(0)\n' +
+				'[\'a\']: int(0)\n' +
 				'isset: bool(true)\n' +
 				'empty: bool(true)\n' +
 				'exists: bool(true)\n' +
 				'\n' +
-				'b: int(42)\n' +
+				'->b: int(42)\n' +
+				'[\'b\']: int(42)\n' +
 				'isset: bool(true)\n' +
 				'empty: bool(false)\n' +
 				'exists: bool(true)\n' +
 				'\n' +
-				'c: NULL\n' +
+				'->c: NULL\n' +
+				'[\'c\']: NULL\n' +
 				'isset: bool(false)\n' +
 				'empty: bool(true)\n' +
 				'exists: bool(true)\n' +
 				'\n' +
-				'd: NULL\n' +
+				'->d: NULL\n' +
+				'[\'d\']: NULL\n' +
 				'isset: bool(false)\n' +
 				'empty: bool(true)\n' +
 				'exists: bool(true)\n' +
 				'\n' +
-				'e: string(1) "0"\n' +
+				'->e: string(1) "0"\n' +
+				'[\'e\']: string(1) "0"\n' +
 				'isset: bool(true)\n' +
 				'empty: bool(true)\n' +
 				'exists: bool(true)\n' +
 				'\n' +
-				'f: string(1) "1"\n' +
+				'->f: string(1) "1"\n' +
+				'[\'f\']: string(1) "1"\n' +
 				'isset: bool(true)\n' +
 				'empty: bool(false)\n' +
 				'exists: bool(true)\n' +
 				'\n' +
-				'g: NULL\n' +
+				'->g: NULL\n' +
+				'[\'g\']: NULL\n' +
 				'isset: bool(false)\n' +
 				'empty: bool(true)\n' +
 				'exists: bool(false)\n' +

test/context2.php

@@ -1,43 +1,50 @@
 <?php
 $c = $_SERVER['CONTEXT'];
 
-echo "a: "; var_dump($c->a);
+echo "->a: "; var_dump($c->a);
+echo "['a']: "; var_dump($c['a']);
 echo "isset: "; var_dump(isset($c->a));
 echo "empty: "; var_dump(empty($c->a));
 echo "exists: "; var_dump(property_exists($c, "a"));
 echo "\n";
 
-echo "b: "; var_dump($c->b);
+echo "->b: "; var_dump($c->b);
+echo "['b']: "; var_dump($c['b']);
 echo "isset: "; var_dump(isset($c->b));
 echo "empty: "; var_dump(empty($c->b));
 echo "exists: "; var_dump(property_exists($c, "b"));
 echo "\n";
 
-echo "c: "; var_dump($c->c);
+echo "->c: "; var_dump($c->c);
+echo "['c']: "; var_dump($c['c']);
 echo "isset: "; var_dump(isset($c->c));
 echo "empty: "; var_dump(empty($c->c));
 echo "exists: "; var_dump(property_exists($c, "c"));
 echo "\n";
 
-echo "d: "; var_dump($c->d);
+echo "->d: "; var_dump($c->d);
+echo "['d']: "; var_dump($c['d']);
 echo "isset: "; var_dump(isset($c->d));
 echo "empty: "; var_dump(empty($c->d));
 echo "exists: "; var_dump(property_exists($c, "d"));
 echo "\n";
 
-echo "e: "; var_dump($c->e);
+echo "->e: "; var_dump($c->e);
+echo "['e']: "; var_dump($c['e']);
 echo "isset: "; var_dump(isset($c->e));
 echo "empty: "; var_dump(empty($c->e));
 echo "exists: "; var_dump(property_exists($c, "e"));
 echo "\n";
 
-echo "f: "; var_dump($c->f);
+echo "->f: "; var_dump($c->f);
+echo "['f']: "; var_dump($c['f']);
 echo "isset: "; var_dump(isset($c->f));
 echo "empty: "; var_dump(empty($c->f));
 echo "exists: "; var_dump(property_exists($c, "f"));
 echo "\n";
 
-echo "g: "; var_dump($c->g);
+echo "->g: "; var_dump($c->g);
+echo "['g']: "; var_dump($c['g']);
 echo "isset: "; var_dump(isset($c->g));
 echo "empty: "; var_dump(empty($c->g));
 echo "exists: "; var_dump(property_exists($c, "g"));