Merge branch 'merge-DEV_2'

[m6w6/ext-http] / tests / message002.phpt

diff --git a/tests/message002.phpt b/tests/message002.phpt
index 810c1e8e09a3100bba4b9e97ddd1a02e4e2b595f..403fb262e7bf8add86d6f6105208b13359f5e7c1 100644 (file)
--- a/tests/message002.phpt
+++ b/tests/message002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-env request Message
+env request message
 --SKIPIF--
 <?php include "skipif.inc"; ?>
 --POST_RAW--
@@ -9,8 +9,10 @@ b=c
 HTTP_X_TEST=test
 --COOKIE--
 foo=bar
+--INI--
+always_populate_raw_post_data=-1
 --FILE--
-<?
+<?php
 echo "Test\n";
 
 use http\env\Request as HttpEnvRequest;
@@ -18,22 +20,24 @@ use http\env\Request as HttpEnvRequest;
 $m = new HttpEnvRequest();
 
 var_dump($m);
+
+echo "Message->toString\n";
 echo $m,"\n";
 
+echo "Body->toString\n";
 var_dump((string)$m->getBody());
 
-echo "Done\n";
+echo "stream\n";
+var_dump(file_get_contents("php://input"));
+?>
+Done
 --EXPECTF--
 Test
-object(%s)#%d (13) {
-  ["errorHandling":protected]=>
-  NULL
+object(%s)#%d (12) {
   ["type":protected]=>
   int(1)
   ["body":protected]=>
-  object(%s)#%d (1) {
-    ["errorHandling":protected]=>
-    NULL
+  object(http\Message\Body)#%d (0) {
   }
   ["requestMethod":protected]=>
   string(4) "POST"
@@ -59,17 +63,13 @@ object(%s)#%d (13) {
   ["parentMessage":protected]=>
   NULL
   ["query":protected]=>
-  object(http\QueryString)#2 (2) {
-    ["errorHandling":protected]=>
-    NULL
+  object(http\QueryString)#2 (1) {
     ["queryArray":"http\QueryString":private]=>
     array(0) {
     }
   }
   ["form":protected]=>
-  object(http\QueryString)#3 (2) {
-    ["errorHandling":protected]=>
-    NULL
+  object(http\QueryString)#3 (1) {
     ["queryArray":"http\QueryString":private]=>
     array(0) {
     }
@@ -78,6 +78,7 @@ object(%s)#%d (13) {
   array(0) {
   }
 }
+Message->toString
 POST / HTTP/1.1%a
 X-Test: test%a
 Content-Length: 3%a
@@ -85,5 +86,8 @@ Content-Type: test/something%a
 Cookie: foo=bar%a
 %a
 b=c
+Body->toString
+string(3) "b=c"
+stream
 string(3) "b=c"
 Done