rename http\Env\Request::getPost() to getForm(), because it actually retrieves form...

diff --git a/package.xml b/package.xml
index 0f56341698eaf8e4119fb08f5b0bad7e6f49134f..1652fc2928f960e60eea4836228a69aefdbba8f9 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -29,7 +29,7 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
  </lead>
  <date>2012-03-16</date>
  <version>
  </lead>
  <date>2012-03-16</date>
  <version>

-  <release>2.0.0dev8</release>
+  <release>2.0.0dev</release>

   <api>2.0.0</api>
  </version>
  <stability>
   <api>2.0.0</api>
  </version>
  <stability>


@@ -125,6 +125,52 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
    <file role="src" name="php_http_version.c"/>
    <file role="src" name="php_http_version.h"/>
   </dir>
    <file role="src" name="php_http_version.c"/>
    <file role="src" name="php_http_version.h"/>
   </dir>

+  <dir name="tests">
+   <file role="test" name="skipif.inc"/>
+   <dir name="HttpRequestPool_cache" />
+   <dir name="data">
+    <file role="test" name="message_r_multipart_put.txt"/>
+    <file role="test" name="message_rr_empty.txt"/>
+    <file role="test" name="message_rr_empty_chunked.txt"/>
+    <file role="test" name="message_rr_empty_gzip.txt"/>
+    <file role="test" name="message_rr_helloworld_chunked.txt"/>
+    <file role="test" name="urls.txt"/>
+   </dir>
+   <file role="test" name="envrequestbody001.phpt"/>
+   <file role="test" name="envrequestheader001.phpt"/>
+   <file role="test" name="envresponseheader001.phpt"/>
+   <file role="test" name="envresponseranges001.phpt"/>
+   <file role="test" name="etag001.phpt"/>
+   <file role="test" name="factory.phpt"/>
+   <file role="test" name="filterchunked.phpt"/>
+   <file role="test" name="filterzlib.phpt"/>
+   <file role="test" name="info_001.phpt"/>
+   <file role="test" name="message001.phpt"/>
+   <file role="test" name="message002.phpt"/>
+   <file role="test" name="message003.phpt"/>
+   <file role="test" name="negotiate001.phpt"/>
+   <file role="test" name="params001.phpt"/>
+   <file role="test" name="persistenthandles001.phpt"/>
+   <file role="test" name="phpunit.phpt"/>
+   <file role="test" name="propertyproxy001.phpt"/>
+   <file role="test" name="querystring_001.phpt"/>
+   <file role="test" name="requestpool001.phpt"/>
+   <file role="test" name="response001.phpt"/>
+   <file role="test" name="response002.phpt"/>
+   <file role="test" name="response003.phpt"/>
+   <file role="test" name="url001.phpt"/>
+  </dir>
+  <dir name="phpunit">
+   <file role="test" name="CookieTest.php"/>
+   <file role="test" name="EncodingTest.php"/>
+   <file role="test" name="HeaderTest.php"/>
+   <file role="test" name="MessageBodyTest.php"/>
+   <file role="test" name="ObjectTest.php"/>
+   <file role="test" name="ParamsTest.php"/>
+   <file role="test" name="QueryStringTest.php"/>
+   <file role="test" name="RequestTest.php"/>
+   <file role="test" name="UrlTest.php"/>
+  </dir>

  </contents>
  <dependencies>
   <required>
  </contents>
  <dependencies>
   <required>

diff --git a/php_http.h b/php_http.h
index 36dae96947ecbb28c9d5a0d0b4aa3e01de11c6da..e8d5e40fb235e02458a16553125ceaf165626e96 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 

-#define PHP_HTTP_EXT_VERSION "2.0.0dev8"
+#define PHP_HTTP_EXT_VERSION "2.0.0dev"

 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry

diff --git a/php_http_env_request.c b/php_http_env_request.c
index 4313370cf4e1fa64a512e039c1a41a148f57c0c7..cd9dae08d35e182c0db851ae4c569f4c03b332fb 100644 (file)
--- a/php_http_env_request.c
+++ b/php_http_env_request.c
@@ -22,13 +22,13 @@ zend_class_entry *php_http_env_request_class_entry;
 #define PHP_HTTP_ENV_REQUEST_ME(method, visibility)    PHP_ME(HttpEnvRequest, method, PHP_HTTP_ARGS(HttpEnvRequest, method), visibility)
 
 PHP_HTTP_EMPTY_ARGS(__construct);
 #define PHP_HTTP_ENV_REQUEST_ME(method, visibility)    PHP_ME(HttpEnvRequest, method, PHP_HTTP_ARGS(HttpEnvRequest, method), visibility)
 
 PHP_HTTP_EMPTY_ARGS(__construct);

