Attempt to fix several failing unit tests

- Exception types vary between versions of the php ampq library.
- A bad conditional in guzzle3 logic may cause problems.

Author: weierophinney

src/Check/GuzzleHttpService.php

@@ -7,6 +7,7 @@
 
 namespace ZendDiagnostics\Check;
 
+use InvalidArgumentException;
 use Guzzle\Http\Client as Guzzle3Client;
 use Guzzle\Http\ClientInterface as Guzzle3ClientInterface;
 use GuzzleHttp\Client as Guzzle456Client;
@@ -58,7 +59,7 @@ public function __construct(
         }
 
         if ((! $guzzle instanceof Guzzle3ClientInterface) && (! $guzzle instanceof Guzzle456ClientInterface)) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'Parameter "guzzle" must be an instance of "\Guzzle\Http\ClientInterface"'
                 . ' or "\GuzzleHttp\ClientInterface"'
             );
@@ -84,15 +85,17 @@ public function check()
      */
     private function guzzle3Check()
     {
-        $response = $this->guzzle->createRequest(
-            $this->method,
-            $this->url,
-            $this->headers,
-            $this->body,
-            array_merge(['exceptions' => false], $this->options)
-        )->send();
-
-        if ($this->statusCode !== $statusCode = $response->getStatusCode()) {
+        $response = $this->guzzle
+            ->createRequest(
+                $this->method,
+                $this->url,
+                $this->headers,
+                $this->body,
+                array_merge(['exceptions' => false], $this->options)
+            )
+            ->send();
+
+        if ($this->statusCode !== ($statusCode = $response->getStatusCode())) {
             return $this->createStatusCodeFailure($statusCode);
         }
 

test/ChecksTest.php

@@ -66,7 +66,10 @@ public function testRabbitMQ()
         $this->assertInstanceOf(Success::class, $result);
 
         $check = new RabbitMQ('127.0.0.250', 9999);
-        $this->expectException(ErrorException::class);
+        // Exception type varies between different versions of php-amqplib;
+        // sometimes it is a descendent of ErrorException, sometimes
+        // RuntimeException. As such, catching any exception here.
+        $this->expectException(Exception::class);
         $check->check();
     }