Remove mysqli_driver::$reconnect property

Author: kamil-tekiela

ext/mysqli/mysqli.c

@@ -461,7 +461,6 @@ static PHP_GINIT_FUNCTION(mysqli)
 	mysqli_globals->default_user = NULL;
 	mysqli_globals->default_pw = NULL;
 	mysqli_globals->default_socket = NULL;
-	mysqli_globals->reconnect = 0;
 	mysqli_globals->report_mode = MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT;;
 	mysqli_globals->allow_local_infile = 0;
 	mysqli_globals->local_infile_directory = NULL;

ext/mysqli/mysqli.stub.php

@@ -13,8 +13,6 @@ final class mysqli_driver
     /** @readonly */
     public int $driver_version;
 
-    public bool $reconnect = false;
-
     public int $report_mode = 0;
 }
 

ext/mysqli/mysqli_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ea4a03b57cca3cf4e103d76d8e283eb853e77a75 */
+ * Stub hash: a2f2992afd959a13215bfdfd00096f368b3bc392 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -1051,12 +1051,6 @@ static zend_class_entry *register_class_mysqli_driver(void)
 	zend_declare_typed_property(class_entry, property_driver_version_name, &property_driver_version_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
 	zend_string_release(property_driver_version_name);
 
-	zval property_reconnect_default_value;
-	ZVAL_BOOL(&property_reconnect_default_value, false);
-	zend_string *property_reconnect_name = zend_string_init("reconnect", sizeof("reconnect") - 1, 1);
-	zend_declare_typed_property(class_entry, property_reconnect_name, &property_reconnect_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_BOOL));
-	zend_string_release(property_reconnect_name);
-
 	zval property_report_mode_default_value;
 	ZVAL_LONG(&property_report_mode_default_value, 0);
 	zend_string *property_report_mode_name = zend_string_init("report_mode", sizeof("report_mode") - 1, 1);

ext/mysqli/mysqli_driver.c

@@ -27,23 +27,6 @@
 #include "zend_exceptions.h"
 
 
-/* {{{ property driver_reconnect_read */
-static int driver_reconnect_read(mysqli_object *obj, zval *retval, bool quiet)
-{
-	ZVAL_BOOL(retval, MyG(reconnect));
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ property driver_reconnect_write */
-static int driver_reconnect_write(mysqli_object *obj, zval *value)
-{
-	ZEND_ASSERT(Z_TYPE_P(value) == IS_TRUE || Z_TYPE_P(value) == IS_FALSE);
-	MyG(reconnect) = Z_TYPE_P(value) == IS_TRUE;
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ property driver_report_read */
 static int driver_report_read(mysqli_object *obj, zval *retval, bool quiet)
 {
@@ -93,7 +76,6 @@ const mysqli_property_entry mysqli_driver_property_entries[] = {
 	{"client_info", sizeof("client_info") - 1, driver_client_info_read, NULL},
 	{"client_version", sizeof("client_version") - 1, driver_client_version_read, NULL},
 	{"driver_version", sizeof("driver_version") - 1, driver_driver_version_read, NULL},
-	{"reconnect", sizeof("reconnect") - 1, driver_reconnect_read, driver_reconnect_write},
 	{"report_mode", sizeof("report_mode") - 1, driver_report_read, driver_report_write},
 	{NULL, 0, NULL, NULL}
 };

ext/mysqli/php_mysqli_structs.h

@@ -247,7 +247,6 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
 	char				*default_user;
 	char				*default_pw;
 	char				*default_socket;
-	zend_long			reconnect;
 	zend_long			allow_local_infile;
 	char				*local_infile_directory;
 	zend_long			error_no;

ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt

@@ -69,8 +69,6 @@ printf("driver->report_mode = '%s'\n", $driver->report_mode);
 $driver->report_mode = MYSQLI_REPORT_STRICT;
 assert($driver->report_mode === MYSQLI_REPORT_STRICT);
 
-printf("driver->reconnect = '%s'\n", $driver->reconnect);
-
 printf("\nAccess to undefined properties:\n");
 printf("driver->unknown = '%s'\n", @$driver->unknown);
 
@@ -87,11 +85,9 @@ Class variables:
 client_info
 client_version
 driver_version
-reconnect
 report_mode
 
 Object variables:
-reconnect
 report_mode
 
 Magic, magic properties:
@@ -101,7 +97,6 @@ driver->client_version = '%d'
 Deprecated: The driver_version property is deprecated in %s on line %d
 driver->driver_version = '%d'
 driver->report_mode = '%d'
-driver->reconnect = ''
 
 Access to undefined properties:
 driver->unknown = ''

ext/mysqli/tests/mysqli_driver.phpt

@@ -108,17 +108,6 @@ if (MYSQLI_REPORT_ERROR !== $driver->report_mode) {
 
 $driver->report_mode = $report_mode;
 
-$reconnect = $driver->reconnect;
-if (!is_bool($reconnect)) {
-    printf("[019] Expecting boolean/any, got %s/%s\n",
-    gettype($reconnect), $reconnect);
-}
-
-/* pointless, but I need more documentation */
-$driver->reconnect = true;
-$driver->reconnect = false;
-$driver->reconnect = $reconnect;
-
 print "done!";
 ?>
 --EXPECTF--

ext/mysqli/tests/write_property.phpt

@@ -13,18 +13,6 @@ try {
     echo $e->getMessage(), "\n";
 }
 
-$driver->reconnect = 0;
-var_dump($driver->reconnect);
-$str = '4';
-$str .= '2';
-$driver->reconnect = $str;
-var_dump($driver->reconnect);
-try {
-    $driver->reconnect = [];
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
-
 $driver->report_mode = "1";
 var_dump($driver->report_mode);
 try {
@@ -36,8 +24,5 @@ try {
 ?>
 --EXPECT--
 Cannot write read-only property mysqli_driver::$client_info
-bool(false)
-bool(true)
-Cannot assign array to property mysqli_driver::$reconnect of type bool
 int(1)
 Cannot assign array to property mysqli_driver::$report_mode of type int

ext/mysqli/tests/write_property_strict.phpt

@@ -15,12 +15,6 @@ try {
     echo $e->getMessage(), "\n";
 }
 
-try {
-    $driver->reconnect = 0;
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
-
 try {
     $driver->report_mode = "1";
 } catch (Error $e) {
@@ -30,5 +24,4 @@ try {
 ?>
 --EXPECT--
 Cannot write read-only property mysqli_driver::$client_info
-Cannot assign int to property mysqli_driver::$reconnect of type bool
 Cannot assign string to property mysqli_driver::$report_mode of type int