feat: encrypt as array

src/Kernel/Encryptor.php

@@ -83,6 +83,31 @@ public function getToken(): string
      * @throws Exception
      */
     public function encrypt(string $plaintext, ?string $nonce = null, int|string|null $timestamp = null): string
+    {
+        return $this->encryptAsXml($plaintext, $nonce, $timestamp);
+    }
+
+    /**
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
+     */
+    public function encryptAsXml(string $plaintext, ?string $nonce = null, int|string|null $timestamp = null): string
+    {
+        $encrypted = $this->encryptAsArray($plaintext, $nonce, $timestamp);
+
+        $response = [
+            'Encrypt' => $encrypted['ciphertext'],
+            'MsgSignature' => $encrypted['signature'],
+            'TimeStamp' => $encrypted['timestamp'],
+            'Nonce' => $encrypted['nonce'],
+        ];
+
+        return Xml::build($response);
+    }
+
+    /**
+     * @throws \EasyWeChat\Kernel\Exceptions\RuntimeException
+     */
+    public function encryptAsArray(string $plaintext, ?string $nonce = null, int|string|null $timestamp = null): array
     {
         try {
             $plaintext = Pkcs7::padding(random_bytes(16).pack('N', strlen($plaintext)).$plaintext.$this->appId, 32);
@@ -102,14 +127,12 @@ public function encrypt(string $plaintext, ?string $nonce = null, int|string|nul
         $nonce ??= Str::random();
         $timestamp ??= time();
 
-        $response = [
-            'Encrypt' => $ciphertext,
-            'MsgSignature' => $this->createSignature($this->token, $timestamp, $nonce, $ciphertext),
-            'TimeStamp' => $timestamp,
-            'Nonce' => $nonce,
+        return [
+            'ciphertext' => $ciphertext,
+            'signature' => $this->createSignature($this->token, $timestamp, $nonce, $ciphertext),
+            'timestamp' => $timestamp,
+            'nonce' => $nonce,
         ];
-
-        return Xml::build($response);
     }
 
     public function createSignature(mixed ...$attributes): string

src/Kernel/Exceptions/BadMethodCallException.php

@@ -2,4 +2,6 @@
 
 namespace EasyWeChat\Kernel\Exceptions;
 
-class BadMethodCallException extends Exception {}
+class BadMethodCallException extends Exception
+{
+}

src/Kernel/Exceptions/BadRequestException.php

@@ -4,4 +4,6 @@
 
 namespace EasyWeChat\Kernel\Exceptions;
 
-class BadRequestException extends Exception {}
+class BadRequestException extends Exception
+{
+}

src/Kernel/Exceptions/BadResponseException.php

@@ -4,4 +4,6 @@
 
 namespace EasyWeChat\Kernel\Exceptions;
 
-class BadResponseException extends Exception {}
+class BadResponseException extends Exception
+{
+}

src/Kernel/Exceptions/DecryptException.php

@@ -4,4 +4,6 @@
 
 namespace EasyWeChat\Kernel\Exceptions;
 
-class DecryptException extends Exception {}
+class DecryptException extends Exception
+{
+}

src/Kernel/Exceptions/Exception.php

@@ -6,4 +6,6 @@
 
 use Exception as BaseException;
 
-class Exception extends BaseException {}
+class Exception extends BaseException
+{
+}

src/Kernel/Exceptions/InvalidArgumentException.php

@@ -4,4 +4,6 @@
 
 namespace EasyWeChat\Kernel\Exceptions;
 
-class InvalidArgumentException extends Exception {}
+class InvalidArgumentException extends Exception
+{
+}

src/Kernel/Exceptions/InvalidConfigException.php

@@ -4,4 +4,6 @@
 
 namespace EasyWeChat\Kernel\Exceptions;
 
-class InvalidConfigException extends Exception {}
+class InvalidConfigException extends Exception
+{
+}

src/Kernel/Exceptions/RuntimeException.php

@@ -4,4 +4,6 @@
 
 namespace EasyWeChat\Kernel\Exceptions;
 
-class RuntimeException extends Exception {}
+class RuntimeException extends Exception
+{
+}

src/Kernel/Exceptions/ServiceNotFoundException.php

@@ -4,4 +4,6 @@
 
 namespace EasyWeChat\Kernel\Exceptions;
 
-class ServiceNotFoundException extends Exception {}
+class ServiceNotFoundException extends Exception
+{
+}

src/Kernel/Form/Form.php

@@ -11,7 +11,9 @@ class Form
     /**
      * @param  array<string|array|DataPart>  $fields
      */
-    public function __construct(protected array $fields) {}
+    public function __construct(protected array $fields)
+    {
+    }
 
     /**
      * @param  array<string|array|DataPart>  $fields

src/Kernel/HttpClient/Response.php

@@ -47,7 +47,8 @@ public function __construct(
         protected ResponseInterface $response,
         protected ?Closure $failureJudge = null,
         protected bool $throw = true
-    ) {}
+    ) {
+    }
 
     public function throw(bool $throw = true): static
     {

src/MiniApp/Server.php

@@ -4,4 +4,6 @@
 
 namespace EasyWeChat\MiniApp;
 
-class Server extends \EasyWeChat\OfficialAccount\Server {}
+class Server extends \EasyWeChat\OfficialAccount\Server
+{
+}

src/MiniApp/Utils.php

@@ -12,7 +12,9 @@
 
 class Utils
 {
-    public function __construct(protected Application $app) {}
+    public function __construct(protected Application $app)
+    {
+    }
 
     /**
      * @throws HttpException

src/OfficialAccount/Account.php

@@ -14,7 +14,8 @@ public function __construct(
         protected ?string $secret,
         protected ?string $token = null,
         protected ?string $aesKey = null
-    ) {}
+    ) {
+    }
 
     public function getAppId(): string
     {

src/OfficialAccount/Utils.php

@@ -15,7 +15,9 @@
 
 class Utils
 {
-    public function __construct(protected Application $app) {}
+    public function __construct(protected Application $app)
+    {
+    }
 
     /**
      * @param  array<string>  $jsApiList

src/OpenPlatform/Account.php

@@ -13,7 +13,8 @@ public function __construct(
         protected string $secret,
         protected string $token,
         protected string $aesKey
-    ) {}
+    ) {
+    }
 
     public function getAppId(): string
     {

src/OpenPlatform/AuthorizerAccessToken.php

@@ -11,7 +11,9 @@
 
 class AuthorizerAccessToken implements AccessToken, Stringable
 {
-    public function __construct(protected string $appId, protected string $accessToken) {}
+    public function __construct(protected string $appId, protected string $accessToken)
+    {
+    }
 
     public function getAppId(): string
     {

src/OpenWork/Account.php

@@ -15,7 +15,8 @@ public function __construct(
         protected string $suiteSecret,
         protected string $token,
         protected string $aesKey
-    ) {}
+    ) {
+    }
 
     public function getCorpId(): string
     {

src/Pay/Exceptions/InvalidSignatureException.php

@@ -4,4 +4,6 @@
 
 use EasyWeChat\Kernel\Exceptions\RuntimeException;
 
-class InvalidSignatureException extends RuntimeException {}
+class InvalidSignatureException extends RuntimeException
+{
+}

src/Pay/LegacySignature.php

@@ -18,7 +18,9 @@
 
 class LegacySignature
 {
-    public function __construct(protected MerchantInterface $merchant) {}
+    public function __construct(protected MerchantInterface $merchant)
+    {
+    }
 
     /**
      * @param  array<string, mixed>  $params
@@ -39,7 +41,7 @@ public function sign(array $params): array
                 ],
                 $params
             ),
-            static fn ($value, $key) => !($key === 'sign' || $value === '' || is_null($value)),
+            static fn ($value, $key) => ! ($key === 'sign' || $value === '' || is_null($value)),
             ARRAY_FILTER_USE_BOTH
         );
 

src/Pay/ResponseValidator.php

@@ -11,7 +11,9 @@
 
 class ResponseValidator implements \EasyWeChat\Pay\Contracts\ResponseValidator
 {
-    public function __construct(protected MerchantInterface $merchant) {}
+    public function __construct(protected MerchantInterface $merchant)
+    {
+    }
 
     /**
      * @throws \EasyWeChat\Kernel\Exceptions\BadResponseException

src/Pay/Signature.php

@@ -20,7 +20,9 @@
 
 class Signature
 {
-    public function __construct(protected MerchantInterface $merchant) {}
+    public function __construct(protected MerchantInterface $merchant)
+    {
+    }
 
     /**
      * @param  array<string,mixed>  $options

src/Pay/URLSchemeBuilder.php

@@ -12,7 +12,9 @@
 
 class URLSchemeBuilder
 {
-    public function __construct(protected MerchantInterface $merchant) {}
+    public function __construct(protected MerchantInterface $merchant)
+    {
+    }
 
     /**
      * @throws Exception

src/Pay/Utils.php

@@ -18,7 +18,9 @@
 
 class Utils
 {
-    public function __construct(protected MerchantInterface $merchant) {}
+    public function __construct(protected MerchantInterface $merchant)
+    {
+    }
 
     /**
      * @see https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter4_1_4.shtml

src/Pay/Validator.php

@@ -21,7 +21,9 @@ class Validator implements \EasyWeChat\Pay\Contracts\Validator
 
     public const HEADER_SIGNATURE = 'Wechatpay-Signature';
 
-    public function __construct(protected MerchantInterface $merchant) {}
+    public function __construct(protected MerchantInterface $merchant)
+    {
+    }
 
     /**
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException

src/Work/Account.php

@@ -13,7 +13,8 @@ public function __construct(
         protected string $secret,
         protected string $token,
         protected string $aesKey,
-    ) {}
+    ) {
+    }
 
     public function getCorpId(): string
     {

src/Work/Utils.php

@@ -16,7 +16,9 @@
 
 class Utils
 {
-    public function __construct(protected Application $app) {}
+    public function __construct(protected Application $app)
+    {
+    }
 
     /**
      * @param  array<string>  $jsApiList

tests/Kernel/Traits/DecryptXmlMessageTest.php

@@ -37,4 +37,6 @@ public function test_it_can_decrypt_message()
     }
 }
 
-class DummyMessage extends Message {}
+class DummyMessage extends Message
+{
+}