Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  [skip ci] Add missing conflicts for dba test
This commit is contained in:
Ilija Tovilo 2024-05-24 14:48:42 +02:00
commit dbbf5fff54
No known key found for this signature in database
GPG key ID: A4F5D403F118200A

View file

@ -2,6 +2,8 @@
DBA Handler Test DBA Handler Test
--EXTENSIONS-- --EXTENSIONS--
dba dba
--CONFLICTS--
dba
--SKIPIF-- --SKIPIF--
<?php <?php
$handler="flatfile"; $handler="flatfile";