From 462792ee516eca4942d2dddcbf44d0ad5cb79061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Tue, 22 Aug 2023 11:01:28 +0200
Subject: [PATCH] Expose PDO_ODBC_TYPE to userland

---
 UPGRADING                         | 3 +++
 ext/pdo_odbc/pdo_odbc.c           | 3 +++
 ext/pdo_odbc/pdo_odbc.stub.php    | 9 +++++++++
 ext/pdo_odbc/pdo_odbc_arginfo.h   | 9 +++++++++
 ext/pdo_odbc/tests/bug80783a.phpt | 3 ++-
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 ext/pdo_odbc/pdo_odbc.stub.php
 create mode 100644 ext/pdo_odbc/pdo_odbc_arginfo.h

diff --git a/UPGRADING b/UPGRADING
index 3e8f694c801..5696920d96a 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -497,6 +497,9 @@ PHP 8.3 UPGRADE NOTES
 - PCNTL:
   . SIGINFO
 
+- PDO_ODBC
+  . PDO_ODBC_TYPE
+
 - PGSQL:
   . PGSQL_TRACE_SUPPRESS_TIMESTAMPS
   . PGSQL_TRACE_REGRESS_MODE
diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c
index 98e684bc5a9..8e090a397f0 100644
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
@@ -25,6 +25,7 @@
 #include "pdo/php_pdo_driver.h"
 #include "php_pdo_odbc.h"
 #include "php_pdo_odbc_int.h"
+#include "pdo_odbc_arginfo.h"
 
 /* {{{ pdo_odbc_deps[] */
 static const zend_module_dep pdo_odbc_deps[] = {
@@ -96,6 +97,8 @@ PHP_MINIT_FUNCTION(pdo_odbc)
 	}
 #endif
 
+	register_pdo_odbc_symbols(module_number);
+
 	REGISTER_PDO_CLASS_CONST_LONG("ODBC_ATTR_USE_CURSOR_LIBRARY", PDO_ODBC_ATTR_USE_CURSOR_LIBRARY);
 	REGISTER_PDO_CLASS_CONST_LONG("ODBC_ATTR_ASSUME_UTF8", PDO_ODBC_ATTR_ASSUME_UTF8);
 	REGISTER_PDO_CLASS_CONST_LONG("ODBC_SQL_USE_IF_NEEDED", SQL_CUR_USE_IF_NEEDED);
diff --git a/ext/pdo_odbc/pdo_odbc.stub.php b/ext/pdo_odbc/pdo_odbc.stub.php
new file mode 100644
index 00000000000..745be283375
--- /dev/null
+++ b/ext/pdo_odbc/pdo_odbc.stub.php
@@ -0,0 +1,9 @@
+<?php
+
+/** @generate-class-entries */
+
+/**
+ * @var string
+ * @cvalue PDO_ODBC_TYPE
+ */
+const PDO_ODBC_TYPE = UNKNOWN;
diff --git a/ext/pdo_odbc/pdo_odbc_arginfo.h b/ext/pdo_odbc/pdo_odbc_arginfo.h
new file mode 100644
index 00000000000..8a26d600d72
--- /dev/null
+++ b/ext/pdo_odbc/pdo_odbc_arginfo.h
@@ -0,0 +1,9 @@
+/* This is a generated file, edit the .stub.php file instead.
+ * Stub hash: 7927099133bf60cab0464aae8c9de8f7ef2732bd */
+
+
+
+static void register_pdo_odbc_symbols(int module_number)
+{
+	REGISTER_STRING_CONSTANT("PDO_ODBC_TYPE", PDO_ODBC_TYPE, CONST_PERSISTENT);
+}
diff --git a/ext/pdo_odbc/tests/bug80783a.phpt b/ext/pdo_odbc/tests/bug80783a.phpt
index ba2c3e960d9..2418d0591ba 100644
--- a/ext/pdo_odbc/tests/bug80783a.phpt
+++ b/ext/pdo_odbc/tests/bug80783a.phpt
@@ -4,10 +4,11 @@ Bug #80783 (PDO ODBC truncates BLOB records at every 256th byte)
 pdo_odbc
 --SKIPIF--
 <?php
+
 require 'ext/pdo/tests/pdo_test.inc';
 PDOTest::skip();
 
-if (ODBC_TYPE === "unixODBC") {
+if (PDO_ODBC_TYPE === "unixODBC") {
     die("skip Fails with unixODBC");
 }
 ?>