Merge pull request #9 from geekcom/develop

strict_types, new tests

Author: geekcom

CHANGELOG.md

@@ -4,6 +4,14 @@
 
 ## Unreleased
 
+- [#8] update CHANGELOG.md, Thanks to [@geekcom]
+
+<!-- dumped content end -->
+
+<!-- dumped content start -->
+
+## Unreleased
+
 - [#7] update tests, add minor corrections, general improvements, Thanks to [@geekcom]
 
 <!-- dumped content end -->
@@ -27,4 +35,5 @@
 [#2]: https://github.com/geekcom/felicio/pull/2
 [#1]: https://github.com/geekcom/felicio/pull/1
 [@geekcom]: https://github.com/geekcom
-[#7]: https://github.com/geekcom/felicio/pull/7
+[#7]: https://github.com/geekcom/felicio/pull/7
+[#8]: https://github.com/geekcom/felicio/pull/8

src/Contracts/FelicioContract.php

@@ -1,12 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Felicio\Contracts;
 
+use Aws\Result;
+
 interface FelicioContract
 {
-    public function sendMessage(array $params);
+    public function sendMessage(array $params): ?string;
 
-    public function receiveMessage(array $params);
+    public function receiveMessage(array $params): array;
 
-    public function deleteMessage(array $params);
+    public function deleteMessage(array $params): Result;
 }

src/Felicio.php

@@ -8,6 +8,7 @@
 use Aws\Sdk;
 use Aws\Exception\AwsException;
 use Aws\Credentials\Credentials;
+use Aws\Result;
 use Symfony\Component\Dotenv\Dotenv;
 
 final class Felicio implements FelicioContract
@@ -35,16 +36,16 @@ public function __construct($felicioDotFile)
         $this->felicioClient = $sdk->createSqs();
     }
 
-    public function sendMessage(array $params)
+    public function sendMessage(array $params): string
     {
         try {
-            return $this->felicioClient->sendMessage($params)->get('MessageId');
+            return (string)$this->felicioClient->sendMessage($params)->get('MessageId');
         } catch (AwsException $e) {
             throw new AwsException();
         }
     }
 
-    public function receiveMessage(array $params)
+    public function receiveMessage(array $params): array
     {
         try {
             return $this->felicioClient->receiveMessage($params)->get('Messages');
@@ -53,7 +54,7 @@ public function receiveMessage(array $params)
         }
     }
 
-    public function deleteMessage(array $params)
+    public function deleteMessage(array $params): Result
     {
         try {
             return $this->felicioClient->deleteMessage($params);
@@ -62,7 +63,7 @@ public function deleteMessage(array $params)
         }
     }
 
-    public function countMessages($queue)
+    public function countMessages($queue): int
     {
         $response = $this->felicioClient->getQueueAttributes(
             [

tests/FelicioTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Felicio\Test;
 
 use Felicio\Felicio;
@@ -16,7 +18,7 @@ public function setUp(): void
     }
 
     /** @test */
-    public function sendMessageWithoutRequiredParameters()
+    public function sendStandardMessageWithoutRequiredParameters(): void
     {
         $this->expectException(ArgumentCountError::class);
 
@@ -29,7 +31,7 @@ public function sendMessageWithoutRequiredParameters()
     }
 
     /** @test */
-    public function sendMessage()
+    public function sendStandardMessage(): void
     {
         $params = [
             'QueueUrl' => '',
@@ -39,6 +41,19 @@ public function sendMessage()
         $this->assertIsString($this->instance->sendMessage($params));
     }
 
+    /** @test */
+    public function sendFifoMessage(): void
+    {
+        $params = [
+            'QueueUrl' => '.fifo', //required
+            'MessageBody' => 'Message 001',
+            'MessageDeduplicationId' => 'acac6e8f4ec9f44abc445945e76bf209',
+            'MessageGroupId' => '2fe6a413d02e3adef70256a36bf3b969',
+        ];
+
+        $this->assertIsString($this->instance->sendMessage($params));
+    }
+
     /** @test */
     public function receiveMessage()
     {
@@ -61,7 +76,7 @@ public function deleteMessage()
             'ReceiptHandle' => '', //required
         ];
 
-        $this->assertEmpty($this->instance->deleteMessage($params));
+        $this->assertIsObject($this->instance->deleteMessage($params));
     }
 
     /** @test */