lingering TSRM macros

[m6w6/ext-http] / tests / helper / dump.inc

diff --git a/tests/helper/dump.inc b/tests/helper/dump.inc
index 5f5f367235a5956ca3b5ca658280c309ec477db4..452a715e2dfa51042ba9c9ee0a7c9797f862180d 100644 (file)
--- a/tests/helper/dump.inc
+++ b/tests/helper/dump.inc
@@ -1,16 +1,22 @@
 <?php
 
-function dump_message($stream, http\Message $msg, $parent = false) {
+function dump_headers($stream, array $headers) {
        if (!is_resource($stream)) {
                $stream = fopen("php://output", "w");
        }
-       fprintf($stream, "%s\n", $msg->getInfo());
-       $headers = $msg->getHeaders();
        ksort($headers);
        foreach ($headers as $key => $val) {
                fprintf($stream, "%s: %s\n", $key, $val);
        }
        fprintf($stream, "\n");
+}
+
+function dump_message($stream, http\Message $msg, $parent = false) {
+       if (!is_resource($stream)) {
+               $stream = fopen("php://output", "w");
+       }
+       fprintf($stream, "%s\n", $msg->getInfo());
+       dump_headers($stream, $msg->getHeaders());
        $msg->getBody()->toStream($stream);
        
        if ($parent && ($msg = $msg->getParentMessage())) {