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

Fix dba tests wrt resource to object conversion (GH-15716)

Browse source 
We should not pretend that there are still user-visible resources,
since we're dealing with objects now.
This commit is contained in:
Christoph M. Becker 2024-09-03 14:23:57 +02:00 • committed by GitHub
parent 3892529fed
commit 8a2015451a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ext/dba/tests/dba015.phpt
View file

@ -26,23 +26,23 @@ echo dba_fetch("key1", $db_file1), "\n";
echo "Test 2\n"; echo "Test 2\n";
$db_file2 = dba_popen($db_filename, 'n', 'flatfile'); $db_file2 = dba_popen($db_filename, 'n', 'flatfile');
if ($db_file1 === $db_file2) { if ($db_file1 === $db_file2) {
echo "resources are the same\n"; echo "objects are the same\n";
} else { } else {
echo "resources are different\n"; echo "objects are different\n";
} }
echo "Test 3 - fetch both rows from second resource\n"; echo "Test 3 - fetch both rows from second object\n";
dba_insert("key2", "This is a test insert 2", $db_file2); dba_insert("key2", "This is a test insert 2", $db_file2);
echo dba_fetch("key1", $db_file2), "\n"; echo dba_fetch("key1", $db_file2), "\n";
echo dba_fetch("key2", $db_file2), "\n"; echo dba_fetch("key2", $db_file2), "\n";
echo "Test 4 - fetch both rows from first resource\n"; echo "Test 4 - fetch both rows from first object\n";
echo dba_fetch("key1", $db_file1), "\n"; echo dba_fetch("key1", $db_file1), "\n";
echo dba_fetch("key2", $db_file1), "\n"; echo dba_fetch("key2", $db_file1), "\n";
echo "Test 5 - close 2nd resource\n"; echo "Test 5 - close 2nd object\n";
dba_close($db_file2); dba_close($db_file2);
var_dump($db_file1); var_dump($db_file1);
try { try {
@ -51,7 +51,7 @@ try {
echo $e->getMessage() . "\n"; echo $e->getMessage() . "\n";
} }
echo "Test 6 - query after closing 2nd resource\n"; echo "Test 6 - query after closing 2nd object\n";
echo dba_fetch("key1", $db_file1), "\n"; echo dba_fetch("key1", $db_file1), "\n";
echo dba_fetch("key2", $db_file1), "\n"; echo dba_fetch("key2", $db_file1), "\n";
@ -65,17 +65,17 @@ database handler: flatfile
Test 1 Test 1
This is a test insert 1 This is a test insert 1
Test 2 Test 2
resources are different objects are different
Test 3 - fetch both rows from second resource Test 3 - fetch both rows from second object
This is a test insert 1 This is a test insert 1
This is a test insert 2 This is a test insert 2
Test 4 - fetch both rows from first resource Test 4 - fetch both rows from first object
This is a test insert 1 This is a test insert 1
This is a test insert 2 This is a test insert 2
Test 5 - close 2nd resource Test 5 - close 2nd object
object(Dba\Connection)#%d (%d) { object(Dba\Connection)#%d (%d) {
} }
DBA connection has already been closed DBA connection has already been closed
Test 6 - query after closing 2nd resource Test 6 - query after closing 2nd object
This is a test insert 1 This is a test insert 1
This is a test insert 2 This is a test insert 2

22
ext/dba/tests/dba_db4_018.phpt
View file

@ -26,23 +26,23 @@ echo dba_fetch("key1", $db_file1), "\n";
echo "Test 2\n"; echo "Test 2\n";
$db_file2 = dba_popen($db_filename, 'n', 'flatfile'); $db_file2 = dba_popen($db_filename, 'n', 'flatfile');
if ($db_file1 === $db_file2) { if ($db_file1 === $db_file2) {
echo "resources are the same\n"; echo "objects are the same\n";
} else { } else {
echo "resources are different\n"; echo "object are different\n";
} }
echo "Test 3 - fetch both rows from second resource\n"; echo "Test 3 - fetch both rows from second object\n";
dba_insert("key2", "This is a test insert 2", $db_file2); dba_insert("key2", "This is a test insert 2", $db_file2);
echo dba_fetch("key1", $db_file2), "\n"; echo dba_fetch("key1", $db_file2), "\n";
echo dba_fetch("key2", $db_file2), "\n"; echo dba_fetch("key2", $db_file2), "\n";
echo "Test 4 - fetch both rows from first resource\n"; echo "Test 4 - fetch both rows from first object\n";
echo dba_fetch("key1", $db_file1), "\n"; echo dba_fetch("key1", $db_file1), "\n";
echo dba_fetch("key2", $db_file1), "\n"; echo dba_fetch("key2", $db_file1), "\n";
echo "Test 5 - close 2nd resource\n"; echo "Test 5 - close 2nd object\n";
dba_close($db_file2); dba_close($db_file2);
var_dump($db_file1); var_dump($db_file1);
try { try {
@ -51,7 +51,7 @@ try {
echo $e->getMessage() . "\n"; echo $e->getMessage() . "\n";
} }
echo "Test 6 - query after closing 2nd resource\n"; echo "Test 6 - query after closing 2nd object\n";
echo dba_fetch("key1", $db_file1), "\n"; echo dba_fetch("key1", $db_file1), "\n";
echo dba_fetch("key2", $db_file1), "\n"; echo dba_fetch("key2", $db_file1), "\n";
@ -65,17 +65,17 @@ database handler: db4
Test 1 Test 1
This is a test insert 1 This is a test insert 1
Test 2 Test 2
resources are different objects are different
Test 3 - fetch both rows from second resource Test 3 - fetch both rows from second object
This is a test insert 1 This is a test insert 1
This is a test insert 2 This is a test insert 2
Test 4 - fetch both rows from first resource Test 4 - fetch both rows from first object
This is a test insert 1 This is a test insert 1
This is a test insert 2 This is a test insert 2
Test 5 - close 2nd resource Test 5 - close 2nd object
object(Dba\Connection)#%d (%d) { object(Dba\Connection)#%d (%d) {
} }
DBA connection has already been closed DBA connection has already been closed
Test 6 - query after closing 2nd resource Test 6 - query after closing 2nd object
This is a test insert 1 This is a test insert 1
This is a test insert 2 This is a test insert 2