Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix test compat for PostgreSQL 10

ext/pgsql/tests/pg_update_001.phpt

@@ -24,7 +24,7 @@ var_dump(pg_update($conn, 'foo', array('id' => 10), array('id' => 1), PGSQL_DML_
 pg_update($conn, 'phptests.foo', array('id' => 100), array('id2' => 2));
 var_dump(pg_update($conn, 'phptests.foo', array('id' => 100), array('id2' => 2), PGSQL_DML_STRING));
 
-$rs = pg_query('SELECT * FROM foo UNION SELECT * FROM phptests.foo');
+$rs = pg_query('SELECT * FROM foo UNION SELECT * FROM phptests.foo ORDER BY id');
 while ($row = pg_fetch_assoc($rs)) {
 	var_dump($row);
 }