Address code review comments

Author: kocsismate

ext/mysqli/mysqli.c

@@ -283,7 +283,9 @@ static void mysqli_warning_free_storage(zend_object *object)
 /* {{{ mysqli_read_na */
 static int mysqli_read_na(mysqli_object *obj, zval *retval, zend_bool quiet)
 {
-	zend_throw_error(NULL, "Cannot read property");
+	if (!quiet) {
+		zend_throw_error(NULL, "Cannot read property");
+	}
 
 	return FAILURE;
 }
@@ -322,14 +324,10 @@ zval *mysqli_read_property(zval *object, zval *member, int type, void **cache_sl
 	}
 
 	if (hnd) {
-		if (hnd->read_func(obj, rv, type == BP_VAR_IS) == SUCCESS && rv != NULL) {
+		if (hnd->read_func(obj, rv, type == BP_VAR_IS) == SUCCESS || type != BP_VAR_IS) {
 			retval = rv;
 		} else {
-			if (type == BP_VAR_IS || rv == NULL) {
-				retval = &EG(uninitialized_zval);
-			} else {
-				retval = rv;
-			}
+			retval = &EG(uninitialized_zval);
 		}
 	} else {
 		retval = zend_std_read_property(object, member, type, cache_slot, rv);

ext/mysqli/mysqli_driver.c

@@ -61,7 +61,7 @@ static int name(mysqli_object *obj, zval *value) \
 static int name(mysqli_object *obj, zval *retval, zend_bool quiet) \
 { \
 	ZVAL_STRING(retval, MyG(value)); \
-	return SUCESS; \
+	return SUCCESS; \
 } \
 
 #define MAP_PROPERTY_MYG_STRING_WRITE(name, value) \

ext/mysqli/mysqli_warning.c

@@ -204,6 +204,10 @@ static int mysqli_warning_message(mysqli_object *obj, zval *retval, zend_bool qu
 	MYSQLI_WARNING *w;
 
 	if (!obj->ptr || !((MYSQLI_RESOURCE *)(obj->ptr))->ptr) {
+		if (!quiet) {
+			php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(obj->zo.ce->name));
+		}
+
 		return FAILURE;
 	}
 
@@ -220,6 +224,10 @@ static int mysqli_warning_sqlstate(mysqli_object *obj, zval *retval, zend_bool q
 	MYSQLI_WARNING *w;
 
 	if (!obj->ptr || !((MYSQLI_RESOURCE *)(obj->ptr))->ptr) {
+		if (!quiet) {
+			php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(obj->zo.ce->name));
+		}
+
 		return FAILURE;
 	}
 
@@ -236,6 +244,10 @@ static int mysqli_warning_errno(mysqli_object *obj, zval *retval, zend_bool quie
 	MYSQLI_WARNING *w;
 
 	if (!obj->ptr || !((MYSQLI_RESOURCE *)(obj->ptr))->ptr) {
+		if (!quiet) {
+			php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(obj->zo.ce->name));
+		}
+
 		return FAILURE;
 	}
 

ext/mysqli/tests/bug54221.phpt

@@ -41,7 +41,10 @@ mysqli.reconnect = Off
 
 	print "done!";
 ?>
---EXPECT--
+--EXPECTF--
+Warning: main(): Couldn't fetch mysqli_warning in %s on line %d
+
+Warning: main(): Couldn't fetch mysqli_warning in %s on line %d
 Warning: : 
 Warning: 1050: Table 't54221' already exists
 done!

ext/mysqli/tests/mysqli_result_references.phpt

@@ -59,7 +59,7 @@ require_once('skipifconnectfailure.inc');
 
 	$references[$idx++] = &$res;
 	mysqli_free_result($res);
-	@debug_zval_dump($references);
+	debug_zval_dump($references);
 
 	if (!(mysqli_real_query($link, "SELECT id, label FROM test ORDER BY id ASC LIMIT 1")) ||
 			!($res = mysqli_use_result($link)))