Merge branch 'PHP-8.0' into PHP-8.1

cmb69 · cmb69 · commit 7d4fdf151042 · 2021-12-07T20:25:35.000+01:00
* PHP-8.0:
  Skip bug_36798.phpt for PDO_DBLIB
diff --git a/ext/pdo/tests/bug_36798.phpt b/ext/pdo/tests/bug_36798.phpt
@@ -11,7 +11,8 @@ PDOTest::skip();
 
 if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){
     if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) die('skip expected output valid for Oracle with WE8MSWIN1252 character set');
-
+} elseif (!strncasecmp(getenv('PDOTEST_DSN'), 'dblib', strlen('dblib'))) {
+    die('skip not for pdo_dblib');
 }
 
 ?>

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ PDOTest::skip();`
`11`	`11`
`12`	`12`	`if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){`
`13`	`13`	`if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) die('skip expected output valid for Oracle with WE8MSWIN1252 character set');`
`14`		`-`
	`14`	`+} elseif (!strncasecmp(getenv('PDOTEST_DSN'), 'dblib', strlen('dblib'))) {`
	`15`	`+ die('skip not for pdo_dblib');`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`?>`