Merge pull request #26 from php/php81-ci

NattyNarwhal · web-flow · commit 4cee62727b0d · 2022-08-23T17:56:03.000-03:00
Make CI go on 8.1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
   ubuntu:
     strategy:
       matrix:
-          version: ['7.3', '7.4', '8.0']
+          version: ['7.3', '7.4', '8.0', '8.1']
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -83,6 +83,7 @@ jobs:
         # Note that connection.inc defaults should be mostly sufficient.
         run: |
           export TEST_PHP_ARGS="-n -d extension=modules/ibm_db2.so"
+          export DISABLE_SKIP_CACHE=1
           export IBM_DB2_TEST_SKIP_CONNECT_FAILURE=0
           export DB2CLIINIPATH=$PWD
           export REPORT_EXIT_STATUS=1
diff --git a/tests/test_023_ColumnPrivileges.phpt b/tests/test_023_ColumnPrivileges.phpt
@@ -11,7 +11,7 @@ $conn = db2_connect($database, $user, $password);
 
 if ($conn != 0)
 {
-	$stmt = db2_column_privileges($conn, NULL, NULL, 'ANIMALS');
+	@$stmt = db2_column_privileges($conn, NULL, NULL, 'ANIMALS');
 	$row = db2_fetch_array($stmt);
 	print $row[2] . "\n";
 	print $row[3] . "\n";
diff --git a/tests/test_024_ForeignKeys.phpt b/tests/test_024_ForeignKeys.phpt
@@ -20,7 +20,7 @@ if ($conn != 0)
 	$statement = "INSERT INTO test_foreign_keys VALUES (1)";
 	$result = db2_exec($conn, $statement);
 
-	$stmt = db2_foreign_keys($conn, NULL, NULL, 'TEST_PRIMARY_KEYS');
+	@$stmt = db2_foreign_keys($conn, NULL, NULL, 'TEST_PRIMARY_KEYS');
 	$row = db2_fetch_array($stmt);
 	echo $row[2] . "\n";
 	echo $row[3] . "\n";
diff --git a/tests/test_025_PrimaryKeys.phpt b/tests/test_025_PrimaryKeys.phpt
@@ -25,7 +25,7 @@ if ($conn != 0)
 	$statement = "INSERT INTO test_foreign_keys VALUES (1)";
 	$result = db2_exec($conn, $statement);
 
-	$stmt = db2_primary_keys($conn, NULL, NULL, 'TEST_PRIMARY_KEYS');
+	$stmt = @db2_primary_keys($conn, NULL, NULL, 'TEST_PRIMARY_KEYS');
 	$row = db2_fetch_array($stmt);
 	echo $row[2] . "\n";
 	echo $row[3] . "\n";
diff --git a/tests/test_060_Tables_01.phpt b/tests/test_060_Tables_01.phpt
@@ -26,7 +26,7 @@ $result = @db2_exec($conn, $create);
 
 if ($conn)
 {
-   $result = db2_tables($conn,NULL,strtoupper('t'));
+   $result = @db2_tables($conn,NULL,strtoupper('t'));
    $i = 0;
    while ($row=db2_fetch_both($result))
    {			
diff --git a/tests/test_061_Tables_02.phpt b/tests/test_061_Tables_02.phpt
@@ -26,7 +26,7 @@ $result = @db2_exec($conn, $create);
 
 if ($conn) 
 {
-   $result = db2_tables($conn,NULL,strtoupper('t'));	
+   $result = @db2_tables($conn,NULL,strtoupper('t'));	
    $i = 0;
    while ($row = db2_fetch_both($result)) 
    {
diff --git a/tests/test_062_Tables_03.phpt b/tests/test_062_Tables_03.phpt
@@ -27,7 +27,7 @@ $result = @db2_exec($conn, $create);
 if ($conn) 
 {
    $schema = strtoupper('t');
-   $result = db2_tables($conn,NULL,$schema);	
+   @$result = db2_tables($conn,NULL,$schema);	
    $i = 0;
    while ($row = db2_fetch_both($result)) 
    {
diff --git a/tests/test_063_Tables_04.phpt b/tests/test_063_Tables_04.phpt
@@ -9,7 +9,7 @@ require_once('connection.inc');
 
 $conn = db2_connect($db,$user,$password);
 
-$result = db2_tables($conn, NULL, "SYSIBM", "", "VIEW");
+$result = @db2_tables($conn, NULL, "SYSIBM", "", "VIEW");
 
 print_r ($result);
 
diff --git a/tests/test_064_Tables_05.phpt b/tests/test_064_Tables_05.phpt
@@ -24,7 +24,7 @@ $result = @db2_exec($conn, $create);
 $create = 'CREATE TABLE t.t4( c1 integer, c2 varchar(40))';
 $result = @db2_exec($conn, $create);
 
-$result = db2_tables($conn, NULL, "T");
+$result = @db2_tables($conn, NULL, "T");
 
 for ($i=0; $i<db2_num_fields($result); $i++) 
 {
diff --git a/tests/test_065_FilterTableName.phpt b/tests/test_065_FilterTableName.phpt
@@ -24,7 +24,7 @@ $result = @db2_exec($conn, $create);
 $create = 'CREATE TABLE t.t4( c1 integer, c2 varchar(40))';
 $result = @db2_exec($conn, $create);
 
-$result = db2_tables($conn, NULL, '%', "T3");
+$result = @db2_tables($conn, NULL, '%', "T3");
 
 $columns = db2_num_fields($result);
 
diff --git a/tests/test_066_TableObjects.phpt b/tests/test_066_TableObjects.phpt
@@ -11,7 +11,7 @@ $conn = db2_connect($database, $user, $password);
 
 $server = db2_server_info( $conn );
 
-$result = db2_tables($conn, NULL, strtoupper($user), 'ANIM%');
+$result = @db2_tables($conn, NULL, strtoupper($user), 'ANIM%');
 
 $t[0]=""; $t[1]=""; $t[2]=""; $t[3]="";
 while ($row = db2_fetch_object($result)) {
diff --git a/tests/test_10931_LcaseTableName.phpt b/tests/test_10931_LcaseTableName.phpt
@@ -18,7 +18,7 @@ if ($conn) {
 		 $sql = "create table \"TEST\".\"test_10931\" ( \"id\" INTEGER not null generated BY DEFAULT AS identity (NOCACHE, INCREMENT BY 1), \"title\" VARCHAR(50), \"created\" TIMESTAMP DEFAULT CURRENT TIMESTAMP,  constraint P_USERS_U1 primary key (\"id\"))";
 		 db2_exec($conn, $sql);
 
-		 $stmt = db2_columns ($conn ,null , 'TEST' , 'test_10931' , '%' );
+		 $stmt = @db2_columns ($conn ,null , 'TEST' , 'test_10931' , '%' );
 		 if ( $stmt ) 
 		 {
 		 		 while ($rowC = db2_fetch_assoc($stmt)) 
diff --git a/tests/test_190_ColumnsTable_01.phpt b/tests/test_190_ColumnsTable_01.phpt
@@ -11,7 +11,7 @@ $conn = db2_connect($db,$username,$password);
 
 if ($conn) 
 {
-   $result = db2_columns($conn,NULL,NULL,"EMPLOYEE");
+   $result = @db2_columns($conn,NULL,NULL,"EMPLOYEE");
    while ($row = db2_fetch_array($result))
    {
       $str = $row[1] ."/". $row[3];	
diff --git a/tests/test_191_ColumnsTable_02.phpt b/tests/test_191_ColumnsTable_02.phpt
@@ -10,7 +10,7 @@ require_once('connection.inc');
 $conn = db2_connect($db,$username,$password);
 
 if ($conn) {
-	$result = db2_columns($conn,NULL,NULL,"EMP_PHOTO");	
+	$result = @db2_columns($conn,NULL,NULL,"EMP_PHOTO");	
 	$i = 0;
 	while ($row = db2_fetch_both($result)) {
 		if ($row['COLUMN_NAME'] != 'EMP_ROWID' && $i < 3) {
diff --git a/tests/test_192_ColumnsTable_03.phpt b/tests/test_192_ColumnsTable_03.phpt
@@ -10,7 +10,7 @@ require_once('connection.inc');
 $conn = db2_connect($db,$username,$password);
 
 if ($conn) {
-	$result = db2_columns($conn,NULL,strtoupper($username),"EMP_RESUME");	
+	$result = @db2_columns($conn,NULL,strtoupper($username),"EMP_RESUME");	
 	$i = 0;
 	while ($row = db2_fetch_both($result)) {
 		if ($row['COLUMN_NAME'] != 'EMP_ROWID' && $i < 3) {
diff --git a/tests/test_197_StatisticsIndexes.phpt b/tests/test_197_StatisticsIndexes.phpt
@@ -15,7 +15,7 @@ if ($conn) {
 	$rc = db2_exec($conn, "CREATE INDEX index1 ON index_test (id)");
 
 	echo "Test first index table:\n";
-    $result = db2_statistics($conn,NULL,NULL,"INDEX_TEST",1);
+    $result = @db2_statistics($conn,NULL,NULL,"INDEX_TEST",1);
     $row = db2_fetch_array($result);
     echo $row[2] . "\n";  // TABLE_NAME
     echo $row[3] . "\n";  // NON_UNIQUE
@@ -28,15 +28,15 @@ if ($conn) {
 	$rc = db2_exec($conn, "CREATE INDEX index2 ON index_test2 (data)");
 
 	echo "Test second index table:\n";
-    $result = db2_statistics($conn,NULL,NULL,"INDEX_TEST2",1);
+    $result = @db2_statistics($conn,NULL,NULL,"INDEX_TEST2",1);
     $row = db2_fetch_array($result);
     echo $row[2] . "\n";  // TABLE_NAME
     echo $row[3] . "\n";  // NON_UNIQUE
     echo $row[5] . "\n";  // INDEX_NAME
     echo $row[8] . "\n";  // COLUMN_NAME
 
 	echo "Test non-existent table:\n";
-    $result = db2_statistics($conn,NULL,NULL,"NON_EXISTENT_TABLE",1);
+    $result = @db2_statistics($conn,NULL,NULL,"NON_EXISTENT_TABLE",1);
     $row = db2_fetch_array($result);
     if ($row) {
        echo "Non-Empty\n";
diff --git a/tests/test_9173_ProcedurePersistentConn.phpt b/tests/test_9173_ProcedurePersistentConn.phpt
@@ -12,7 +12,7 @@ require_once('connection.inc');
 $conn = db2_pconnect($database, $user, $password);
 
 if ($conn) {
-	$stmt = db2_procedures($conn, NULL, 'SYS%', '%%');
+	$stmt = @db2_procedures($conn, NULL, 'SYS%', '%%');
 
 	$row = db2_fetch_assoc($stmt);
 	var_dump($row);

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ $conn = db2_connect($database, $user, $password);`
`11`	`11`
`12`	`12`	`if ($conn != 0)`
`13`	`13`	`{`
`14`		`- $stmt = db2_column_privileges($conn, NULL, NULL, 'ANIMALS');`
	`14`	`+ @$stmt = db2_column_privileges($conn, NULL, NULL, 'ANIMALS');`
`15`	`15`	`$row = db2_fetch_array($stmt);`
`16`	`16`	`print $row[2] . "\n";`
`17`	`17`	`print $row[3] . "\n";`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ $result = @db2_exec($conn, $create);`
`26`	`26`
`27`	`27`	`if ($conn)`
`28`	`28`	`{`
`29`		`- $result = db2_tables($conn,NULL,strtoupper('t'));`
	`29`	`+ $result = @db2_tables($conn,NULL,strtoupper('t'));`
`30`	`30`	`$i = 0;`
`31`	`31`	`while ($row=db2_fetch_both($result))`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ $result = @db2_exec($conn, $create);`
`27`	`27`	`if ($conn)`
`28`	`28`	`{`
`29`	`29`	`$schema = strtoupper('t');`
`30`		`- $result = db2_tables($conn,NULL,$schema);`
	`30`	`+ @$result = db2_tables($conn,NULL,$schema);`
`31`	`31`	`$i = 0;`
`32`	`32`	`while ($row = db2_fetch_both($result))`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ $result = @db2_exec($conn, $create);`
`24`	`24`	`$create = 'CREATE TABLE t.t4( c1 integer, c2 varchar(40))';`
`25`	`25`	`$result = @db2_exec($conn, $create);`
`26`	`26`
`27`		`-$result = db2_tables($conn, NULL, "T");`
	`27`	`+$result = @db2_tables($conn, NULL, "T");`
`28`	`28`
`29`	`29`	`for ($i=0; $i<db2_num_fields($result); $i++)`
`30`	`30`	`{`