Skip to content

Commit 116166c

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Removed `REPORT_EXIT_STATUS=no` in libmysql tests
1 parent 47dca33 commit 116166c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/actions/test-libmysqlclient/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ runs:
1414
export PDO_MYSQL_TEST_HOST=127.0.0.1
1515
export PDO_MYSQL_TEST_USER=root
1616
export PDO_MYSQL_TEST_PASS=root
17-
export REPORT_EXIT_STATUS=no
1817
sapi/cli/php run-tests.php -P -q \
1918
-g FAIL,BORK,LEAK,XLEAK \
2019
--no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 \

ext/pdo_mysql/tests/gh11550.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ MySQLPDOTest::skip();
1313
require_once __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
1414
$pdo = MySQLPDOTest::factory();
1515

16+
$pdo->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
17+
1618
$pdo->exec(<<<'SQL'
1719
CREATE TABLE `test_gh11550` (
1820
`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -51,9 +53,9 @@ array(1) {
5153
[0]=>
5254
array(4) {
5355
["id"]=>
54-
int(1)
56+
string(1) "1"
5557
[0]=>
56-
int(1)
58+
string(1) "1"
5759
["name"]=>
5860
string(5) "test1"
5961
[1]=>
@@ -66,9 +68,9 @@ array(1) {
6668
[0]=>
6769
array(6) {
6870
["id"]=>
69-
int(1)
71+
string(1) "1"
7072
[0]=>
71-
int(1)
73+
string(1) "1"
7274
["name"]=>
7375
string(5) "test1"
7476
[1]=>

0 commit comments

Comments
 (0)