Fix tests

Author: kocsismate

ext/mysqli/mysqli_api.c

@@ -1717,7 +1717,7 @@ PHP_FUNCTION(mysqli_options)
 			RETURN_THROWS();
 		}
 		ret = mysql_options(mysql->mysql, mysql_option, (char *) &mysql_value_long);
-	} else if (expected_type == IS_NULL) {
+	} else {
 		ret = 1;
 	}
 

ext/mysqli/tests/mysqli_options.phpt

@@ -38,7 +38,12 @@ require_once('skipifconnectfailure.inc');
     var_dump("MYSQLI_READ_DEFAULT_FILE",	mysqli_options($link, MYSQLI_READ_DEFAULT_FILE, 'extra_my.cnf'));
     var_dump("MYSQLI_OPT_CONNECT_TIMEOUT",	mysqli_options($link, MYSQLI_OPT_CONNECT_TIMEOUT, 10));
     var_dump("MYSQLI_OPT_LOCAL_INFILE",		mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, 1));
-    var_dump("MYSQLI_INIT_COMMAND",			mysqli_options($link, MYSQLI_INIT_COMMAND, array('SET AUTOCOMMIT=0', 'SET AUTOCOMMIT=1')));
+    try {
+        var_dump("MYSQLI_INIT_COMMAND");
+        mysqli_options($link, MYSQLI_INIT_COMMAND, array('SET AUTOCOMMIT=0', 'SET AUTOCOMMIT=1'));
+    } catch (TypeError $exception) {
+        echo $exception->getMessage() . "\n";
+    }
 
     if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
         printf("[006] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
@@ -106,10 +111,8 @@ bool(true)
 bool(true)
 %s(23) "MYSQLI_OPT_LOCAL_INFILE"
 bool(true)
-
-Warning: Array to string conversion in %s on line %d
 %s(19) "MYSQLI_INIT_COMMAND"
-bool(true)
+mysqli_options(): Argument #3 ($value) must be of type string|int, array given
 %s(25) "MYSQLI_READ_DEFAULT_GROUP"
 bool(true)
 %s(24) "MYSQLI_READ_DEFAULT_FILE"

ext/odbc/php_odbc.c

@@ -1752,22 +1752,15 @@ PHP_FUNCTION(odbc_result)
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_RESOURCE(pv_res)
-		Z_PARAM_STR_OR_LONG(pv_field_str, pv_field_ind)
+		Z_PARAM_STR_OR_LONG(pv_field_str, pv_field_long)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (pv_field_str) {
 		field = ZSTR_VAL(pv_field_str);
 		field_ind = -1;
 	} else {
 		field = NULL;
-		field_ind = pv_field_long - 1;
-	}
-
-	if (Z_TYPE_P(pv_field) == IS_STRING) {
-		field = Z_STRVAL_P(pv_field);
-	} else {
-		convert_to_long_ex(pv_field);
-		field_ind = Z_LVAL_P(pv_field) - 1;
+		field_ind = (int) pv_field_long - 1;
 	}
 
 	if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {

ext/xml/tests/bug72714.phpt

@@ -3,6 +3,7 @@ Bug #72714 (_xml_startElementHandler() segmentation fault)
 --SKIPIF--
 <?php
 if (!extension_loaded('xml')) die('skip xml extension not available');
+if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
 --FILE--
 <?php
@@ -28,6 +29,6 @@ parse(3015809298423721);
 parse(20);
 ?>
 --EXPECTF--
-Notice: xml_parser_set_option(): tagstart ignored, because it is out of range in %s%ebug72714.php on line %d
+Warning: xml_parser_set_option(): tagstart ignored, because it is out of range in %s on line %d
 string(9) "NS1:TOTAL"
 string(0) ""

ext/xml/tests/xml_parser_set_option_variation3.phpt

@@ -5,6 +5,9 @@ Test xml_parser_set_option() function : usage variations
 if (!extension_loaded("xml")) {
 	print "skip - XML extension not loaded";
 }
+if (PHP_INT_SIZE != 8) {
+    die('skip 64-bit only');
+}
 ?>
 --FILE--
 <?php
@@ -153,19 +156,19 @@ Arg value
 bool(true)
 
 Arg value  
-xml_parser_set_option(): Argument #3 ($value) must be of type string for the chosen option
+xml_parser_set_option(): Argument #3 ($value) must be of type int for the chosen option
 
 Arg value  
-xml_parser_set_option(): Argument #3 ($value) must be of type string for the chosen option
+xml_parser_set_option(): Argument #3 ($value) must be of type int for the chosen option
 
 Arg value string 
-xml_parser_set_option(): Argument #3 ($value) must be of type string for the chosen option
+xml_parser_set_option(): Argument #3 ($value) must be of type int for the chosen option
 
 Arg value string 
-xml_parser_set_option(): Argument #3 ($value) must be of type string for the chosen option
+xml_parser_set_option(): Argument #3 ($value) must be of type int for the chosen option
 
 Arg value Some Ascii Data 
-xml_parser_set_option(): Argument #3 ($value) must be of type string for the chosen option
+xml_parser_set_option(): Argument #3 ($value) must be of type int for the chosen option
 
 Arg value Resource id %s
 xml_parser_set_option(): Argument #3 ($value) must be of type string|int, resource given

ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt

@@ -4,20 +4,23 @@ Check xsltprocessor::setparameter error handling with no-string
 Memleak: http://bugs.php.net/bug.php?id=48221
 --SKIPIF--
 <?php
-        if (!extension_loaded('xsl')) {
-                die("skip\n");
-        }
+if (!extension_loaded('xsl')) {
+    die("skip\n");
+}
 ?>
 --FILE--
 <?php
 include __DIR__ .'/prepare.inc';
 $proc->importStylesheet($xsl);
-var_dump($proc->setParameter('', array(4, 'abc')));
+try {
+    $proc->setParameter('', array(4, 'abc'));
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 $proc->transformToXml($dom);
 ?>
---EXPECTF--
-Warning: XSLTProcessor::setParameter(): Invalid parameter array in %s on line %d
-bool(false)
+--EXPECT--
+XSLTProcessor::setParameter(): Argument #2 ($name) must contain only string keys
 --CREDITS--
 Christian Weiske, cweiske@php.net
 PHP Testfest Berlin 2009-05-09