Merge branch 'PHP-8.0'

* Fix session cleanup
* Fix the return type of SessionHandler::gc()

Author: kocsismate

ext/session/session.stub.php

@@ -80,7 +80,7 @@ public function write(string $id, string $data);
     /** @return bool */
     public function destroy(string $id);
 
-    /** @return int|bool */
+    /** @return int|false */
     public function gc(int $max_lifetime);
 }
 
@@ -116,7 +116,7 @@ public function write(string $id, string $data) {}
     /** @return bool */
     public function destroy(string $id) {}
 
-    /** @return int|bool */
+    /** @return int|false */
     public function gc(int $max_lifetime) {}
 
     /** @return string */

ext/session/session_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9da20561a8281bb762b035f1e2ef8b3c866dda35 */
+ * Stub hash: f7f6a3d0357da86516b42fcd5cc2e618aa0049b8 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_session_name, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")

ext/session/tests/session_set_save_handler_closures.phpt

@@ -19,7 +19,8 @@ var_dump(session_module_name(FALSE));
 var_dump(session_module_name("blah"));
 var_dump(session_module_name("foo"));
 
-$path = __DIR__;
+$path = __DIR__ . '/session_set_save_handler_closures';
+@mkdir($path);
 session_save_path($path);
 session_set_save_handler($open_closure, $close_closure, $read_closure, $write_closure, $destroy_closure, $gc_closure);
 
@@ -41,7 +42,12 @@ $_SESSION['Bar'] = 'Foo';
 var_dump($_SESSION);
 session_write_close();
 
+echo "Cleanup\n";
+session_start();
+session_destroy();
+
 ob_end_flush();
+@rmdir($path);
 ?>
 --EXPECTF--
 *** Testing session_set_save_handler() : using closures as callbacks ***
@@ -90,3 +96,8 @@ array(4) {
 }
 Write [%s,%s,Blah|s:12:"Hello World!";Foo|b:0;Guff|i:1234567890;Bar|s:3:"Foo";]
 Close [%s,PHPSESSID]
+Cleanup
+Open [%s,PHPSESSID]
+Read [%s,%s]
+Destroy [%s,%s]
+Close [%s,PHPSESSID]