Merge branch 'release/v1.1.0'

sunaoka · Aug 6, 2024 · 7a39442 · 7a39442
2 parents 0a92991 + e7d3f97
commit 7a39442
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "paypayopa/php-sdk": "^2.0"
     },
     "require-dev": {
-        "laravel/pint": "^1.16",
+        "laravel/pint": "^1.17.0",
         "orchestra/testbench": "^8.23 || ^9.0",
         "phpstan/phpstan": "^1.11"
     },

diff --git a/config/paypay.php b/config/paypay.php
@@ -5,4 +5,17 @@
     'api_secret' => env('PAYPAY_API_SECRET'),
     'merchant_id' => env('PAYPAY_MERCHANT_ID'),
     'production_mode' => (bool) env('PAYPAY_PRODUCTION_MODE', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Guzzle Request Options
+    |--------------------------------------------------------------------------
+    |
+    | You can set request options for Guzzle. However, "base_uri" is overridden
+    | by PayPay library.
+    |
+    | For more information on Request Options, please refer to the following.
+    | https://docs.guzzlephp.org/en/stable/request-options.html
+    */
+    'options' => [],
 ];
diff --git a/src/Client.php b/src/Client.php
@@ -29,31 +29,31 @@ class Client extends \PayPay\OpenPaymentAPI\Client
 
     /**
      * @param  array{API_KEY: string, API_SECRET: string, MERCHANT_ID: string}  $auth
-     * @param  bool  $productionmode
-     * @param  GuzzleHttpClient|false  $requestHandler
      *
      * @throws ClientException
      */
-    public function __construct($auth = null, $productionmode = false, $requestHandler = false)
-    {
+    public function __construct(
+        array $auth,
+        bool $productionmode = false,
+        GuzzleHttpClient|false $requestHandler = false,
+        private readonly array $options = []
+    ) {
         $this->fakeResponse = null;
 
         parent::__construct($auth, $productionmode, $requestHandler);
     }
 
     public function http(): GuzzleHttpClient
     {
-        if (empty($this->fakeResponse)) {
-            return parent::http();
-        }
+        $options = $this->options;
+        $options['base_uri'] = $this->GetConfig('API_URL');
 
-        $mockHandler = new MockHandler([array_shift($this->fakeResponse)]);
-        $handlerStack = HandlerStack::create($mockHandler);
+        if (! empty($this->fakeResponse)) {
+            $mockHandler = new MockHandler([array_shift($this->fakeResponse)]);
+            $options['handler'] = HandlerStack::create($mockHandler);
+        }
 
-        return new GuzzleHttpClient([
-            'base_uri' => $this->GetConfig('API_URL'),
-            'handler' => $handlerStack,
-        ]);
+        return new GuzzleHttpClient($options);
     }
 
     /**

diff --git a/src/Provider/PayPayServiceProvider.php b/src/Provider/PayPayServiceProvider.php
@@ -27,7 +27,7 @@ public function register(): void
                 'API_KEY' => $config['api_key'],
                 'API_SECRET' => $config['api_secret'],
                 'MERCHANT_ID' => $config['merchant_id'],
-            ], $config['production_mode']);
+            ], $config['production_mode'], false, $config['options']);
         });
 
         $this->app->alias('PayPay', Client::class);

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -5,6 +5,7 @@
 namespace Tests;
 
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\RequestOptions;
 use PayPay\OpenPaymentAPI\ClientException;
 use PayPay\OpenPaymentAPI\Controller\CashBack;
 use PayPay\OpenPaymentAPI\Controller\ClientControllerException;
@@ -81,7 +82,7 @@ public function test_fake_successful(): void
             new Response(201, body: json_encode($fakeResponse, JSON_THROW_ON_ERROR)),
         ]);
 
-        $payload = new CreateQrCodePayload();
+        $payload = new CreateQrCodePayload;
         $payload->setMerchantPaymentId('merchant_id');
         $payload->setCodeType('ORDER_QR');
 
@@ -120,4 +121,31 @@ public function test_accessor(): void
         // @phpstan-ignore method.notFound
         $client->foo();
     }
+
+    /**
+     * @throws ClientException
+     * @throws \ReflectionException
+     */
+    public function test_http_with_options(): void
+    {
+        $options = [
+            RequestOptions::PROXY => 'http://localhost:8125',
+            RequestOptions::CONNECT_TIMEOUT => 3.14,
+        ];
+        $client = new Client([
+            'API_KEY' => 'api_key',
+            'API_SECRET' => 'api_secret',
+            'MERCHANT_ID' => 'merchant_id',
+        ], options: $options);
+
+        $http = $client->http();
+
+        $class = new \ReflectionObject($http);
+        $property = $class->getProperty('config');
+        $config = $property->getValue($http);
+
+        self::assertIsArray($config);
+        self::assertSame($options[RequestOptions::PROXY], $config[RequestOptions::PROXY]);
+        self::assertSame($options[RequestOptions::CONNECT_TIMEOUT], $config[RequestOptions::CONNECT_TIMEOUT]);
+    }
 }
diff --git a/tests/FacadeTest.php b/tests/FacadeTest.php
@@ -27,7 +27,7 @@ public function test_fake_successful(): void
             new Response(201, body: json_encode($fakeResponse, JSON_THROW_ON_ERROR)),
         ]);
 
-        $payload = new CreateQrCodePayload();
+        $payload = new CreateQrCodePayload;
         $payload->setMerchantPaymentId('merchant_id');
         $payload->setCodeType('ORDER_QR');
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -50,6 +50,7 @@ protected function defineEnvironment($app): void
                 'api_secret' => 'api_secret',
                 'merchant_id' => 'merchant_id',
                 'production_mode' => false,
+                'options' => [],
             ]);
         });
     }