-PHP_HTTP_EMPTY_ARGS(getPost);
+PHP_HTTP_EMPTY_ARGS(getForm);

 PHP_HTTP_EMPTY_ARGS(getQuery);
 PHP_HTTP_EMPTY_ARGS(getFiles);
 
 zend_function_entry php_http_env_request_method_entry[] = {
        PHP_HTTP_ENV_REQUEST_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 PHP_HTTP_EMPTY_ARGS(getQuery);
 PHP_HTTP_EMPTY_ARGS(getFiles);
 
 zend_function_entry php_http_env_request_method_entry[] = {
        PHP_HTTP_ENV_REQUEST_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)

-       PHP_HTTP_ENV_REQUEST_ME(getPost, ZEND_ACC_PUBLIC)
+       PHP_HTTP_ENV_REQUEST_ME(getForm, ZEND_ACC_PUBLIC)

        PHP_HTTP_ENV_REQUEST_ME(getQuery, ZEND_ACC_PUBLIC)
        PHP_HTTP_ENV_REQUEST_ME(getFiles, ZEND_ACC_PUBLIC)
 
        PHP_HTTP_ENV_REQUEST_ME(getQuery, ZEND_ACC_PUBLIC)
        PHP_HTTP_ENV_REQUEST_ME(getFiles, ZEND_ACC_PUBLIC)
 


@@ -142,7 +142,7 @@ PHP_METHOD(HttpEnvRequest, __construct)
                                MAKE_STD_ZVAL(zpost);
                                object_init_ex(zpost, php_http_querystring_class_entry);
                                if (SUCCESS == php_http_querystring_ctor(zpost, zsg TSRMLS_CC)) {
                                MAKE_STD_ZVAL(zpost);
                                object_init_ex(zpost, php_http_querystring_class_entry);
                                if (SUCCESS == php_http_querystring_ctor(zpost, zsg TSRMLS_CC)) {

-                                       zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("post"), zpost TSRMLS_CC);
+                                       zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), zpost TSRMLS_CC);

                                }
                                zval_ptr_dtor(&zpost);
                        }
                                }
                                zval_ptr_dtor(&zpost);
                        }


@@ -160,10 +160,10 @@ PHP_METHOD(HttpEnvRequest, __construct)
        } end_error_handling();
 }
 
        } end_error_handling();
 }
 

-PHP_METHOD(HttpEnvRequest, getPost)
+PHP_METHOD(HttpEnvRequest, getForm)

 {
        if (SUCCESS == zend_parse_parameters_none()) {
 {
        if (SUCCESS == zend_parse_parameters_none()) {

-               RETURN_PROP(php_http_env_request_class_entry, "post");
+               RETURN_PROP(php_http_env_request_class_entry, "form");

        }
 }
 
        }
 }
 


@@ -186,7 +186,7 @@ PHP_MINIT_FUNCTION(http_env_request)
 {
        PHP_HTTP_REGISTER_CLASS(http\\Env, Request, http_env_request, php_http_message_class_entry, 0);
        zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("query"), ZEND_ACC_PROTECTED TSRMLS_CC);
 {
        PHP_HTTP_REGISTER_CLASS(http\\Env, Request, http_env_request, php_http_message_class_entry, 0);
        zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("query"), ZEND_ACC_PROTECTED TSRMLS_CC);

-       zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("post"), ZEND_ACC_PROTECTED TSRMLS_CC);
+       zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("form"), ZEND_ACC_PROTECTED TSRMLS_CC);

        zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("files"), ZEND_ACC_PROTECTED TSRMLS_CC);
 
        return SUCCESS;
        zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("files"), ZEND_ACC_PROTECTED TSRMLS_CC);
 
        return SUCCESS;

diff --git a/php_http_env_request.h b/php_http_env_request.h
index 9a27f10202026821828e65e17bce7d9ddfd2dc72..cc596647145bb92f64d4a0688e4ed4db9ed2c474 100644 (file)
--- a/php_http_env_request.h
+++ b/php_http_env_request.h
@@ -17,7 +17,7 @@ extern zend_class_entry *php_http_env_request_class_entry;
 extern zend_function_entry php_http_env_request_method_entry[];
 
 PHP_METHOD(HttpEnvRequest, __construct);
 extern zend_function_entry php_http_env_request_method_entry[];
 
 PHP_METHOD(HttpEnvRequest, __construct);

-PHP_METHOD(HttpEnvRequest, getPost);
+PHP_METHOD(HttpEnvRequest, getForm);

 PHP_METHOD(HttpEnvRequest, getQuery);
 PHP_METHOD(HttpEnvRequest, getFiles);
 
 PHP_METHOD(HttpEnvRequest, getQuery);
 PHP_METHOD(HttpEnvRequest, getFiles);
 

diff --git a/tests/message002.phpt b/tests/message002.phpt
index dcaacf3d4b4d2e0f18917654d4215ab81e41f486..810c1e8e09a3100bba4b9e97ddd1a02e4e2b595f 100644 (file)
--- a/tests/message002.phpt
+++ b/tests/message002.phpt
@@ -66,7 +66,7 @@ object(%s)#%d (13) {
     array(0) {
     }
   }
     array(0) {
     }
   }

-  ["post":protected]=>
+  ["form":protected]=>

   object(http\QueryString)#3 (2) {
     ["errorHandling":protected]=>
     NULL
   object(http\QueryString)#3 (2) {
     ["errorHandling":protected]=>
     NULL