Fix tests

Author: nikic

ext/pgsql/tests/05large_object.phpt

@@ -43,7 +43,7 @@ $handle = pg_lo_open ($db, $oid, "w");
 $bytesWritten = pg_lo_read_all($handle);
 echo "\n";
 var_dump($bytesWritten);
-if (pg_last_error()) echo "pg_lo_read_all() error\n".pg_last_error();
+if (pg_last_error($db)) echo "pg_lo_read_all() error\n".pg_last_error();
 pg_lo_close($handle);
 pg_exec ($db, "commit");
 

ext/pgsql/tests/08escape.phpt

@@ -44,7 +44,7 @@ $data = file_get_contents(FILE_NAME);
 $db   = pg_connect($conn_str);
 
 // Insert binary to DB
-$escaped_data = pg_escape_bytea($data);
+$escaped_data = pg_escape_bytea($db, $data);
 pg_query($db, "DELETE FROM ".$table_name." WHERE num = 10000;");
 $sql = "INSERT INTO ".$table_name." (num, bin) VALUES (10000, CAST ('".$escaped_data."' AS BYTEA));";
 pg_query($db, $sql);
@@ -73,7 +73,7 @@ for ($i = 0; $i < 2; $i++) {
 // pg_escape_literal/pg_escape_identifier
 $before = "ABC\\ABC\'";
 $expect	 = " E'ABC\\\\ABC\\\\'''";
-$after = pg_escape_literal($before);
+$after = pg_escape_literal($db, $before);
 if ($expect === $after) {
     echo "pg_escape_literal() is Ok\n";
 }
@@ -86,7 +86,7 @@ else {
 
 $before = "ABC\\ABC\'";
 $expect	 = "\"ABC\ABC\'\"";
-$after = pg_escape_identifier($before);
+$after = pg_escape_identifier($db, $before);
 if ($expect === $after) {
     echo "pg_escape_identifier() is Ok\n";
 }
@@ -104,12 +104,6 @@ pg_escape_string() is Ok
 
 Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
 pg_escape_bytea() is Ok
-
-Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
 pg_escape_bytea() actually works with database
-
-Deprecated: pg_escape_literal(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
 pg_escape_literal() is Ok
-
-Deprecated: pg_escape_identifier(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
 pg_escape_identifier() is Ok

ext/pgsql/tests/09notice.phpt

@@ -7,7 +7,7 @@ pgsql
 
 include("skipif.inc");
 
-_skip_lc_messages();
+_skip_lc_messages($conn);
 
 ?>
 --FILE--

ext/pgsql/tests/18pg_escape_bytea_esc.phpt

@@ -14,7 +14,7 @@ $db = pg_connect($conn_str);
 @pg_query($db, "SET bytea_output = 'escape'");
 
 $image = file_get_contents(__DIR__ . '/php.gif');
-$esc_image = pg_escape_bytea($image);
+$esc_image = pg_escape_bytea($db, $image);
 
 pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, \''.$esc_image.'\');');
 $result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876');
@@ -28,6 +28,5 @@ else {
     echo "OK";
 }
 ?>
---EXPECTF--
-Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
+--EXPECT--
 OK

ext/pgsql/tests/18pg_escape_bytea_hex.phpt

@@ -17,7 +17,7 @@ $db = pg_connect($conn_str);
 @pg_query($db, "SET bytea_output = 'hex'");
 
 $image = file_get_contents(__DIR__ . '/php.gif');
-$esc_image = pg_escape_bytea($image);
+$esc_image = pg_escape_bytea($db, $image);
 
 pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, \''.$esc_image.'\');');
 $result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876');
@@ -31,6 +31,5 @@ else {
     echo "OK";
 }
 ?>
---EXPECTF--
-Deprecated: pg_escape_bytea(): Automatic fetching of PostgreSQL connection is deprecated in %s on line %d
+--EXPECT--
 OK

ext/pgsql/tests/80_bug32223b.phpt

@@ -6,7 +6,7 @@ pgsql
 <?php
 require_once('skipif.inc');
 
-_skip_lc_messages();
+_skip_lc_messages($conn);
 
 @pg_query($conn, "CREATE LANGUAGE 'plpgsql' HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL'");
 $res = @pg_query($conn, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '
@@ -30,7 +30,7 @@ if (!$dbh) {
     die ("Could not connect to the server");
 }
 
-_set_lc_messages(dbh);
+_set_lc_messages($dbh);
 
 $res = pg_query($dbh, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '
 begin

ext/pgsql/tests/bug46408.phpt

@@ -17,7 +17,7 @@ require_once('config.inc');
 $dbh = pg_connect($conn_str);
 setlocale(LC_ALL, "de", "de_DE", "de_DE.ISO8859-1", "de_DE.ISO_8859-1", "de_DE.UTF-8");
 echo 3.5 , "\n";
-pg_query_params("SELECT $1::numeric", array(3.5));
+pg_query_params($dbh, "SELECT $1::numeric", array(3.5));
 pg_close($dbh);
 
 echo "Done".PHP_EOL;

ext/pgsql/tests/deprecated_implicit_default_link.phpt

@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL fetching default link automatically is deprecated
+--EXTENSIONS--
+pgsql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
@@ -8,8 +10,8 @@ PostgreSQL fetching default link automatically is deprecated
 include('config.inc');
 $db = pg_connect($conn_str);
 
-// We don't care about warnings or errors
-ini_set('error_reporting', E_DEPRECATED);
+// We don't care about warnings
+ini_set('error_reporting', E_ALL&~E_WARNING);
 
 // Special cases
 pg_set_error_verbosity(PGSQL_ERRORS_TERSE);
@@ -18,7 +20,7 @@ pg_execute('str', []);
 
 pg_lo_unlink(1);
 // deprecated alias 'pg_lounlink',
-pg_lo_open(1, '');
+pg_lo_open(1, 'r');
 // deprecated alias 'pg_loopen',
 pg_lo_export(1, '');
 // deprecated alias 'pg_loexport',

ext/pgsql/tests/lcmess.inc

@@ -1,8 +1,7 @@
 <?php
 
-function _skip_lc_messages($lc_messages = 'C')
+function _skip_lc_messages($conn, $lc_messages = 'C')
 {
-    global $conn;
     if (!_set_lc_messages($conn, $lc_messages)) {
         die("skip Cannot set LC_MESSAGES to '{$lc_messages}'\n");
     }