From 4743c5114bcdcf8d478e140beb63fecfeccd01a4 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 27 Jul 2011 14:37:46 +0000 Subject: [PATCH] remove FluentlyCallable interface --- config9.m4 | 2 -- php_http.c | 1 - php_http.h | 1 - php_http_cookie.c | 1 - php_http_message.c | 2 +- php_http_querystring.c | 2 +- php_http_request.c | 2 +- php_http_request_pool.c | 2 +- 8 files changed, 4 insertions(+), 9 deletions(-) diff --git a/config9.m4 b/config9.m4 index a6155d7..f9f3a47 100644 --- a/config9.m4 +++ b/config9.m4 @@ -434,7 +434,6 @@ dnl ---- php_http_etag.c \ php_http_exception.c \ php_http_filter.c \ - php_http_fluently_callable.c \ php_http_headers.c \ php_http_header_parser.c \ php_http_info.c \ @@ -478,7 +477,6 @@ dnl ---- php_http_etag.h \ php_http_exception.h \ php_http_filter.h \ - php_http_fluently_callable.h \ php_http_headers.h \ php_http_header_parser.h \ php_http_info.h \ diff --git a/php_http.c b/php_http.c index 0b47165..fb49548 100644 --- a/php_http.c +++ b/php_http.c @@ -135,7 +135,6 @@ PHP_MINIT_FUNCTION(http) REGISTER_INI_ENTRIES(); if (0 - || SUCCESS != PHP_MINIT_CALL(http_fluently_callable) || SUCCESS != PHP_MINIT_CALL(http_object) || SUCCESS != PHP_MINIT_CALL(http_exception) || SUCCESS != PHP_MINIT_CALL(http_persistent_handle) diff --git a/php_http.h b/php_http.h index 7c966fc..4d2b929 100644 --- a/php_http.h +++ b/php_http.h @@ -90,7 +90,6 @@ extern void _dpf(int type, const char *data, size_t length); #include "php_http_env_response.h" #include "php_http_etag.h" #include "php_http_exception.h" -#include "php_http_fluently_callable.h" #include "php_http_filter.h" #include "php_http_headers.h" #include "php_http_info.h" diff --git a/php_http_cookie.c b/php_http_cookie.c index cf5e56c..35b3728 100644 --- a/php_http_cookie.c +++ b/php_http_cookie.c @@ -933,7 +933,6 @@ PHP_METHOD(HttpCookie, toArray) PHP_MINIT_FUNCTION(http_cookie) { PHP_HTTP_REGISTER_CLASS(http, Cookie, http_cookie, php_http_object_class_entry, 0); - zend_class_implements(php_http_cookie_class_entry TSRMLS_CC, 1, php_http_fluently_callable_class_entry); php_http_cookie_class_entry->create_object = php_http_cookie_object_new; memcpy(&php_http_cookie_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_cookie_object_handlers.clone_obj = php_http_cookie_object_clone; diff --git a/php_http_message.c b/php_http_message.c index ad08d7f..0d11d01 100644 --- a/php_http_message.c +++ b/php_http_message.c @@ -948,7 +948,7 @@ PHP_MINIT_FUNCTION(http_message) php_http_message_object_handlers.get_properties = php_http_message_object_get_props; php_http_message_object_handlers.get_property_ptr_ptr = php_http_message_object_get_prop_ptr; - zend_class_implements(php_http_message_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator, php_http_fluently_callable_class_entry); + zend_class_implements(php_http_message_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator); zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1); zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED TSRMLS_CC); diff --git a/php_http_querystring.c b/php_http_querystring.c index 5f67482..ab2bc3d 100644 --- a/php_http_querystring.c +++ b/php_http_querystring.c @@ -302,7 +302,7 @@ PHP_MINIT_FUNCTION(http_querystring) { PHP_HTTP_REGISTER_CLASS(http, QueryString, http_querystring, php_http_object_class_entry, 0); - zend_class_implements(php_http_querystring_class_entry TSRMLS_CC, 4, php_http_fluently_callable_class_entry, zend_ce_serializable, zend_ce_arrayaccess, zend_ce_aggregate); + zend_class_implements(php_http_querystring_class_entry TSRMLS_CC, 3, zend_ce_serializable, zend_ce_arrayaccess, zend_ce_aggregate); zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("instance"), (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("queryArray"), ZEND_ACC_PRIVATE TSRMLS_CC); diff --git a/php_http_request.c b/php_http_request.c index 56d6033..d3ac782 100644 --- a/php_http_request.c +++ b/php_http_request.c @@ -1289,7 +1289,7 @@ PHP_MINIT_FUNCTION(http_request) memcpy(&php_http_request_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_request_object_handlers.clone_obj = php_http_request_object_clone; - zend_class_implements(php_http_request_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, php_http_fluently_callable_class_entry); + zend_class_implements(php_http_request_class_entry TSRMLS_CC, 1, spl_ce_SplSubject); zend_declare_property_null(php_http_request_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE TSRMLS_CC); zend_declare_property_null(php_http_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PRIVATE TSRMLS_CC); diff --git a/php_http_request_pool.c b/php_http_request_pool.c index 7e3e1b8..e06bcb0 100644 --- a/php_http_request_pool.c +++ b/php_http_request_pool.c @@ -559,7 +559,7 @@ PHP_MINIT_FUNCTION(http_request_pool) memcpy(&php_http_request_pool_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_request_pool_object_handlers.clone_obj = NULL; - zend_class_implements(php_http_request_pool_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_iterator, php_http_fluently_callable_class_entry); + zend_class_implements(php_http_request_pool_class_entry TSRMLS_CC, 2, spl_ce_Countable, zend_ce_iterator); return SUCCESS; } -- 2.30.2