archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix the signature of PDOStatement::fetchObject()

Browse source 
The ?array $ctorArgs = null parameter is changed to array $constructorArgs = [], and an additional memory leak revealed by the new test case is fixed.

Closes GH-6937

Co-Authored-By: Nikita Popov <nikita.ppv@gmail.com>
This commit is contained in:
Máté Kocsis 2021-05-04 13:35:32 +02:00
parent 9e51b487f3
commit 068c8db276
No known key found for this signature in database
GPG key ID: FD055E41728BF310
4 changed files with 108 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

99
ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject_ctor_args.phpt Normal file
View file

@ -0,0 +1,99 @@
--TEST--
MySQL PDO: PDOStatement->fetchObject() with $constructorArgs
--SKIPIF--
<?php
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
MySQLPDOTest::skip();
$db = MySQLPDOTest::factory();
try {
$query = "SELECT '', NULL, \"\" FROM DUAL";
$stmt = $db->prepare($query);
$ok = @$stmt->execute();
} catch (PDOException $e) {
die("skip: Test cannot be run with SQL mode ANSI");
}
if (!$ok)
die("skip: Test cannot be run with SQL mode ANSI");
?>
--FILE--
<?php
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
/** @var PDO $db */
$db = MySQLPDOTest::factory();
MySQLPDOTest::createTestTable($db);
$query = "SELECT id FROM test ORDER BY id ASC LIMIT 1";
$stmt = $db->prepare($query);
class Foo {
public int $a;
public int $id;
public function __construct($a) {
$this->a = $a;
}
}
class Bar {
public int $id;
}
$stmt->execute();
try {
$obj = $stmt->fetchObject(Foo::class);
} catch (ArgumentCountError $exception) {
echo $exception->getMessage() . "\n";
}
$stmt->execute();
try {
$obj = $stmt->fetchObject(Foo::class, []);
} catch (ArgumentCountError $exception) {
echo $exception->getMessage() . "\n";
}
$stmt->execute();
$obj = $stmt->fetchObject(Foo::class, ["a" => 123]);
var_dump($obj);
$stmt->execute();
$obj = $stmt->fetchObject(Bar::class);
var_dump($obj);
$stmt->execute();
$obj = $stmt->fetchObject(Bar::class, []);
var_dump($obj);
try {
$stmt->execute();
$obj = $stmt->fetchObject(Bar::class, ["a" => 123]);
} catch (Error $exception) {
echo $exception->getMessage() . "\n";
}
?>
--CLEAN--
<?php
require __DIR__ . '/mysql_pdo_test.inc';
MySQLPDOTest::dropTestTable();
?>
--EXPECTF--
Too few arguments to function Foo::__construct(), 0 passed and exactly 1 expected
Too few arguments to function Foo::__construct(), 0 passed and exactly 1 expected
object(Foo)#%d (2) {
["a"]=>
int(123)
["id"]=>
int(1)
}
object(Bar)#%d (1) {
["id"]=>
int(1)
}
object(Bar)#%d (1) {
["id"]=>
int(1)
}
User-supplied statement does not accept constructor arguments