move pdo_drivers -> PDO::getAvailableDrivers as part of namespacing sweep.

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index fd38a56cc506023877e68625dad4fefe3ed9531b..6cbc92175ef40a310c28bfb230efa23dd7b9d069 100755 (executable)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -62,26 +62,8 @@ PDO_API zend_class_entry *php_pdo_get_exception(void)
 
 zend_class_entry *pdo_dbh_ce, *pdo_dbstmt_ce, *pdo_row_ce;
 
-/* proto array pdo_drivers()
- Return array of available PDO drivers */
-PHP_FUNCTION(pdo_drivers)
-{
-       HashPosition pos;
-       pdo_driver_t **pdriver;
-       
-       array_init(return_value);
-
-       zend_hash_internal_pointer_reset_ex(&pdo_driver_hash, &pos);
-       while (SUCCESS == zend_hash_get_current_data_ex(&pdo_driver_hash, (void**)&pdriver, &pos)) {
-               add_next_index_stringl(return_value, (char*)(*pdriver)->driver_name, (*pdriver)->driver_name_len, 1);
-               zend_hash_move_forward_ex(&pdo_driver_hash, &pos);
-       }
-}
-/* }}} */
-
 /* {{{ pdo_functions[] */
 function_entry pdo_functions[] = {
-       PHP_FE(pdo_drivers,             NULL)
        {NULL, NULL, NULL}
 };
 /* }}} */

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index c03de78e2cb3d60572ab3b47d96660fa1d4b7f5d..dae5691ff6a2e39112e7c1c3207ed9588bb5d6f9 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -976,6 +976,23 @@ static PHP_METHOD(PDO, __sleep)
 }
 /* }}} */
 
+/* {{{ proto array pdo_drivers()
+   Return array of available PDO drivers */
+static PHP_METHOD(PDO, getAvailableDrivers)
+{
+       HashPosition pos;
+       pdo_driver_t **pdriver;
+       
+       array_init(return_value);
+
+       zend_hash_internal_pointer_reset_ex(&pdo_driver_hash, &pos);
+       while (SUCCESS == zend_hash_get_current_data_ex(&pdo_driver_hash, (void**)&pdriver, &pos)) {
+               add_next_index_stringl(return_value, (char*)(*pdriver)->driver_name, (*pdriver)->driver_name_len, 1);
+               zend_hash_move_forward_ex(&pdo_driver_hash, &pos);
+       }
+}
+/* }}} */
+
 
 function_entry pdo_dbh_functions[] = {
        PHP_ME_MAPPING(__construct, dbh_constructor,    NULL)
@@ -993,6 +1010,7 @@ function_entry pdo_dbh_functions[] = {
        PHP_ME(PDO, quote,                      NULL,                                   ZEND_ACC_PUBLIC)
        PHP_ME(PDO, __wakeup,           NULL,                                   ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
        PHP_ME(PDO, __sleep,            NULL,                                   ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+       PHP_ME(PDO, getAvailableDrivers, NULL,                          ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
        {NULL, NULL, NULL}
 };