Fix GH-22118: Unregister equivalent tick closures

Author: prateekbhujel

ext/standard/basic_functions.c

@@ -1639,6 +1639,15 @@ static int user_tick_function_compare(user_tick_function_entry * tick_fe1, user_
 {
 	bool is_equal = zend_fcc_equals(&tick_fe1->fci_cache, &tick_fe2->fci_cache);
 
+	if (!is_equal && tick_fe1->fci_cache.closure && tick_fe2->fci_cache.closure) {
+		zval closure1, closure2;
+
+		ZVAL_OBJ(&closure1, tick_fe1->fci_cache.closure);
+		ZVAL_OBJ(&closure2, tick_fe2->fci_cache.closure);
+
+		is_equal = zend_compare_objects(&closure1, &closure2) == 0;
+	}
+
 	if (is_equal && tick_fe1->calling) {
 		zend_throw_error(NULL, "Registered tick function cannot be unregistered while it is being executed");
 		return false;

ext/standard/tests/general_functions/gh22118.phpt

@@ -0,0 +1,31 @@
+--TEST--
+GH-22118: unregister_tick_function() unregisters equivalent first-class method callables
+--FILE--
+<?php
+declare(ticks=1);
+
+class TickTest
+{
+	public function kick(): void
+	{
+		echo "tick\n";
+	}
+
+	public function run(): void
+	{
+		register_tick_function($this->kick(...));
+		echo "registered\n";
+		unregister_tick_function($this->kick(...));
+		echo "unregistered\n";
+	}
+}
+
+(new TickTest())->run();
+echo "done\n";
+?>
+--EXPECT--
+tick
+registered
+tick
+unregistered
+done