Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1: Skip test on PostgreSQL 10
9 years ago · cbf385e68c
1 changed files with 1 additions and 1 deletions
--- a/ext/pdo_pgsql/tests/bug48764.phpt
+++ b/ext/pdo_pgsql/tests/bug48764.phpt
@ -12,7 +12,7 @@ $db = PDOTest::factory();
 $client_version = $db->getAttribute(PDO::ATTR_CLIENT_VERSION);
 $server_version = $db->getAttribute(PDO::ATTR_SERVER_VERSION);

-if (version_compare($server_version, '7.4', '<') || version_compare($client_version, '7.4', '<')) {
+if (version_compare($server_version, '7.4', '<') || version_compare($client_version, '7.4', '<') || version_compare($server_version, '10', '>=')) {
        die('skip');
 }