Create getter instead of making the property public

Author: kamil-tekiela

ext/mysqli/mysqli.c

@@ -568,7 +568,7 @@ PHP_MINIT_FUNCTION(mysqli)
 	mysqli_exception_class_entry = zend_register_internal_class_ex(&cex, spl_ce_RuntimeException);
 	mysqli_exception_class_entry->ce_flags |= ZEND_ACC_FINAL;
 	zend_declare_property_long(mysqli_exception_class_entry, "code", sizeof("code")-1, 0, ZEND_ACC_PROTECTED);
-	zend_declare_property_string(mysqli_exception_class_entry, "sqlstate", sizeof("sqlstate")-1, "00000", ZEND_ACC_PUBLIC);
+	zend_declare_property_string(mysqli_exception_class_entry, "sqlstate", sizeof("sqlstate")-1, "00000", ZEND_ACC_PROTECTED);
 
 	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_driver", mysqli_driver_class_entry, class_mysqli_driver_methods);
 	ce = mysqli_driver_class_entry;

ext/mysqli/mysqli.stub.php

@@ -519,6 +519,7 @@ public function next(): bool {}
 
 final class mysqli_sql_exception extends RuntimeException
 {
+    public function getSqlState(): string {}
 }
 
 function mysqli_affected_rows(mysqli $mysql): int|string {}

ext/mysqli/mysqli_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 04fabe8f7b61ccf36e8ed383396bd4b56e11dd25 */
+ * Stub hash: ac7844bb479d2ddd81c5a172c8c3944470cdd697 */
 
 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)
@@ -685,6 +685,9 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_warning_next arginfo_mysqli_thread_safe
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_mysqli_sql_exception_getSqlState, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 
 ZEND_FUNCTION(mysqli_affected_rows);
 ZEND_FUNCTION(mysqli_autocommit);
@@ -810,6 +813,7 @@ ZEND_METHOD(mysqli_result, getIterator);
 ZEND_METHOD(mysqli_stmt, __construct);
 ZEND_METHOD(mysqli_warning, __construct);
 ZEND_METHOD(mysqli_warning, next);
+ZEND_METHOD(mysqli_sql_exception, getSqlState);
 
 
 static const zend_function_entry ext_functions[] = {
@@ -1057,5 +1061,6 @@ static const zend_function_entry class_mysqli_warning_methods[] = {
 
 
 static const zend_function_entry class_mysqli_sql_exception_methods[] = {
+	ZEND_ME(mysqli_sql_exception, getSqlState, arginfo_class_mysqli_sql_exception_getSqlState, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };

ext/mysqli/mysqli_exception.c

@@ -26,6 +26,7 @@
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 #include "zend_exceptions.h"
+#include "zend_string.h"
 
 void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...)
 {
@@ -63,3 +64,17 @@ void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, .
 
 	zend_throw_exception_object(&sql_ex);
 }
+
+PHP_METHOD(mysqli_sql_exception, getSqlState)
+{
+	zval *prop;
+	zval rv;
+
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	prop = zend_read_property(mysqli_exception_class_entry, Z_OBJ_P(ZEND_THIS), "sqlstate", sizeof("sqlstate")-1, 1, &rv);
+	ZVAL_DEREF(prop);
+	zend_string *str = zval_get_string(prop);
+	
+	RETURN_STR(str);
+}

ext/mysqli/php_mysqli_structs.h

@@ -121,6 +121,13 @@ struct st_mysqli_warning {
    	MYSQLI_WARNING	*next;
 };
 
+typedef struct st_mysqli_sql_exception MYSQLI_SQL_EXCEPTION;
+struct st_mysqli_sql_exception {
+	zend_string	*message;
+	zend_string	*sqlstate;
+	int			code;
+};
+
 typedef struct _mysqli_property_entry {
 	const char *pname;
 	size_t pname_length;

ext/mysqli/tests/bugGH1.phpt renamed to ext/mysqli/tests/bugGH7746.phpt

@@ -17,7 +17,7 @@ mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 try {
     $link->query("stuff");
 } catch (mysqli_sql_exception $exception) {
-    var_dump($exception->sqlstate);
+    var_dump($exception->getSqlState());
 }
 
 ?>