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

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Backport GH-14962 to stable versions
This commit is contained in:
Niels Dossche 2024-11-26 21:25:05 +01:00
commit 21df4a97a3
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
8 changed files with 47 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/dba/tests/dba_flatfile.phpt
View file

@ -29,12 +29,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
[key10]name10: Content String 10
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
[key10]name10: Content String 10
[key30]name30: Content String 30
Total keys: 6
Key 1 exists? N
Key 2 exists? Y

16
ext/dba/tests/dba_gdbm.phpt
View file

@ -35,12 +35,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
key4: Another Content String
key2: Content String 2
key5: The last content string
[key10]name10: Content String 10
name9: Content String 9
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
Total keys: 6
Key 1 exists? N
Key 2 exists? Y
@ -81,12 +81,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
key4: Another Content String
key2: Content String 2
key5: The last content string
[key10]name10: Content String 10
name9: Content String 9
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
Total keys: 6
Key 1 exists? N
Key 2 exists? Y

8
ext/dba/tests/dba_inifile.phpt
View file

@ -30,14 +30,14 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
[key10]:
[key10]name10: Content String 10
[key30]:
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
Total keys: 8
Key 1 exists? N
Key 2 exists? Y

16
ext/dba/tests/dba_ndbm.phpt
View file

@ -36,12 +36,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
key4: Another Content String
key2: Content String 2
key5: The last content string
[key10]name10: Content String 10
name9: Content String 9
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
Total keys: 6
Key 1 exists? N
Key 2 exists? Y
@ -82,12 +82,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
key4: Another Content String
key2: Content String 2
key5: The last content string
[key10]name10: Content String 10
name9: Content String 9
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
Total keys: 6
Key 1 exists? N
Key 2 exists? Y

8
ext/dba/tests/dba_qdbm.phpt
View file

@ -35,12 +35,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
[key10]name10: Content String 10
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
[key10]name10: Content String 10
[key30]name30: Content String 30
Total keys: 6
Key 1 exists? N
Key 2 exists? Y
@ -81,12 +81,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
[key10]name10: Content String 10
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
[key10]name10: Content String 10
[key30]name30: Content String 30
Total keys: 6
Key 1 exists? N
Key 2 exists? Y

4
ext/dba/tests/dba_tcadb.phpt
View file

@ -30,12 +30,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
[key10]name10: Content String 10
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
[key10]name10: Content String 10
[key30]name30: Content String 30
Total keys: 6
Key 1 exists? N
Key 2 exists? Y

19
ext/dba/tests/setup/setup_dba_tests.inc
View file

@ -102,14 +102,29 @@ function run_standard_tests_ex(string $handler, string $name, LockFlag $lock, bo
echo 'Try to remove key 1 again', \PHP_EOL;
var_dump(dba_delete("key1", $db_writer));
// Fetch data
// Fetch and sort data. We sort to guarantee that the output is
// consistent across invocations and architectures. When iterating
// with firstkey() and nextkey(), several engines (GDBM, LMDB,
// QDBM) make no promise about the iteration order. Others (TCADB,
// DBM) explicitly state that the order is arbitrary. With GDBM at
// least, the order appears platform-dependent -- we have a report
// in Github issue 14786. GDBM's own test suite sorts this output,
// suggesting that sorting is a reasonable workaround for the issue.
$output = [];
$key = dba_firstkey($db_writer);
$total_keys = 0;
while ($key) {
echo $key, ': ', dba_fetch($key, $db_writer), \PHP_EOL;
$output[] = $key . ': ' . dba_fetch($key, $db_writer) . \PHP_EOL;
$key = dba_nextkey($db_writer);
$total_keys++;
}
sort($output, SORT_STRING);
foreach ($output as $line) {
echo $line;
}
echo 'Total keys: ', $total_keys, \PHP_EOL;
for ($i = 1; $i < 6; $i++) {
echo "Key $i exists? ", dba_exists("key$i", $db_writer) ? 'Y' : 'N', \PHP_EOL;

4
ext/pgsql/tests/80_bug14383.phpt
View file

@ -39,12 +39,12 @@ bool(true)
bool(true)
Try to remove key 1 again
bool(false)
[key10]name10: Content String 10
[key30]name30: Content String 30
key2: Content String 2
key4: Another Content String
key5: The last content string
name9: Content String 9
[key10]name10: Content String 10
[key30]name30: Content String 30
Total keys: 6
Key 1 exists? N
Key 2 exists? Y