Merge branch 'main' into beta

symplely · Feb 19, 2023 · 91b7faa · 91b7faa
2 parents a55dd1d + 6b06011
commit 91b7faa
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/zend/Functions.php b/zend/Functions.php
@@ -345,7 +345,7 @@ function zend_fetch_resource(object $ptr, string $type_name = '', int $type_numb
         return \ze_ffi()->cast($type_cast, $void);
     }
 
-    function zend_register_list_destructors_ex(callable $ld, ?callable $pld, string $type_name, int $module_number)
+    function zend_register_list_destructors_ex(?callable $ld, ?callable $pld, string $type_name, int $module_number)
     {
         return \ze_ffi()->zend_register_list_destructors_ex($ld, $pld, $type_name, $module_number);
     }
@@ -359,13 +359,7 @@ function create_resource(CData $fd_ptr, string $type = 'stream', int $module = \
     {
         $fd_res = \zend_register_resource(
             $fd_ptr,
-            \zend_register_list_destructors_ex((\is_null($rsrc)
-                    ? function (CData $rsrc) {
-                    } : $rsrc),
-                null,
-                $type,
-                $module
-            )
+            \zend_register_list_destructors_ex($rsrc, null, $type, $module)
         );
 
         $fd_zval = \zval_resource($fd_res);
@@ -402,9 +396,8 @@ function create_resource_object(int $fd, object $cdata, string $type = 'stream',
         $object_ptr = $cdata();
         $object_res = \zend_register_resource(
             $object_ptr,
-            \zend_register_list_destructors_ex((\is_null($rsrc)
-                    ? function (CData $rsrc) {
-                    } : $rsrc),
+            \zend_register_list_destructors_ex(
+                $rsrc,
                 null,
                 $type,
                 \ZEND_MODULE_API_NO