mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-02 22:34:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove embedded property from mysqli_driver

Browse Source 
All other leftovers of this feature have been dropped in PHP 8,
so we should remove the property as well.

Closes GH-6407.
This commit is contained in:
Dharman 2020-11-06 23:00:33 +00:00 committed by Nikita Popov
parent 6fb3d92525
commit 114613dc5f
5 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/mysqli/mysqli.c
View File

@ -577,7 +577,6 @@ PHP_MINIT_FUNCTION(mysqli)
zend_declare_property_null(ce, "client_info", sizeof("client_info") - 1, ZEND_ACC_PUBLIC);
zend_declare_property_null(ce, "client_version", sizeof("client_version") - 1, ZEND_ACC_PUBLIC);
zend_declare_property_null(ce, "driver_version", sizeof("driver_version") - 1, ZEND_ACC_PUBLIC);
zend_declare_property_null(ce, "embedded", sizeof("embedded") - 1, ZEND_ACC_PUBLIC);
zend_declare_property_null(ce, "reconnect", sizeof("reconnect") - 1, ZEND_ACC_PUBLIC);
zend_declare_property_null(ce, "report_mode", sizeof("report_mode") - 1, ZEND_ACC_PUBLIC);
ce->ce_flags |= ZEND_ACC_FINAL;

11
ext/mysqli/mysqli_driver.c
View File

@ -78,16 +78,6 @@ static int driver_report_write(mysqli_object *obj, zval *value)
}
/* }}} */
/* {{{ property driver_embedded_read */
static int driver_embedded_read(mysqli_object *obj, zval *retval, zend_bool quiet)
{
/* No longer supported */
ZVAL_FALSE(retval);
return SUCCESS;
}
/* }}} */
/* {{{ property driver_client_version_read */
static int driver_client_version_read(mysqli_object *obj, zval *retval, zend_bool quiet)
{
@ -135,7 +125,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},
{"embedded", sizeof("embedded") - 1, driver_embedded_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}

2
ext/mysqli/tests/073.phpt
View File

@ -6,7 +6,6 @@ mysqli_driver properties
<?php
require_once("connect.inc");
var_dump($driver->embedded);
var_dump($driver->client_version);
var_dump($driver->client_info);
var_dump($driver->driver_version);
@ -15,7 +14,6 @@ mysqli_driver properties
print "done!";
?>
--EXPECTF--
bool(false)
int(%d)
string(%d) "%s"
int(%d)

6
ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt
View File

@ -72,9 +72,6 @@ require_once('skipifconnectfailure.inc');
$driver->report_mode = MYSQLI_REPORT_STRICT;
assert($driver->report_mode === MYSQLI_REPORT_STRICT);
assert(is_bool($driver->embedded));
printf("driver->embedded = '%s'\n", $driver->embedded);
printf("driver->reconnect = '%s'\n", $driver->reconnect);
printf("\nAccess to undefined properties:\n");
@ -93,7 +90,6 @@ Class variables:
client_info
client_version
driver_version
embedded
reconnect
report_mode
@ -101,7 +97,6 @@ Object variables:
client_info
client_version
driver_version
embedded
reconnect
report_mode
@ -110,7 +105,6 @@ driver->client_info = '%s'
driver->client_version = '%d'
driver->driver_version = '%d'
driver->report_mode = '%d'
driver->embedded = ''
driver->reconnect = ''
Access to undefined properties:

4
ext/mysqli/tests/mysqli_driver.phpt
View File

@ -102,10 +102,6 @@ require_once('skipifconnectfailure.inc');
$driver->reconnect = false;
$driver->reconnect = $reconnect;
if (!is_bool($embedded = $driver->embedded))
printf("[020] Expecting boolean/any, got %s/%s\n",
gettype($embedded), $embedded);
print "done!";
?>
--EXPECTF--