From 4dbefb29681261766defa925b6bc89ce60d388b1 Mon Sep 17 00:00:00 2001 From: dreamsxin Date: Tue, 17 Sep 2013 16:01:57 +0800 Subject: [PATCH] Fix #1238 implement: Phalcon\Logger\Adapter::isTransaction() --- ext/logger/adapter.c | 10 ++++++++++ ext/logger/adapter.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/ext/logger/adapter.c b/ext/logger/adapter.c index 83b3f258d5a..74c50f5cb8b 100644 --- a/ext/logger/adapter.c +++ b/ext/logger/adapter.c @@ -112,6 +112,16 @@ PHP_METHOD(Phalcon_Logger_Adapter, setFormatter){ RETURN_THISW(); } +/** + * Returns the current transaction + * + * @return Phalcon\Logger\Adapter + */ +PHP_METHOD(Phalcon_Logger_Adapter, isTransaction){ + + RETURN_MEMBER(this_ptr, "_transaction"); +} + /** * Starts a transaction * diff --git a/ext/logger/adapter.h b/ext/logger/adapter.h index 80957ec6e20..180c22a4e43 100644 --- a/ext/logger/adapter.h +++ b/ext/logger/adapter.h @@ -24,6 +24,7 @@ PHALCON_INIT_CLASS(Phalcon_Logger_Adapter); PHP_METHOD(Phalcon_Logger_Adapter, setLogLevel); PHP_METHOD(Phalcon_Logger_Adapter, getLogLevel); PHP_METHOD(Phalcon_Logger_Adapter, setFormatter); +PHP_METHOD(Phalcon_Logger_Adapter, isTransaction); PHP_METHOD(Phalcon_Logger_Adapter, begin); PHP_METHOD(Phalcon_Logger_Adapter, commit); PHP_METHOD(Phalcon_Logger_Adapter, rollback); @@ -81,6 +82,7 @@ PHALCON_INIT_FUNCS(phalcon_logger_adapter_method_entry){ PHP_ME(Phalcon_Logger_Adapter, setLogLevel, arginfo_phalcon_logger_adapter_setloglevel, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Adapter, getLogLevel, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Adapter, setFormatter, arginfo_phalcon_logger_adapter_setformatter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Adapter, isTransaction, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Adapter, begin, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Adapter, commit, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Adapter, rollback, NULL, ZEND_ACC_PUBLIC)