Update tests to remove the rest of the iam-portal dependencies. Add the guzzlehttp library to require-dev. SnsException no longer extends IamPortal exceptions.

Author: wardtd

composer.json

@@ -11,7 +11,8 @@
     },
     "require-dev" : {
         "phpunit/phpunit": "^9.5",
-        "roave/security-advisories": "dev-latest"
+        "roave/security-advisories": "dev-latest",
+        "guzzlehttp/guzzle": "^7.2"
     },
     "autoload-dev": {
         "psr-4": {

composer.lock

@@ -3,6 +3,6 @@
 
 namespace MiamiOH\SnsHandler;
 
-class SnsException extends \MiamiOH\IamPortal\IamPortalException
+class SnsException extends \Exception
 {
 }

src/SnsException.php

@@ -10,8 +10,6 @@
 use MiamiOH\SnsHandler\SnsMessage;
 use MiamiOH\SnsHandler\SnsTopicMapper;
 use MiamiOH\SnsHandler\SnsUnknownTopicArnException;
-use MiamiOH\IamPortal\Util\HttpClient;
-use MiamiOH\IamPortal\Util\HttpResponse;
 use PHPUnit\Framework\MockObject\MockObject;
 use Tests\MiamiOH\SnsHandler\MakesSnsTests;
 use Tests\MiamiOH\SnsHandler\TestCase;
@@ -30,8 +28,7 @@ class SnsBrokerTest extends TestCase
     private $topicMapper;
     /** @var MessageValidator|MockObject  */
     private $validator;
-    /** @var HttpClient|MockObject  */
-    private $httpClient;
+
 
     public function setUp(): void
     {
@@ -44,7 +41,6 @@ public function setUp(): void
         );
 
         $this->validator = $this->createMock(MessageValidator::class);
-//        $this->httpClient = $this->createMock(HttpClient::class);
 
         $this->broker = new SnsBroker($this->topicMapper, $this->validator);
     }
@@ -92,11 +88,8 @@ public function testConfirmsSubscriptionUsingSubscribeUrl(): void
                 'Type' => SnsMessage::SUBSCRIBE_TYPE,
                 'SubscribeURL' => 'https://aws.amazon.com/subscribe/123',
             ]));
-        Http::fake();
-//        Http::fake(['https://aws.amazon.com/subscribe/123' => Http::response([], 200)]);
-//        $this->httpClient->expects($this->once())->method('get')
-//            ->with($this->equalTo('https://aws.amazon.com/subscribe/123'))
-//            ->willReturn($this->makeHttpResponseMock());
+
+        Http::fake(['https://aws.amazon.com/subscribe/123' => Http::response([], 200,[])]);
 
         $this->broker->handleRequest($request);
     }
@@ -109,12 +102,10 @@ public function testThrowsExceptionIfConfirmSubscriptionFails(): void
                 'Type' => SnsMessage::SUBSCRIBE_TYPE,
                 'SubscribeURL' => 'https://aws.amazon.com/subscribe/123',
             ]));
-
-        $response = $this->makeHttpResponseMock(404);
-
-        $this->httpClient->expects($this->once())->method('get')
-            ->with($this->equalTo('https://aws.amazon.com/subscribe/123'))
-            ->willReturn($response);
+        
+        Http::fake([
+            'https://aws.amazon.com/subscribe/123' => Http::response([], 404, [])
+        ]);
 
         $this->expectException(SnsConfirmSubscriptionException::class);
         $this->expectExceptionMessage('Subscription confirmation for arn:aws:sns:us-west-2:123456789012:MyTopic failed with status 404');
@@ -150,12 +141,4 @@ public function testValidatesSnsMessage(): void
         $this->broker->handleRequest($request);
     }
 
-    private function makeHttpResponseMock(int $status = 200): HttpResponse
-    {
-        $response = $this->createMock(HttpResponse::class);
-        $response->method('status')->willReturn($status);
-        $response->method('successful')->willReturn($status >= 200 && $status < 400);
-
-        return $response;
-    }
 }