diff options
author | Anatol Belski <ab@php.net> | 2017-10-27 16:23:19 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-10-27 16:23:19 +0200 |
commit | 005205714b5fe9e70e863590e0fac9f7cf37673f (patch) | |
tree | 1c7679054c7cb072ae7b57dc230055807e6928f7 | |
parent | 36b27f2ba599e95dfff2420d64083897684d9c1a (diff) | |
parent | 15a71fe045a476e864900657fc8d4d3586aafd02 (diff) | |
download | php-git-005205714b5fe9e70e863590e0fac9f7cf37673f.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip test on PostgreSQL 10
-rw-r--r-- | ext/pdo_pgsql/tests/bug48764.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_pgsql/tests/bug48764.phpt b/ext/pdo_pgsql/tests/bug48764.phpt index 715c60a68f..d102a055b0 100644 --- 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'); } |