Merge branch 'PHP-8.1' into PHP-8.2

Author: devnexen

NEWS

@@ -41,6 +41,10 @@ PHP                                                                        NEWS
 - PDO ODBC:
   . Fixed missing and inconsistent error checks on SQLAllocHandle. (nielsdos)
 
+- PGSQL:
+  . Fixed typo in the array returned from pg_meta_data (extended mode).
+    (David Carlier)
+
 - SPL:
   . Fixed bug GH-10519 (Array Data Address Reference Issue). (Nathan Freeman)
 

ext/pgsql/pgsql.c

@@ -4243,7 +4243,7 @@ PHP_PGSQL_API zend_result php_pgsql_meta_data(PGconn *pg_link, const zend_string
 			/* pg_type.typtype */
 			add_assoc_bool_ex(&elem, "is base", sizeof("is base") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "b"));
 			add_assoc_bool_ex(&elem, "is composite", sizeof("is composite") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "c"));
-			add_assoc_bool_ex(&elem, "is pesudo", sizeof("is pesudo") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "p"));
+			add_assoc_bool_ex(&elem, "is pseudo", sizeof("is pseudo") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "p"));
 			/* pg_description.description */
 			add_assoc_string_ex(&elem, "description", sizeof("description") - 1, PQgetvalue(pg_result, i, 8));
 		}

ext/pgsql/tests/pg_meta_data_001.phpt

@@ -122,7 +122,7 @@ array(2) {
     bool(true)
     ["is composite"]=>
     bool(false)
-    ["is pesudo"]=>
+    ["is pseudo"]=>
     bool(false)
     ["description"]=>
     string(0) ""
@@ -147,7 +147,7 @@ array(2) {
     bool(true)
     ["is composite"]=>
     bool(false)
-    ["is pesudo"]=>
+    ["is pseudo"]=>
     bool(false)
     ["description"]=>
     string(0) ""