removed awkward custom error handling and http\Object base class

[m6w6/ext-http] / php_http_exception.h

diff --git a/php_http_exception.h b/php_http_exception.h
index d7e5ee7b04ef6b400f462771b1fee8b185c3a568..82a4b55b36d17147c0963db9d0afc4adf4961d64 100644 (file)
--- a/php_http_exception.h
+++ b/php_http_exception.h
@@ -13,7 +13,33 @@
 #ifndef PHP_HTTP_EXCEPTION_H
 #define PHP_HTTP_EXCEPTION_H
 
-PHP_HTTP_API zend_class_entry *php_http_exception_class_entry;
+/* short hand for zend_throw_exception_ex */
+#define php_http_throw(e, fmt, ...) \
+       zend_throw_exception_ex(php_http_exception_ ##e## _class_entry, 0 TSRMLS_CC, fmt, __VA_ARGS__)
+
+/* wrap a call with replaced zend_error_handling */
+#define php_http_expect(test, e, fail) \
+       do { \
+               zend_error_handling __zeh; \
+               zend_replace_error_handling(EH_THROW, php_http_exception_ ##e## _class_entry, &__zeh TSRMLS_CC); \
+               if (!(test)) { \
+                       zend_restore_error_handling(&__zeh TSRMLS_CC); \
+                       fail; \
+               } \
+               zend_restore_error_handling(&__zeh TSRMLS_CC); \
+       } while(0)
+
+PHP_HTTP_API zend_class_entry *php_http_exception_interface_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_runtime_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_unexpected_val_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_bad_method_call_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_invalid_arg_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_bad_header_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_bad_url_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_bad_message_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_bad_conversion_class_entry;
+PHP_HTTP_API zend_class_entry *php_http_exception_bad_querystring_class_entry;
+
 PHP_MINIT_FUNCTION(http_exception);
 
 #endif