Skip to content

Commit dd5c3ac

Browse files
committed
deprecate PDO global as well ?
1 parent f92030c commit dd5c3ac

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

ext/pdo/php_pdo.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@ PHP_MINFO_FUNCTION(pdo);
5353
#define REGISTER_PDO_CLASS_CONST_LONG(const_name, value) \
5454
zend_declare_class_constant_long(php_pdo_get_dbh_ce(), const_name, sizeof(const_name)-1, (zend_long)value);
5555

56+
#define REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED(const_name, value) \
57+
do { \
58+
zend_string *key = zend_string_init(const_name, sizeof(const_name)-1, false); \
59+
zval constant; \
60+
ZVAL_LONG(&constant, value); \
61+
zend_declare_class_constant_ex(php_pdo_get_dbh_ce(), key, &constant, ZEND_ACC_PUBLIC | CONST_DEPRECATED, NULL); \
62+
zend_string_release(key); \
63+
} while (0)
64+
5665
#define LONG_CONST(c) (zend_long) c
5766

5867
#define PDO_CONSTRUCT_CHECK_COND dbh->driver

ext/pdo_pgsql/pdo_pgsql.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@ PHP_METHOD(Pdo_Pgsql, setNoticeCallback)
180180
PHP_MINIT_FUNCTION(pdo_pgsql)
181181
{
182182
REGISTER_PDO_CLASS_CONST_LONG("PGSQL_ATTR_DISABLE_PREPARES", PDO_PGSQL_ATTR_DISABLE_PREPARES);
183-
REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_IDLE", (zend_long)PGSQL_TRANSACTION_IDLE);
184-
REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_ACTIVE", (zend_long)PGSQL_TRANSACTION_ACTIVE);
185-
REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_INTRANS", (zend_long)PGSQL_TRANSACTION_INTRANS);
186-
REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_INERROR", (zend_long)PGSQL_TRANSACTION_INERROR);
187-
REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_UNKNOWN", (zend_long)PGSQL_TRANSACTION_UNKNOWN);
183+
REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED("PGSQL_TRANSACTION_IDLE", (zend_long)PGSQL_TRANSACTION_IDLE);
184+
REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED("PGSQL_TRANSACTION_ACTIVE", (zend_long)PGSQL_TRANSACTION_ACTIVE);
185+
REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED("PGSQL_TRANSACTION_INTRANS", (zend_long)PGSQL_TRANSACTION_INTRANS);
186+
REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED("PGSQL_TRANSACTION_INERROR", (zend_long)PGSQL_TRANSACTION_INERROR);
187+
REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED("PGSQL_TRANSACTION_UNKNOWN", (zend_long)PGSQL_TRANSACTION_UNKNOWN);
188188

189189
PdoPgsql_ce = register_class_Pdo_Pgsql(pdo_dbh_ce);
190190
PdoPgsql_ce->create_object = pdo_dbh_new;

0 commit comments

Comments
 (0)