Revert "Improve errors for mysqli_stmt_attr_set()"

Because I can't figure out why Windows fails

This reverts commit d3e9279.

Author: Girgias

ext/mysqli/mysqli_api.c

@@ -2252,52 +2252,26 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll", &mysql_stmt, mysqli_stmt_class_entry, &attr, &mode_in) == FAILURE) {
 		RETURN_THROWS();
 	}
+
 	MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
 	if (mode_in < 0) {
 		zend_argument_value_error(ERROR_ARG_POS(3), "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
+	/* TODO Improve the mode to depend on the ATTR */
 	switch (attr) {
 #if MYSQL_VERSION_ID >= 50107
 	case STMT_ATTR_UPDATE_MAX_LENGTH:
 		mode_b = (my_bool) mode_in;
 		mode_p = &mode_b;
 		break;
 #endif
-	case STMT_ATTR_CURSOR_TYPE: {
-		switch (mode_in) {
-			case CURSOR_TYPE_NO_CURSOR:
-			case CURSOR_TYPE_READ_ONLY:
-			case CURSOR_TYPE_FOR_UPDATE:
-			case CURSOR_TYPE_SCROLLABLE:
-				break;
-			default:
-				zend_argument_value_error(ERROR_ARG_POS(3), "must be one of MYSQLI_CURSOR_TYPE_NO_CURSOR, "
-					"MYSQLI_CURSOR_TYPE_READ_ONLY, MYSQLI_CURSOR_TYPE_FOR_UPDATE, or MYSQLI_CURSOR_TYPE_SCROLLABLE "
-					"for attribute MYSQLI_STMT_ATTR_CURSOR_TYPE");
-				RETURN_THROWS();
-		}
-		mode = mode_in;
-		mode_p = &mode;
-		break;
-	}
-	case STMT_ATTR_PREFETCH_ROWS:
-		if (mode_in < 1) {
-			zend_argument_value_error(ERROR_ARG_POS(3), "must be greater than 0 for attribute MYSQLI_STMT_ATTR_PREFETCH_ROWS");
-			RETURN_THROWS();
-		}
+	default:
 		mode = mode_in;
 		mode_p = &mode;
 		break;
-	default:
-		zend_argument_value_error(ERROR_ARG_POS(2), "must be one of "
-#if MYSQL_VERSION_ID >= 50107
-			"MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, "
-#endif
-			"MYSQLI_STMT_ATTR_PREFETCH_ROWS, or STMT_ATTR_CURSOR_TYPE");
-		RETURN_THROWS();
 	}
 
 #ifndef MYSQLI_USE_MYSQLND

ext/mysqli/tests/mysqli_stmt_attr_set.phpt

@@ -33,11 +33,29 @@ require_once("connect.inc");
     }
 
     $stmt->prepare("SELECT * FROM test");
-    // Invalid Attribute (2nd argument)
-    try {
-        mysqli_stmt_attr_set($stmt, -1, 0);
-    } catch (\ValueError $e) {
-        echo $e->getMessage() . \PHP_EOL;
+
+    mt_srand(microtime(true));
+
+    for ($i = -100; $i < 1000; $i++) {
+        if (in_array($i, $valid_attr))
+            continue;
+        $invalid_attr = $i;
+        try {
+            if (false !== ($tmp = mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) {
+                printf("[006a] Expecting boolean/false for attribute %d, got %s/%s\n", $invalid_attr, gettype($tmp), $tmp);
+            }
+        } catch (\ValueError $e) {/* Suppress because RANDOM */}
+    }
+
+    for ($i = 0; $i < 2; $i++) {
+        do {
+            $invalid_attr = mt_rand(-1 * (min(4294967296, PHP_INT_MAX) + 1), min(4294967296, PHP_INT_MAX));
+        } while (in_array($invalid_attr, $valid_attr));
+        try {
+            if (false !== ($tmp = mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) {
+                printf("[006b] Expecting boolean/false for attribute %d, got %s/%s\n", $invalid_attr, gettype($tmp), $tmp);
+            }
+        } catch (\ValueError $e) {/* Suppress because RANDOM */}
     }
     // Invalid mode for MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH
     try {
@@ -117,9 +135,13 @@ require_once("connect.inc");
         $stmt = mysqli_stmt_init($link);
         $stmt->prepare("SELECT id, label FROM test");
 
-        // Invalid cursor type
         try {
-            $stmt->attr_set(MYSQLI_STMT_ATTR_CURSOR_TYPE, -1);
+            $stmt->attr_set(MYSQLI_STMT_ATTR_CURSOR_TYPE, -100);
+        } catch (\ValueError $e) {
+            echo $e->getMessage() . \PHP_EOL;
+        }
+        try {
+            $stmt->attr_set(MYSQLI_STMT_ATTR_CURSOR_TYPE, 200);
         } catch (\ValueError $e) {
             echo $e->getMessage() . \PHP_EOL;
         }
@@ -195,13 +217,6 @@ require_once("connect.inc");
 
         $stmt = mysqli_stmt_init($link);
         $stmt->prepare("SELECT id, label FROM test");
-        // Invalid prefetch value
-        try {
-            $stmt->attr_set(MYSQLI_STMT_ATTR_PREFETCH_ROWS, 0);
-        } catch (\ValueError $e) {
-            echo $e->getMessage() . \PHP_EOL;
-        }
-
         if (true !== ($tmp = $stmt->attr_set(MYSQLI_STMT_ATTR_PREFETCH_ROWS, 1)))
             printf("[020] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
         $stmt->execute();
@@ -256,9 +271,7 @@ require_once("connect.inc");
 ?>
 --EXPECT--
 Error: mysqli_stmt object is not fully initialized
-mysqli_stmt_attr_set(): Argument #2 ($attr) must be one of MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, MYSQLI_STMT_ATTR_PREFETCH_ROWS, or STMT_ATTR_CURSOR_TYPE
 mysqli_stmt::attr_set(): Argument #2 ($mode_in) must be greater than or equal to 0
 bool(true)
 mysqli_stmt::attr_set(): Argument #2 ($mode_in) must be greater than or equal to 0
-mysqli_stmt::attr_set(): Argument #2 ($mode_in) must be greater than 0 for attribute MYSQLI_STMT_ATTR_PREFETCH_ROWS
 done!