diff options
author | Anatol Belski <ab@php.net> | 2017-10-27 16:23:50 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-10-27 16:23:50 +0200 |
commit | cbf385e68ce947fbf3c709b39a7ff969e9d36e01 (patch) | |
tree | 96aacf55f10652471434ca6d36cac5358818016e /ext | |
parent | f936a17c12dc8e47cb62901adf7d0f58581286d4 (diff) | |
parent | 005205714b5fe9e70e863590e0fac9f7cf37673f (diff) | |
download | php-git-cbf385e68ce947fbf3c709b39a7ff969e9d36e01.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip test on PostgreSQL 10
Diffstat (limited to 'ext')
-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'); } |