Improve the way test suite reports error messages at DEBUG=1

[plcapi.git] / src / Client.php

diff --git a/src/Client.php b/src/Client.php
index d71ef27..214d970 100644 (file)
--- a/src/Client.php
+++ b/src/Client.php
@@ -363,7 +363,7 @@ class Client
         }
 
         // where req is a Request
-        $req->debug = $this->debug;
+        $req->setDebug($this->debug);
 
         if ($method == 'https') {
             $r = $this->sendPayloadHTTPS(
@@ -553,7 +553,7 @@ class Client
             $payload;
 
         if ($this->debug > 1) {
-            Logger::debugMessage("---SENDING---\n$op\n---END---");
+            Logger::instance()->debugMessage("---SENDING---\n$op\n---END---");
         }
 
         if ($timeout > 0) {
@@ -709,7 +709,7 @@ class Client
         }
 
         if ($this->debug > 1) {
-            Logger::debugMessage("---SENDING---\n$payload\n---END---");
+            Logger::instance()->debugMessage("---SENDING---\n$payload\n---END---");
         }
 
         if (!$keepAlive || !$this->xmlrpc_curl_handle) {
@@ -722,10 +722,11 @@ class Client
         }
 
         // results into variable
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
-        if ($this->debug) {
-            curl_setopt($curl, CURLOPT_VERBOSE, 1);
+        if ($this->debug > 1) {
+            curl_setopt($curl, CURLOPT_VERBOSE, true);
+            /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered
         }
         curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
         // required for XMLRPC: post the data
@@ -848,7 +849,7 @@ class Client
                 $message .= $name . ': ' . $val . "\n";
             }
             $message .= "---END---";
-            Logger::debugMessage($message);
+            Logger::instance()->debugMessage($message);
         }
 
         if (!$result) {