Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/ext/mysqli/CMakeLists.txt

@@ -91,7 +91,7 @@ else()
   mark_as_advanced(PHP_EXT_MYSQL_SOCKET)
 
   set(
-    PHP_EXT_MYSQL_SOCKET_PATH
+    CACHE{PHP_EXT_MYSQL_SOCKET_PATH}
     TYPE STRING
     HELP
       "mysqli/pdo_mysql: Path to the MySQL Unix socket pointer. "

cmake/ext/pdo_odbc/CMakeLists.txt

@@ -111,7 +111,7 @@ set(
   VALUE "auto"
 )
 set_property(
-  CACHE PHP_EXT_ODBC_TYPE
+  CACHE PHP_EXT_PDO_ODBC_TYPE
   PROPERTY STRINGS
     "auto"
     "ibm-db2"