diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-03-30 18:53:38 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-03-30 18:53:38 +0300 |
| commit | 1018f462d8bb0a12b238d9d11c141038beaf2a6c (patch) | |
| tree | 6466aa51c3924c5ed56741e02fa323fcb3e2ece4 /ext/com_dotnet | |
| parent | 9155a267adeeb6f442f97892de441e4b6666ce73 (diff) | |
| download | php-git-1018f462d8bb0a12b238d9d11c141038beaf2a6c.tar.gz | |
Patch improvement:
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
Diffstat (limited to 'ext/com_dotnet')
| -rw-r--r-- | ext/com_dotnet/com_com.c | 2 | ||||
| -rw-r--r-- | ext/com_dotnet/com_dotnet.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c index d61d933e7a..80ef70e7e0 100644 --- a/ext/com_dotnet/com_com.c +++ b/ext/com_dotnet/com_com.c @@ -66,7 +66,6 @@ PHP_FUNCTION(com_create_instance) &typelib_name, &typelib_name_len)) { php_com_throw_exception(E_INVALIDARG, "Could not create COM object - invalid arguments!"); - ZEND_CTOR_MAKE_NULL(); return; } @@ -230,7 +229,6 @@ PHP_FUNCTION(com_create_instance) php_com_throw_exception(res, msg); efree(msg); - ZEND_CTOR_MAKE_NULL(); return; } diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c index 974876a853..7e0124b062 100644 --- a/ext/com_dotnet/com_dotnet.c +++ b/ext/com_dotnet/com_dotnet.c @@ -208,7 +208,6 @@ PHP_FUNCTION(com_dotnet_create_instance) if (err) LocalFree(err); php_com_throw_exception(hr, buf); - ZEND_CTOR_MAKE_NULL(); return; } stuff = (struct dotnet_runtime_stuff*)COMG(dotnet_runtime_stuff); @@ -248,7 +247,6 @@ PHP_FUNCTION(com_dotnet_create_instance) &datatype_name, &datatype_name_len, &obj->code_page)) { php_com_throw_exception(E_INVALIDARG, "Could not create .Net object - invalid arguments!"); - ZEND_CTOR_MAKE_NULL(); return; } @@ -314,7 +312,6 @@ PHP_FUNCTION(com_dotnet_create_instance) LocalFree(err); } php_com_throw_exception(hr, buf); - ZEND_CTOR_MAKE_NULL(); return; } } |