Add support for cloning WeakMaps

Author: nikic

Zend/tests/weakrefs/weakmap_001.phpt renamed to Zend/tests/weakrefs/weakmap_basic_map_behavior.phpt

@@ -77,11 +77,6 @@ try {
 } catch (Exception $e) {
     echo $e->getMessage(), "\n";
 }
-try {
-    clone $map;
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
 
 ?>
 --EXPECT--
@@ -99,4 +94,3 @@ WeakMap objects do not support properties
 WeakMap objects do not support properties
 Serialization of 'WeakMap' is not allowed
 Unserialization of 'WeakMap' is not allowed
-Trying to clone an uncloneable object of class WeakMap

Zend/tests/weakrefs/weakmap_002.phpt renamed to Zend/tests/weakrefs/weakmap_error_conditions.phpt

@@ -10,10 +10,11 @@ $map = new WeakMap;
 $map[$obj] = 1;
 $map2 = new WeakMap;
 $map2[$obj] = 1;
+$map3 = clone $map2;
 
-var_dump($ref->get(), $map, $map2);
+var_dump($ref->get(), $map, $map2, $map3);
 unset($obj);
-var_dump($ref->get(), $map, $map2);
+var_dump($ref->get(), $map, $map2, $map3);
 unset($ref, $map, $map2);
 
 $obj = new stdClass;
@@ -22,8 +23,9 @@ $map = new WeakMap;
 $map[$obj] = 1;
 $map2 = new WeakMap;
 $map2[$obj] = 1;
+$map3 = clone $map2;
 
-unset($ref, $map, $map2);
+unset($ref, $map, $map2, $map3);
 var_dump($obj);
 unset($obj);
 
@@ -51,10 +53,22 @@ object(WeakMap)#4 (1) {
     int(1)
   }
 }
+object(WeakMap)#5 (1) {
+  [0]=>
+  array(2) {
+    ["key"]=>
+    object(stdClass)#1 (0) {
+    }
+    ["value"]=>
+    int(1)
+  }
+}
 NULL
 object(WeakMap)#3 (0) {
 }
 object(WeakMap)#4 (0) {
 }
+object(WeakMap)#5 (0) {
+}
 object(stdClass)#4 (0) {
 }

Zend/tests/weakrefs/weakmap_005.phpt renamed to Zend/tests/weakrefs/weakmap_iteration.phpt

@@ -460,6 +460,23 @@ static HashTable *zend_weakmap_get_gc(zend_object *object, zval **table, int *n)
 	return &wm->ht;
 }
 
+static zend_object *zend_weakmap_clone_obj(zend_object *old_object)
+{
+	zend_object *new_object = zend_weakmap_create_object(zend_ce_weakmap);
+	zend_weakmap *old_wm = zend_weakmap_from(old_object);
+	zend_weakmap *new_wm = zend_weakmap_from(new_object);
+	zend_hash_copy(&new_wm->ht, &old_wm->ht, NULL);
+
+	zend_ulong obj_addr;
+	zval *val;
+	ZEND_HASH_FOREACH_NUM_KEY_VAL(&new_wm->ht, obj_addr, val) {
+		zend_weakref_register(
+			(zend_object *) obj_addr, ZEND_WEAKREF_ENCODE(new_wm, ZEND_WEAKREF_TAG_MAP));
+		zval_add_ref(val);
+	} ZEND_HASH_FOREACH_END();
+	return new_object;
+}
+
 static HashPosition *zend_weakmap_iterator_get_pos_ptr(zend_weakmap_iterator *iter) {
 	ZEND_ASSERT(iter->ht_iter != (uint32_t) -1);
 	return &EG(ht_iterators)[iter->ht_iter].pos;
@@ -658,12 +675,12 @@ void zend_register_weakref_ce(void) /* {{{ */
 	zend_weakmap_handlers.count_elements = zend_weakmap_count_elements;
 	zend_weakmap_handlers.get_properties_for = zend_weakmap_get_properties_for;
 	zend_weakmap_handlers.get_gc = zend_weakmap_get_gc;
+	zend_weakmap_handlers.clone_obj = zend_weakmap_clone_obj;
 	zend_weakmap_handlers.read_property = zend_weakref_no_read;
 	zend_weakmap_handlers.write_property = zend_weakref_no_write;
 	zend_weakmap_handlers.has_property = zend_weakref_no_isset;
 	zend_weakmap_handlers.unset_property = zend_weakref_no_unset;
 	zend_weakmap_handlers.get_property_ptr_ptr = zend_weakref_no_read_ptr;
-	zend_weakmap_handlers.clone_obj = NULL;
 }
 /* }}} */