archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Drop E_STRICT notice in mysqli extension
This commit is contained in:
George Peter Banyard 2019-08-31 23:17:21 +02:00
commit c072ef71ee
6 changed files with 60 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/mysqli/mysqli_api.c
View file

@ -1605,12 +1605,6 @@ PHP_FUNCTION(mysqli_next_result) {
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
if (!mysql_more_results(mysql->mysql)) {
php_error_docref(NULL, E_STRICT, "There is no next result set. "
"Please, call mysqli_more_results()/mysqli::more_results() to check "
"whether to call this function/method");
}
RETURN_BOOL(!mysql_next_result(mysql->mysql));
}
/* }}} */
@ -1643,12 +1637,6 @@ PHP_FUNCTION(mysqli_stmt_next_result) {
}
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
if (!mysqlnd_stmt_more_results(stmt->stmt)) {
php_error_docref(NULL, E_STRICT, "There is no next result set. "
"Please, call mysqli_stmt_more_results()/mysqli_stmt::more_results() to check "
"whether to call this function/method");
}
RETURN_BOOL(!mysql_stmt_next_result(stmt->stmt));
}
/* }}} */

2
ext/mysqli/tests/bug31668.phpt
View file

@ -5,8 +5,6 @@ Bug #31668 (multi_query works exactly every other time (multi_query was global,
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--INI--
error_reporting = E_ALL & ~E_STRICT
--FILE--
<?php
require_once("connect.inc");

59
ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt Normal file
View file

@ -0,0 +1,59 @@
--TEST--
Fail gracefully on empty result set
--SKIPIF--
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
require_once("connect.inc");
require('table.inc');
// Returns only one result set
$link->multi_query("SELECT 1");
var_dump($link->next_result()); // should return false
var_dump($link->store_result()); // now what happens here!?
// Returns only one result set
$link->multi_query("SELECT 1");
var_dump($link->next_result());
var_dump($link->use_result());
$link->close();
?>
=== DONE ===
--CLEAN--
<?php
require_once("clean_table.inc");
?>
--EXPECT--
bool(false)
object(mysqli_result)#3 (5) {
["current_field"]=>
int(0)
["field_count"]=>
int(1)
["lengths"]=>
NULL
["num_rows"]=>
int(1)
["type"]=>
int(0)
}
bool(false)
object(mysqli_result)#3 (5) {
["current_field"]=>
int(0)
["field_count"]=>
int(1)
["lengths"]=>
NULL
["num_rows"]=>
int(0)
["type"]=>
int(1)
}
=== DONE ===

4
ext/mysqli/tests/mysqli_more_results.phpt
View file

@ -64,14 +64,10 @@ bool(false)
[006]
1
2
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
[010]
1
2
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
Warning: mysqli_more_results(): Couldn't fetch mysqli in %s on line %d
bool(false)
done!

5
ext/mysqli/tests/mysqli_multi_query.phpt
View file

@ -95,7 +95,7 @@ require_once('skipifconnectfailure.inc');
mysqli_free_result($res);
} while (@mysqli_next_result($link));
} while (mysqli_next_result($link));
if ($res_num != 4)
printf("[015] Expecting 3 result sets got %d result set[s]\n", $res_num);
@ -111,12 +111,9 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECTF--
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
[006] 3
[008] 0
[009] [2014] Commands out of sync; you can't run this command now
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
[010] 7
Warning: mysqli_multi_query(): Couldn't fetch mysqli in %s on line %d

9
ext/mysqli/tests/mysqli_next_result.phpt
View file

@ -64,15 +64,6 @@ require_once('skipifconnectfailure.inc');
require_once("clean_table.inc");
?>
--EXPECTF--
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
Strict Standards: mysqli_next_result(): There is no next result set. Please, call mysqli_more_results()/mysqli::more_results() to check whether to call this function/method in %s on line %d
Warning: mysqli_next_result(): Couldn't fetch mysqli in %s on line %d
bool(false)