Handle all Guzzle exceptions and provide a message for them

Signed-off-by: Yoshi2889 <[email protected]>

Author: NanoSector

src/LinkSniffer.php

@@ -20,7 +20,7 @@
 
 namespace WildPHP\Modules\LinkSniffer;
 
-use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\GuzzleException;
 use WildPHP\API\ShortenUri;
 use WildPHP\BaseModule;
 use WildPHP\CoreModules\Connection\IrcDataObject;
@@ -64,10 +64,8 @@ public function sniffLinks(IrcDataObject $message)
 		{
 			try
 			{
-				$content_type = SnifferHelper::getContentTypeFromUri($uri);
-
 				$shortUri = $this->createShortUri($uri);
-
+				$content_type = SnifferHelper::getContentTypeFromUri($uri);
 				$title = '(not a web page, content type: ' . $content_type . ')';
 
 				if ($content_type == 'text/html')
@@ -84,10 +82,10 @@ public function sniffLinks(IrcDataObject $message)
 				return;
 			}
 
-			// ClientExceptions can be thrown by Guzzle. If one occurs, just give up.
-			catch (ClientException $e)
+			// Guzzle exceptions (such as connection timeouts) should be ignored.
+			catch (GuzzleException $e)
 			{
-				return;
+				$title = '(link was unresponsive: ' . $uri . ')';
 			}
 
 			if (!empty($title) && !empty($shortUri))

tests/CacheTest.php

@@ -31,13 +31,13 @@ public function testAddEntry()
 		$uriCache = new UriCache();
 
 		$uriCache->addCacheItem('googleUri', 'Google');
+
 		$checkObject = new CacheItem();
 		$checkObject->setTitle('Google');
-		$checkObject->setExpireTime(time() + 60 * 60);
 
 		$retrieved = $uriCache->getCacheItem('googleUri');
 
-		$this->assertEquals($checkObject, $retrieved);
+		$this->assertSame($checkObject, $retrieved);
 	}
 
 	public function testRemoveItem()