Collection: Add Read Handler

Zend/zend_collection.c

@@ -145,3 +145,40 @@ void zend_collection_add_item(zend_object *object, zval *offset, zval *value)
 	}
 
 }
+
+static int key_type_allowed(zend_class_entry *ce, zval *offset)
+{
+	ZEND_ASSERT(ce->ce_flags & ZEND_ACC_COLLECTION);
+
+	if (ce->collection_key_type != Z_TYPE_P(offset)) {
+		zend_type_error(
+			"Key type %s of element does not match collection key type %s",
+			offset ? zend_zval_type_name(offset) : zend_get_type_by_const(IS_NULL),
+			zend_get_type_by_const(ce->collection_key_type)
+		);
+		return false;
+	}
+
+	return true;
+}
+
+zval *zend_collection_read_item(zend_object *object, zval *offset)
+{
+	zval rv;
+	zval *value_prop, *value;
+	zend_class_entry *ce = object->ce;
+
+	if (!key_type_allowed(ce, offset)) {
+		return NULL;
+	}
+
+	value_prop = zend_read_property_ex(ce, object, ZSTR_KNOWN(ZEND_STR_VALUE), true, &rv);
+
+	if (Z_TYPE_P(offset) == IS_STRING) {
+		value = zend_hash_find(HASH_OF(value_prop), Z_STR_P(offset));
+	} else {
+		value = zend_hash_index_find(HASH_OF(value_prop), Z_LVAL_P(offset));
+	}
+
+	return value;
+}

Zend/zend_collection.h

@@ -35,6 +35,7 @@ void zend_collection_register_handlers(zend_class_entry *ce);
 void zend_collection_register_props(zend_class_entry *ce);
 
 void zend_collection_add_item(zend_object *object, zval *offset, zval *value);
+zval *zend_collection_read_item(zend_object *object, zval *offset);
 
 END_EXTERN_C()
 

Zend/zend_object_handlers.c

@@ -1183,6 +1183,8 @@ ZEND_API zval *zend_std_read_dimension(zend_object *object, zval *offset, int ty
 			return NULL;
 		}
 		return rv;
+	} else if (zend_class_implements_interface(ce, zend_ce_collection)) {
+		return zend_collection_read_item(object, offset);
 	} else {
 	    zend_bad_array_access(ce);
 		return NULL;