Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Skip bug_36798.phpt for PDO_DBLIB
This commit is contained in:
Christoph M. Becker 2021-12-07 20:25:35 +01:00
commit 7d4fdf1510
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6

View file

@ -11,7 +11,8 @@ PDOTest::skip();
if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){
if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) die('skip expected output valid for Oracle with WE8MSWIN1252 character set');
} elseif (!strncasecmp(getenv('PDOTEST_DSN'), 'dblib', strlen('dblib'))) {
die('skip not for pdo_dblib');
}
?>