使用驼峰命名法

overtrue · Jun 7, 2024 · a4d728a · a4d728a
1 parent 1625c23
commit a4d728a
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/src/Providers/PayPal.php b/src/Providers/PayPal.php
@@ -21,8 +21,8 @@ class PayPal extends Base
      * @var string|null
      * code or id_token
      */
-    protected ?string $response_type = Contracts\RFC6749_ABNF_CODE;
-    protected string  $flow_entry    = 'static';
+    protected ?string $responseType = Contracts\RFC6749_ABNF_CODE;
+    protected string  $flowEntry    = 'static';
 
     protected string $authUrl     = 'https://www.paypal.com/signin/authorize';
     protected string $tokenURL    = "https://api.sandbox.paypal.com/v1/oauth2/token";
@@ -49,9 +49,9 @@ public function __construct(array $config)
      * @param string|null $response_type
      * @return $this
      */
-    public function withResponseType(?string $response_type)
+    public function withResponseType(?string $responseType)
     {
-        $this->response_type = $response_type;
+        $this->responseType = $responseType;
         return $this;
     }
 
@@ -64,9 +64,9 @@ protected function getCodeFields(): array
     {
         $fields = \array_merge(
             [
-                'flowEntry'                          => $this->flow_entry,
+                'flowEntry'                          => $this->flowEntry,
                 Contracts\RFC6749_ABNF_CLIENT_ID     => $this->getClientId(),
-                Contracts\RFC6749_ABNF_RESPONSE_TYPE => $this->response_type,
+                Contracts\RFC6749_ABNF_RESPONSE_TYPE => $this->responseType,
                 Contracts\RFC6749_ABNF_SCOPE         => $this->formatScopes($this->scopes, $this->scopeSeparator),
                 Contracts\RFC6749_ABNF_REDIRECT_URI  => $this->redirectUrl,
             ],
@@ -94,14 +94,13 @@ protected function getTokenUrl(): string
      */
     public function tokenFromCode(string $code): array
     {
-        $form_params = [
-            Contracts\RFC6749_ABNF_GRANT_TYPE => Contracts\RFC6749_ABNF_AUTHORATION_CODE,
-            Contracts\RFC6749_ABNF_CODE       => $code,
-        ];
-        $response    = $this->getHttpClient()->post(
+        $response = $this->getHttpClient()->post(
             $this->getTokenUrl(),
             [
-                'form_params' => $form_params,
+                'form_params' => [
+                    Contracts\RFC6749_ABNF_GRANT_TYPE => Contracts\RFC6749_ABNF_AUTHORATION_CODE,
+                    Contracts\RFC6749_ABNF_CODE       => $code,
+                ],
                 'headers'     => [
                     'Accept'        => 'application/json',
                     'Authorization' => 'Basic ' . \base64_encode(\sprintf('%s:%s', $this->getClientId(), $this->getClientSecret())),
@@ -120,14 +119,13 @@ public function tokenFromCode(string $code): array
      */
     public function refreshToken(string $refreshToken): mixed
     {
-        $form_params = [
-            Contracts\RFC6749_ABNF_GRANT_TYPE    => Contracts\RFC6749_ABNF_REFRESH_TOKEN,
-            Contracts\RFC6749_ABNF_REFRESH_TOKEN => $refreshToken,
-        ];
         $response    = $this->getHttpClient()->post(
             $this->getTokenUrl(),
             [
-                'form_params' => $form_params,
+                'form_params' => [
+                    Contracts\RFC6749_ABNF_GRANT_TYPE    => Contracts\RFC6749_ABNF_REFRESH_TOKEN,
+                    Contracts\RFC6749_ABNF_REFRESH_TOKEN => $refreshToken,
+                ],
                 'headers'     => [
                     'Accept'        => 'application/json',
                     'Authorization' => 'Basic ' . \base64_encode(\sprintf('%s:%s', $this->getClientId(), $this->getClientSecret())),