Merge pull request #41 from 0x46616c6b/guzzle-improve-requests

Improvement: allow to send not only get requests

Author: Thinkscape

README.md

@@ -448,6 +448,17 @@ $checkPageContent = new GuzzleHttpService(
     200,
     '<title>Hello World</title>'
 );
+
+// Check that the post request returns the content
+$checkPageContent = new GuzzleHttpService(
+    'www.example.com/user/update',
+    array(),
+    array(),
+    200,
+    '{"status":"success"}',
+    'POST',
+    array("post_field" => "post_value")
+);
 ````
 
 ### Memcache

src/ZendDiagnostics/Check/GuzzleHttpService.php

@@ -13,6 +13,8 @@
 class GuzzleHttpService extends AbstractCheck
 {
     protected $url;
+    protected $method;
+    protected $body;
     protected $headers;
     protected $statusCode;
     protected $content;
@@ -25,14 +27,18 @@ class GuzzleHttpService extends AbstractCheck
      * @param int             $statusCode The response status code to check
      * @param null            $content    The response content to check
      * @param ClientInterface $guzzle     Instance of guzzle to use
+     * @param string          $method     The method of the request
+     * @param mixed           $body       The body of the request (used for POST, PUT and DELETE requests)
      */
-    public function __construct($url, array $headers = array(), array $options = array(), $statusCode = 200, $content = null, ClientInterface $guzzle = null)
+    public function __construct($url, array $headers = array(), array $options = array(), $statusCode = 200, $content = null, ClientInterface $guzzle = null, $method = 'GET', $body = null)
     {
         $this->url = $url;
         $this->headers = $headers;
         $this->options = $options;
         $this->statusCode = $statusCode;
         $this->content = $content;
+        $this->method = $method;
+        $this->body = $body;
 
         if (!$guzzle) {
             $guzzle = new Client();
@@ -46,7 +52,7 @@ public function __construct($url, array $headers = array(), array $options = arr
      */
     public function check()
     {
-        $response = $this->guzzle->get($this->url, $this->headers, $this->options)->send();
+        $response = $this->guzzle->createRequest($this->method, $this->url, $this->headers, $this->body, $this->options)->send();
 
         if ($this->statusCode !== $statusCode = $response->getStatusCode()) {
             return new Failure("Status code {$this->statusCode} does not match {$statusCode} in response from {$this->url}");

tests/ZendDiagnosticsTest/GuzzleHttpServiceTest.php

@@ -12,15 +12,17 @@ class GuzzleHttpServiceTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider checkProvider
      */
-    public function testCheck($content, $actualContent, $actualStatusCode, $resultClass)
+    public function testCheck($content, $actualContent, $actualStatusCode, $resultClass, $method = 'GET', $body = null)
     {
         $check = new GuzzleHttpService(
             'http://www.example.com/foobar',
             array(),
             array(),
             200,
             $content,
-            $this->getMockClient($actualStatusCode, $actualContent)
+            $this->getMockClient($actualStatusCode, $actualContent),
+            $method,
+            $body
         );
         $result = $check->check();
 
@@ -31,9 +33,17 @@ public function checkProvider()
     {
         return array(
             array(null, null, 200, 'ZendDiagnostics\Result\SuccessInterface'),
+            array(null, null, 200, 'ZendDiagnostics\Result\SuccessInterface', 'POST', array('key' => 'value')),
+            array(null, null, 200, 'ZendDiagnostics\Result\SuccessInterface', 'PUT'),
             array(null, null, 404, 'ZendDiagnostics\Result\FailureInterface'),
+            array(null, null, 404, 'ZendDiagnostics\Result\FailureInterface', 'POST', array('key' => 'value')),
+            array(null, null, 404, 'ZendDiagnostics\Result\FailureInterface', 'PUT'),
             array('foo', 'foobar', 200, 'ZendDiagnostics\Result\SuccessInterface'),
-            array('baz', 'foobar', 200, 'ZendDiagnostics\Result\FailureInterface')
+            array('foo', 'foobar', 200, 'ZendDiagnostics\Result\SuccessInterface', 'POST', array('key' => 'value')),
+            array('foo', 'foobar', 200, 'ZendDiagnostics\Result\SuccessInterface', 'PUT'),
+            array('baz', 'foobar', 200, 'ZendDiagnostics\Result\FailureInterface'),
+            array('baz', 'foobar', 200, 'ZendDiagnostics\Result\FailureInterface', 'POST', array('key' => 'value')),
+            array('baz', 'foobar', 200, 'ZendDiagnostics\Result\FailureInterface', 'PUT'),
         );
     }