Refactor about options

shimoning · Dec 15, 2022 · 2f9fecc · 2f9fecc
1 parent cfd6016
commit 2f9fecc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "version": "0.0.10",
+    "version": "0.0.11",
     "license": "MIT",
     "authors": [
         {

diff --git a/src/Communicator/Request.php b/src/Communicator/Request.php
@@ -6,10 +6,10 @@
 
 class Request
 {
-    private Options $_options;
+    private RequestOptions $_options;
     private Client $_client;
 
-    public function __construct(?Options $options = new Options)
+    public function __construct(?RequestOptions $options = new RequestOptions)
     {
         $this->_options = $options;
         $this->_client = new Client();

diff --git a/src/Communicator/Options.php → src/Communicator/RequestOptions.php b/src/Communicator/Options.php → src/Communicator/RequestOptions.php
@@ -2,7 +2,7 @@
 
 namespace Shimoning\ColorMeShopApi\Communicator;
 
-class Options
+class RequestOptions
 {
     private float $_timeout = 0;
     private float $_connectTimeout = 0;

diff --git a/src/Services/OAuth.php b/src/Services/OAuth.php
@@ -3,19 +3,16 @@
 namespace Shimoning\ColorMeShopApi\Services;
 
 use Shimoning\ColorMeShopApi\Communicator\Request;
-use Shimoning\ColorMeShopApi\Communicator\Options as RequestOption;
-use Shimoning\ColorMeShopApi\Entities\OAuth\Options;
+use Shimoning\ColorMeShopApi\Communicator\RequestOptions;
+use Shimoning\ColorMeShopApi\Entities\OAuth\Options as OAuthOptions;
 use Shimoning\ColorMeShopApi\Entities\OAuth\AccessToken;
 use Shimoning\ColorMeShopApi\Values\Scopes;
 
 class OAuth
 {
-    private Options $_options;
+    private OAuthOptions $_options;
 
-    /**
-     * @param Options $options
-     */
-    public function __construct(Options $options)
+    public function __construct(OAuthOptions $options)
     {
         $this->_options = $options;
     }
@@ -44,7 +41,7 @@ public function getOAuthUrl(Scopes $scopes): string
      */
     public function exchangeCode2Token(string $code): AccessToken|bool
     {
-        $response = (new Request(new RequestOption(['form' => true])))->post(
+        $response = (new Request(new RequestOptions(['form' => true])))->post(
             $this->_options->getEndpointUri() . '/token',
             [
                 'client_id' => $this->_options->getClientId(),

diff --git a/src/Services/Sales.php b/src/Services/Sales.php
@@ -4,7 +4,7 @@
 
 use DateTimeInterface;
 use Shimoning\ColorMeShopApi\Communicator\Request;
-use Shimoning\ColorMeShopApi\Communicator\Options as RequestOption;
+use Shimoning\ColorMeShopApi\Communicator\RequestOptions;
 use Shimoning\ColorMeShopApi\Communicator\Errors;
 use Shimoning\ColorMeShopApi\Entities\Sales\SearchParameters;
 use Shimoning\ColorMeShopApi\Entities\Sales\Sale;
@@ -34,7 +34,7 @@ public function page(
         SearchParameters $searchParameters,
         ?string $accessToken = null,
     ): Page|Errors {
-        $response = (new Request(new RequestOption([
+        $response = (new Request(new RequestOptions([
             'authorization' => $accessToken ?? $this->_accessToken,
         ])))->get(
             'https://api.shop-pro.jp/v1/sales',
@@ -59,7 +59,7 @@ public function page(
      */
     public function one(int|string $id, ?string $accessToken = null): Sale|Errors
     {
-        $response = (new Request(new RequestOption([
+        $response = (new Request(new RequestOptions([
             'authorization' => $accessToken ?? $this->_accessToken,
         ])))->get(
             'https://api.shop-pro.jp/v1/sales/' . $id,
@@ -82,7 +82,7 @@ public function stat(
         DateTimeInterface $dateTime,
         ?string $accessToken = null,
     ): Stat|Errors {
-        $response = (new Request(new RequestOption([
+        $response = (new Request(new RequestOptions([
             'authorization' => $accessToken ?? $this->_accessToken,
         ])))->get(
             'https://api.shop-pro.jp/v1/sales/stat?',
@@ -107,7 +107,7 @@ public function update(
         SaleUpdater $updater,
         ?string $accessToken = null,
     ): Sale|Errors {
-        $response = (new Request(new RequestOption([
+        $response = (new Request(new RequestOptions([
             'authorization' => $accessToken ?? $this->_accessToken,
             'json' => true,
         ])))->put(
@@ -135,7 +135,7 @@ public function cancel(
         ?bool $restock = false,
         ?string $accessToken = null,
     ): Sale|Errors {
-        $response = (new Request(new RequestOption([
+        $response = (new Request(new RequestOptions([
             'authorization' => $accessToken ?? $this->_accessToken,
             'json' => true,
         ])))->put(
@@ -163,7 +163,7 @@ public function sendMail(
         MailType $mailType,
         ?string $accessToken = null,
     ): bool|Errors {
-        $response = (new Request(new RequestOption([
+        $response = (new Request(new RequestOptions([
             'authorization' => $accessToken ?? $this->_accessToken,
             'json' => true,
         ])))->post(