Skip to content

Commit 391dbb9

Browse files
committed
Revert "Implement phpGH-13609: Dump wrapped object in WeakReference class (php#13621)"
This reverts commit d6d3370.
1 parent cfdbf77 commit 391dbb9

File tree

5 files changed

+3
-57
lines changed

5 files changed

+3
-57
lines changed

NEWS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ PHP NEWS
1515
. Fixed zend call stack size for macOs/arm64. (David Carlier)
1616
. Added support for Zend Max Execution Timers on FreeBSD. (Kévin Dunglas)
1717
. Ensure fiber stack is not backed by THP. (crrodriguez)
18-
. Implement GH-13609 (Dump wrapped object in WeakReference class). (nielsdos)
1918

2019
- Curl:
2120
. Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)

UPGRADING

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ PHP 8.4 UPGRADE NOTES
164164
. Added request_parse_body() function that allows parsing RFC1867 (multipart)
165165
requests in non-POST HTTP requests.
166166
RFC: https://wiki.php.net/rfc/rfc1867-non-post
167-
. Getting the debug info for WeakReference will now also output the object
168-
it references, or null if the reference is no longer valid.
169167

170168
- Curl:
171169
. curl_version() returns an additional feature_list value, which is an

Zend/tests/weakrefs/weakrefs_001.phpt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,14 @@ object(stdClass)#1 (0) refcount(2){
2626
}
2727
object(stdClass)#1 (0) refcount(2){
2828
}
29-
object(WeakReference)#2 (1) {
30-
["object"]=>
31-
object(stdClass)#1 (0) {
32-
}
29+
object(WeakReference)#2 (0) {
3330
}
34-
object(WeakReference)#2 (1) {
35-
["object"]=>
36-
object(stdClass)#1 (0) {
37-
}
31+
object(WeakReference)#2 (0) {
3832
}
3933
object(stdClass)#1 (0) refcount(2){
4034
}
4135
object(stdClass)#1 (0) refcount(2){
4236
}
4337
NULL
4438
NULL
39+

Zend/tests/weakrefs/weakrefs_debug_dump.phpt

Lines changed: 0 additions & 26 deletions
This file was deleted.

Zend/zend_weakrefs.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -271,25 +271,6 @@ static void zend_weakref_free(zend_object *zo) {
271271
zend_object_std_dtor(&wr->std);
272272
}
273273

274-
static HashTable *zend_weakref_get_debug_info(zend_object *object, int *is_temp)
275-
{
276-
*is_temp = 1;
277-
278-
HashTable *ht = zend_new_array(1);
279-
280-
zend_object *referent = zend_weakref_from(object)->referent;
281-
zval value;
282-
if (referent) {
283-
ZVAL_OBJ_COPY(&value, referent);
284-
} else {
285-
ZVAL_NULL(&value);
286-
}
287-
288-
zend_hash_update(ht, ZSTR_KNOWN(ZEND_STR_OBJECT), &value);
289-
290-
return ht;
291-
}
292-
293274
ZEND_COLD ZEND_METHOD(WeakReference, __construct)
294275
{
295276
zend_throw_error(NULL, "Direct instantiation of WeakReference is not allowed, use WeakReference::create instead");
@@ -768,7 +749,6 @@ void zend_register_weakref_ce(void) /* {{{ */
768749
zend_weakref_handlers.offset = XtOffsetOf(zend_weakref, std);
769750

770751
zend_weakref_handlers.free_obj = zend_weakref_free;
771-
zend_weakref_handlers.get_debug_info = zend_weakref_get_debug_info;
772752
zend_weakref_handlers.clone_obj = NULL;
773753

774754
zend_ce_weakmap = register_class_WeakMap(zend_ce_arrayaccess, zend_ce_countable, zend_ce_aggregate);

0 commit comments

Comments
 (0)