Merge pull request #70 from imdhemy/depend-on-client-interface

[1.x] Depend on client interface

Author: imdhemy

src/ClientFactory.php

@@ -3,6 +3,7 @@
 namespace Imdhemy\AppStore;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
@@ -24,9 +25,9 @@ class ClientFactory
      * @param bool $sandbox
      * @param array $options
      *
-     * @return Client
+     * @return ClientInterface
      */
-    public static function create(bool $sandbox = false, array $options = []): Client
+    public static function create(bool $sandbox = false, array $options = []): ClientInterface
     {
         if (empty($options['base_uri'])) {
             $options['base_uri'] = $sandbox ? self::BASE_URI_SANDBOX : self::BASE_URI;
@@ -36,9 +37,9 @@ public static function create(bool $sandbox = false, array $options = []): Clien
     }
 
     /**
-     * @return Client
+     * @return ClientInterface
      */
-    public static function createSandbox(): Client
+    public static function createSandbox(): ClientInterface
     {
         return self::create(true);
     }
@@ -50,9 +51,9 @@ public static function createSandbox(): Client
      * @param array $transactions
      *
      * @psalm-suppress ReferenceConstraintViolation
-     * @return Client
+     * @return ClientInterface
      */
-    public static function mock(ResponseInterface $responseMock, array &$transactions = []): Client
+    public static function mock(ResponseInterface $responseMock, array &$transactions = []): ClientInterface
     {
         $mockHandler = new MockHandler([$responseMock]);
         $handlerStack = HandlerStack::create($mockHandler);
@@ -68,9 +69,9 @@ public static function mock(ResponseInterface $responseMock, array &$transaction
      * @param array $transactions
      *
      * @psalm-suppress ReferenceConstraintViolation
-     * @return Client
+     * @return ClientInterface
      */
-    public static function mockQueue(array $responseQueue, array &$transactions = []): Client
+    public static function mockQueue(array $responseQueue, array &$transactions = []): ClientInterface
     {
         $mockHandler = new MockHandler($responseQueue);
         $handlerStack = HandlerStack::create($mockHandler);
@@ -86,9 +87,9 @@ public static function mockQueue(array $responseQueue, array &$transactions = []
      * @param array $transactions
      *
      * @psalm-suppress ReferenceConstraintViolation
-     * @return Client
+     * @return ClientInterface
      */
-    public static function mockError(RequestExceptionInterface $error, array &$transactions = []): Client
+    public static function mockError(RequestExceptionInterface $error, array &$transactions = []): ClientInterface
     {
         $mockHandler = new MockHandler([$error]);
         $handlerStack = HandlerStack::create($mockHandler);

src/Receipts/Verifier.php

@@ -3,6 +3,7 @@
 namespace Imdhemy\AppStore\Receipts;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use Imdhemy\AppStore\ClientFactory;
 use Imdhemy\AppStore\Exceptions\InvalidReceiptException;
@@ -21,7 +22,7 @@ class Verifier
     public const VERIFY_RECEIPT_PATH = '/verifyReceipt';
 
     /**
-     * @var Client
+     * @var ClientInterface
      */
     protected $client;
 
@@ -38,25 +39,25 @@ class Verifier
     /**
      * Receipt constructor.
      *
-     * @param Client $client
+     * @param ClientInterface $client
      * @param string $receiptData
      * @param string $password
      */
-    public function __construct(Client $client, string $receiptData, string $password)
+    public function __construct(ClientInterface $client, string $receiptData, string $password)
     {
         $this->client = $client;
         $this->receiptData = $receiptData;
         $this->password = $password;
     }
 
     /**
-     * @param Client|null $sandboxClient
+     * @param ClientInterface|null $sandboxClient
      *
      * @return ReceiptResponse
      * @throws GuzzleException|InvalidReceiptException
      * @deprecated Use verify() instead - this method will be removed in the next major release
      */
-    public function verifyRenewable(?Client $sandboxClient = null): ReceiptResponse
+    public function verifyRenewable(?ClientInterface $sandboxClient = null): ReceiptResponse
     {
         return $this->verify(true, $sandboxClient);
     }
@@ -68,8 +69,10 @@ public function verifyRenewable(?Client $sandboxClient = null): ReceiptResponse
      * @return ReceiptResponse
      * @throws GuzzleException|InvalidReceiptException
      */
-    public function verify(bool $excludeOldTransactions = false, ?Client $sandboxClient = null): ReceiptResponse
-    {
+    public function verify(
+        bool $excludeOldTransactions = false,
+        ?ClientInterface $sandboxClient = null
+    ): ReceiptResponse {
         $responseBody = $this->sendVerifyRequest($excludeOldTransactions);
         $status = $responseBody['status'];
 
@@ -87,12 +90,12 @@ public function verify(bool $excludeOldTransactions = false, ?Client $sandboxCli
 
     /**
      * @param bool $excludeOldTransactions
-     * @param Client|null $client
+     * @param ClientInterface|null $client
      *
      * @return array
      * @throws GuzzleException
      */
-    private function sendVerifyRequest(bool $excludeOldTransactions = false, ?Client $client = null): array
+    private function sendVerifyRequest(bool $excludeOldTransactions = false, ?ClientInterface $client = null): array
     {
         $client = $client ?? $this->client;
         $options = $this->buildRequestOptions($excludeOldTransactions);

src/ServerNotifications/TestNotificationService.php

@@ -4,7 +4,7 @@
 
 namespace Imdhemy\AppStore\ServerNotifications;
 
-use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use Imdhemy\AppStore\Jws\JwsGenerator;
 use Psr\Http\Message\ResponseInterface;
@@ -16,20 +16,20 @@
 final class TestNotificationService
 {
     /**
-     * @var Client
+     * @var ClientInterface
      */
-    private Client $client;
+    private ClientInterface $client;
 
     /**
      * @var JwsGenerator
      */
     private JwsGenerator $jwsGenerator;
 
     /**
-     * @param Client $client
+     * @param ClientInterface $client
      * @param JwsGenerator $jwsGenerator
      */
-    public function __construct(Client $client, JwsGenerator $jwsGenerator)
+    public function __construct(ClientInterface $client, JwsGenerator $jwsGenerator)
     {
         $this->client = $client;
         $this->jwsGenerator = $jwsGenerator;