add current state of refactoring

[m6w6/ext-http] / php_http_object.c

diff --git a/php_http_object.c b/php_http_object.c
index 13252e681d4b327512269d1ec8d0e0c5cc1dfd92..602ebaa9324fbb195a1fdaa7233f91f9bc6c2906 100644 (file)
--- a/php_http_object.c
+++ b/php_http_object.c
@@ -6,14 +6,11 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_api.c 300299 2010-06-09 06:23:16Z mike $ */
-
-
-#include "php_http.h"
+#include "php_http_api.h"
 
 STATUS php_http_new(zend_object_value *ov, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC)
 {
@@ -54,11 +51,6 @@ PHP_HTTP_API zend_error_handling_t php_http_object_get_error_handling(zval *obje
 #define PHP_HTTP_EMPTY_ARGS(method)                                            PHP_HTTP_EMPTY_ARGS_EX(HttpObject, method, 0)
 #define PHP_HTTP_OBJECT_ME(method, visibility)                 PHP_ME(HttpObject, method, PHP_HTTP_ARGS(HttpObject, method), visibility)
 
-PHP_HTTP_BEGIN_ARGS(factory, 1)
-       PHP_HTTP_ARG_VAL(class_name, 0)
-       PHP_HTTP_ARG_VAL(ctor_args, 0)
-PHP_HTTP_END_ARGS;
-
 PHP_HTTP_BEGIN_ARGS(setErrorHandling, 1)
        PHP_HTTP_ARG_VAL(eh, 0)
 PHP_HTTP_END_ARGS;
@@ -71,15 +63,20 @@ PHP_HTTP_END_ARGS;
 
 PHP_HTTP_EMPTY_ARGS(getDefaultErrorHandling);
 
+PHP_HTTP_BEGIN_ARGS(triggerError, 3)
+       PHP_HTTP_ARG_VAL(error_type, 0)
+       PHP_HTTP_ARG_VAL(error_code, 0)
+       PHP_HTTP_ARG_VAL(error_message, 0)
+PHP_HTTP_END_ARGS;
+
 zend_class_entry *php_http_object_class_entry;
 zend_function_entry php_http_object_method_entry[] = {
-       PHP_HTTP_OBJECT_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-
        PHP_HTTP_OBJECT_ME(setErrorHandling, ZEND_ACC_PUBLIC)
        PHP_HTTP_OBJECT_ME(getErrorHandling, ZEND_ACC_PUBLIC)
        PHP_HTTP_OBJECT_ME(setDefaultErrorHandling, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
        PHP_HTTP_OBJECT_ME(getDefaultErrorHandling, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-       
+       PHP_HTTP_OBJECT_ME(triggerError, ZEND_ACC_PUBLIC)
+
        EMPTY_FUNCTION_ENTRY
 };
 
@@ -107,33 +104,6 @@ zend_object_value php_http_object_new_ex(zend_class_entry *ce, void *nothing, ph
        return ov;
 }
 
-PHP_METHOD(HttpObject, factory)
-{
-       zval *ctor_args = NULL;
-       zend_class_entry *class_entry = NULL;
-       zval *object_ctor;
-       zend_fcall_info fci;
-       zend_fcall_info_cache fcc;
-
-       with_error_handling(EH_THROW, php_http_exception_class_entry) {
-               if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "C|a/!", &class_entry, &ctor_args)) {
-                       object_init_ex(return_value, class_entry);
-
-                       MAKE_STD_ZVAL(object_ctor);
-                       array_init(object_ctor);
-
-                       Z_ADDREF_P(return_value);
-                       add_next_index_zval(object_ctor, return_value);
-                       add_next_index_stringl(object_ctor, ZEND_STRL("__construct"), 1);
-
-                       zend_fcall_info_init(object_ctor, 0, &fci, &fcc, NULL, NULL TSRMLS_CC);
-                       zend_fcall_info_call(&fci, &fcc, NULL, ctor_args TSRMLS_CC);
-
-                       zval_ptr_dtor(&object_ctor);
-               }
-       } end_error_handling();
-}
-
 PHP_METHOD(HttpObject, getErrorHandling)
 {
        RETURN_PROP(php_http_object_class_entry, "errorHandling");
@@ -153,6 +123,7 @@ PHP_METHOD(HttpObject, setErrorHandling)
 
                        default:
                                php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "unknown error handling code (%ld)", eh);
+                               break;
                }
        }
 
@@ -178,10 +149,22 @@ PHP_METHOD(HttpObject, setDefaultErrorHandling)
 
                        default:
                                php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "unknown error handling code (%ld)", eh);
+                               break;
                }
        }
 }
 
+PHP_METHOD(HttpObject, triggerError)
+{
+       long eh, code;
+       char *msg_str;
+       int msg_len;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls", &eh, &code, &msg_str, &msg_len)) {
+               php_http_error(eh TSRMLS_CC, code, "%.*s", msg_len, msg_str);
+       }
+}
+
 PHP_MINIT_FUNCTION(http_object)
 {
        PHP_HTTP_REGISTER_CLASS(http, Object, http_object, NULL, ZEND_ACC_ABSTRACT);