Skip to content

Fix pdo_oci tests for PHP 8.1 #9051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fix pdo_oci tests for PHP 8.1 #9051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d522643
Fix pdo_oci tests for PHP 8.0
mvorisek Jul 19, 2022
0eb4063
Merge branch 'fix_oci_tests_php80' into fix_oci_tests_php81
mvorisek Jul 19, 2022
c7e37af
xfail pdo_039.phpt test for Oracle
mvorisek Jul 19, 2022
cf3911a
fix deprecation warning in pdo_oci test
mvorisek Jul 19, 2022
8df93d4
fix pdo_039.phpt
mvorisek Jul 21, 2022
8345795
Merge branch 'PHP-8.1' into fix_oci_tests_php81
mvorisek Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ext/pdo/tests/pdo_039.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,29 @@ if ($pass === false) $pass = NULL;

$conn = new PDO($dsn, $user, $pass, $attr);

$query = 'SELECT 1';
var_dump($conn->errorCode());

$query = 'SELECT 1';
if ($conn->getAttribute(PDO::ATTR_DRIVER_NAME) === 'oci') {
$query .= ' FROM DUAL';
}
var_dump($conn->errorCode());
$stmt = $conn->prepare($query);
var_dump($conn->errorCode());

$stmt = $conn->prepare($query);
var_dump($conn->errorCode());
var_dump($stmt->errorCode());

$stmt->execute();
var_dump($stmt->errorCode());
var_dump($stmt->errorCode());

?>
--EXPECT--
NULL
string(5) "00000"
string(5) "00000"
string(5) "00000"
NULL
string(5) "00000"
string(5) "00000"
11 changes: 1 addition & 10 deletions ext/pdo_oci/tests/pdo_oci_quote1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $stmt = $db->prepare('select * from poq_tab');
// The intent is that the fetched data be identical to the unquoted string.
// Remember!: use bind variables instead of PDO->quote()

$a = array(null, "", "a", "ab", "abc", "ab'cd", "a\b\n", "'", "''", "a'", "'z", "a''b", '"');
$a = array("", "a", "ab", "abc", "ab'cd", "a\b\n", "'", "''", "a'", "'z", "a''b", '"');
foreach ($a as $u) {
$q = $db->quote($u);
echo "Unquoted : ";
Expand All @@ -42,15 +42,6 @@ echo "Done\n";

?>
--EXPECT--
Unquoted : NULL
Quoted : string(2) "''"
array(1) {
[0]=>
array(1) {
["t"]=>
NULL
}
}
Unquoted : string(0) ""
Quoted : string(2) "''"
array(1) {
Expand Down