cs

composer.json

@@ -37,7 +37,6 @@
     "thenorthmemory/xml": "^1.0"
   },
   "require-dev": {
-    "brainmaestro/composer-git-hooks": "^2.8",
     "mikey179/vfsstream": "^1.6",
     "mockery/mockery": "^1.4.4",
     "phpstan/phpstan": "^1.0",
@@ -56,36 +55,8 @@
       "EasyWeChat\\Tests\\": "tests/"
     }
   },
-  "extra": {
-    "hooks": {
-      "pre-commit": [
-        "composer check-style",
-        "composer phpstan",
-        "composer test"
-      ],
-      "pre-push": [
-        "composer check-style"
-      ],
-      "config": {
-        "stop-on-failure": [
-          "pre-commit",
-          "pre-push"
-        ]
-      }
-    }
-  },
   "scripts": {
-    "post-update-cmd": [
-      "cghooks remove",
-      "cghooks add --ignore-lock",
-      "cghooks update"
-    ],
     "post-merge": "composer install",
-    "post-install-cmd": [
-      "cghooks remove",
-      "cghooks add --ignore-lock",
-      "cghooks update"
-    ],
     "phpstan": "phpstan analyse --memory-limit=-1",
     "check-style": "vendor/bin/pint --test",
     "fix-style": "vendor/bin/pint",

src/Kernel/Contracts/Aes.php

@@ -4,7 +4,7 @@
 
 interface Aes
 {
-    public static function encrypt(string $plaintext, string $key, string $iv = null): string;
+    public static function encrypt(string $plaintext, string $key, ?string $iv = null): string;
 
-    public static function decrypt(string $ciphertext, string $key, string $iv = null): string;
+    public static function decrypt(string $ciphertext, string $key, ?string $iv = null): string;
 }

src/Kernel/Encryptor.php

@@ -65,7 +65,7 @@ class Encryptor
 
     protected ?string $receiveId = null;
 
-    public function __construct(string $appId, string $token, string $aesKey, string $receiveId = null)
+    public function __construct(string $appId, string $token, string $aesKey, ?string $receiveId = null)
     {
         $this->appId = $appId;
         $this->token = $token;
@@ -82,7 +82,7 @@ public function getToken(): string
      * @throws RuntimeException
      * @throws Exception
      */
-    public function encrypt(string $plaintext, string $nonce = null, int|string $timestamp = null): string
+    public function encrypt(string $plaintext, ?string $nonce = null, int|string|null $timestamp = null): string
     {
         try {
             $plaintext = Pkcs7::padding(random_bytes(16).pack('N', strlen($plaintext)).$plaintext.$this->appId, 32);

src/Kernel/Exceptions/HttpException.php

@@ -13,7 +13,7 @@ class HttpException extends Exception
     /**
      * HttpException constructor.
      */
-    public function __construct(string $message, ResponseInterface $response = null, int $code = 0)
+    public function __construct(string $message, ?ResponseInterface $response = null, int $code = 0)
     {
         parent::__construct($message, $code);
 

src/Kernel/Form/File.php

@@ -22,9 +22,9 @@ class File extends DataPart
      */
     public static function from(
         string $pathOrContents,
-        string $filename = null,
-        string $contentType = null,
-        string $encoding = null
+        ?string $filename = null,
+        ?string $contentType = null,
+        ?string $encoding = null
     ): DataPart {
         if (file_exists($pathOrContents)) {
             return static::fromPath($pathOrContents, $filename, $contentType);
@@ -38,9 +38,9 @@ public static function from(
      */
     public static function fromContents(
         string $contents,
-        string $filename = null,
-        string $contentType = null,
-        string $encoding = null
+        ?string $filename = null,
+        ?string $contentType = null,
+        ?string $encoding = null
     ): DataPart {
         if ($contentType === null) {
             $mimeTypes = new MimeTypes();
@@ -70,9 +70,9 @@ public static function fromContents(
      */
     public static function withContents(
         string $contents,
-        string $filename = null,
-        string $contentType = null,
-        string $encoding = null
+        ?string $filename = null,
+        ?string $contentType = null,
+        ?string $encoding = null
     ): DataPart {
         return self::fromContents(...func_get_args());
     }

src/Kernel/HttpClient/AccessTokenAwareClient.php

@@ -32,7 +32,7 @@ class AccessTokenAwareClient implements AccessTokenAwareHttpClientInterface
     use RetryableClient;
 
     public function __construct(
-        HttpClientInterface $client = null,
+        ?HttpClientInterface $client = null,
         protected ?AccessTokenInterface $accessToken = null,
         protected ?Closure $failureJudge = null,
         protected bool $throw = true

src/Kernel/HttpClient/RequestWithPresets.php

@@ -88,7 +88,7 @@ public function with(string|array $key, mixed $value = null): static
      * @throws RuntimeException
      * @throws InvalidArgumentException
      */
-    public function withFile(string $pathOrContents, string $formName = 'file', string $filename = null): static
+    public function withFile(string $pathOrContents, string $formName = 'file', ?string $filename = null): static
     {
         $file = is_file($pathOrContents) ? File::fromPath(
             $pathOrContents,
@@ -111,7 +111,7 @@ public function withFile(string $pathOrContents, string $formName = 'file', stri
      * @throws RuntimeException
      * @throws InvalidArgumentException
      */
-    public function withFileContents(string $contents, string $formName = 'file', string $filename = null): static
+    public function withFileContents(string $contents, string $formName = 'file', ?string $filename = null): static
     {
         return $this->withFile($contents, $formName, $filename);
     }

src/Kernel/HttpClient/Response.php

@@ -112,7 +112,7 @@ public function isFailed(): bool
      * @throws ClientExceptionInterface
      * @throws BadResponseException
      */
-    public function toArray(bool $throw = null): array
+    public function toArray(?bool $throw = null): array
     {
         $throw ??= $this->throw;
 
@@ -143,15 +143,15 @@ public function toArray(bool $throw = null): array
      * @throws ClientExceptionInterface
      * @throws BadResponseException
      */
-    public function toJson(bool $throw = null): string|false
+    public function toJson(?bool $throw = null): string|false
     {
         return json_encode($this->toArray($throw), JSON_UNESCAPED_UNICODE);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function toStream(bool $throw = null)
+    public function toStream(?bool $throw = null)
     {
         if ($this->response instanceof StreamableInterface) {
             return $this->response->toStream($throw ?? $this->throw);
@@ -175,7 +175,7 @@ public function toDataUrl(): string
         return 'data:'.$this->getHeaderLine('content-type').';base64,'.base64_encode($this->getContent());
     }
 
-    public function toPsrResponse(ResponseFactoryInterface $responseFactory = null, StreamFactoryInterface $streamFactory = null): \Psr\Http\Message\ResponseInterface
+    public function toPsrResponse(?ResponseFactoryInterface $responseFactory = null, ?StreamFactoryInterface $streamFactory = null): \Psr\Http\Message\ResponseInterface
     {
         $streamFactory ??= $responseFactory instanceof StreamFactoryInterface ? $responseFactory : null;
 
@@ -290,12 +290,12 @@ public function getStatusCode(): int
         return $this->response->getStatusCode();
     }
 
-    public function getHeaders(bool $throw = null): array
+    public function getHeaders(?bool $throw = null): array
     {
         return $this->response->getHeaders($throw ?? $this->throw);
     }
 
-    public function getContent(bool $throw = null): string
+    public function getContent(?bool $throw = null): string
     {
         return $this->response->getContent($throw ?? $this->throw);
     }
@@ -305,7 +305,7 @@ public function cancel(): void
         $this->response->cancel();
     }
 
-    public function getInfo(string $type = null): mixed
+    public function getInfo(?string $type = null): mixed
     {
         return $this->response->getInfo($type);
     }
@@ -329,7 +329,7 @@ public function __toString(): string
      * @throws RedirectionExceptionInterface
      * @throws ClientExceptionInterface
      */
-    public function hasHeader(string $name, bool $throw = null): bool
+    public function hasHeader(string $name, ?bool $throw = null): bool
     {
         return isset($this->getHeaders($throw)[$name]);
     }
@@ -342,7 +342,7 @@ public function hasHeader(string $name, bool $throw = null): bool
      * @throws RedirectionExceptionInterface
      * @throws ClientExceptionInterface
      */
-    public function getHeader(string $name, bool $throw = null): array
+    public function getHeader(string $name, ?bool $throw = null): array
     {
         $name = strtolower($name);
         $throw ??= $this->throw;
@@ -356,7 +356,7 @@ public function getHeader(string $name, bool $throw = null): array
      * @throws RedirectionExceptionInterface
      * @throws ClientExceptionInterface
      */
-    public function getHeaderLine(string $name, bool $throw = null): string
+    public function getHeaderLine(string $name, ?bool $throw = null): string
     {
         $name = strtolower($name);
         $throw ??= $this->throw;

src/Kernel/HttpClient/RetryableClient.php

@@ -36,7 +36,7 @@ public function retry(array $config = []): static
     public function retryUsing(
         RetryStrategyInterface $strategy,
         int $maxRetries = 3,
-        LoggerInterface $logger = null
+        ?LoggerInterface $logger = null
     ): static {
         $this->client = new RetryableHttpClient($this->client, $strategy, $maxRetries, $logger);
 

src/Kernel/HttpClient/ScopingHttpClient.php

@@ -38,7 +38,7 @@ public function request(string $method, string $url, array $options = []): Respo
         return $this->client->request($method, $url, $options);
     }
 
-    public function stream(ResponseInterface|iterable $responses, float $timeout = null): ResponseStreamInterface
+    public function stream(ResponseInterface|iterable $responses, ?float $timeout = null): ResponseStreamInterface
     {
         return $this->client->stream($responses, $timeout);
     }

src/Kernel/Support/AesCbc.php

@@ -16,7 +16,7 @@ class AesCbc implements Aes
     /**
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      */
-    public static function encrypt(string $plaintext, string $key, string $iv = null): string
+    public static function encrypt(string $plaintext, string $key, ?string $iv = null): string
     {
         $ciphertext = \openssl_encrypt($plaintext, 'aes-128-cbc', $key, OPENSSL_RAW_DATA, (string) $iv);
 
@@ -30,7 +30,7 @@ public static function encrypt(string $plaintext, string $key, string $iv = null
     /**
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      */
-    public static function decrypt(string $ciphertext, string $key, string $iv = null): string
+    public static function decrypt(string $ciphertext, string $key, ?string $iv = null): string
     {
         $plaintext = openssl_decrypt(
             base64_decode($ciphertext),

src/Kernel/Support/AesEcb.php

@@ -16,7 +16,7 @@ class AesEcb implements Aes
     /**
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      */
-    public static function encrypt(string $plaintext, string $key, string $iv = null): string
+    public static function encrypt(string $plaintext, string $key, ?string $iv = null): string
     {
         $ciphertext = \openssl_encrypt($plaintext, 'aes-256-ecb', $key, OPENSSL_RAW_DATA, (string) $iv);
 
@@ -30,7 +30,7 @@ public static function encrypt(string $plaintext, string $key, string $iv = null
     /**
      * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
      */
-    public static function decrypt(string $ciphertext, string $key, string $iv = null): string
+    public static function decrypt(string $ciphertext, string $key, ?string $iv = null): string
     {
         $plaintext = openssl_decrypt(
             base64_decode($ciphertext, true) ?: '',

src/Kernel/Support/AesGcm.php

@@ -20,7 +20,7 @@ class AesGcm implements Aes
     /**
      * @throws InvalidArgumentException
      */
-    public static function encrypt(string $plaintext, string $key, string $iv = null, string $aad = ''): string
+    public static function encrypt(string $plaintext, string $key, ?string $iv = null, string $aad = ''): string
     {
         $ciphertext = openssl_encrypt(
             $plaintext,
@@ -43,7 +43,7 @@ public static function encrypt(string $plaintext, string $key, string $iv = null
     /**
      * @throws InvalidArgumentException
      */
-    public static function decrypt(string $ciphertext, string $key, string $iv = null, string $aad = ''): string
+    public static function decrypt(string $ciphertext, string $key, ?string $iv = null, string $aad = ''): string
     {
         $ciphertext = base64_decode($ciphertext);
 

src/Kernel/Traits/RespondXmlMessage.php

@@ -22,7 +22,7 @@ trait RespondXmlMessage
      * @throws RuntimeException
      * @throws InvalidArgumentException
      */
-    public function transformToReply(mixed $response, Message $message, Encryptor $encryptor = null): ResponseInterface
+    public function transformToReply(mixed $response, Message $message, ?Encryptor $encryptor = null): ResponseInterface
     {
         if (empty($response)) {
             return new Response(200, [], 'success');
@@ -79,7 +79,7 @@ protected function normalizeResponse(mixed $response): array
      *
      * @throws RuntimeException
      */
-    protected function createXmlResponse(array $attributes, Encryptor $encryptor = null): ResponseInterface
+    protected function createXmlResponse(array $attributes, ?Encryptor $encryptor = null): ResponseInterface
     {
         $xml = Xml::build($attributes);
 

src/OfficialAccount/AccessToken.php

@@ -36,8 +36,8 @@ public function __construct(
         protected string $appId,
         protected string $secret,
         protected ?string $key = null,
-        CacheInterface $cache = null,
-        HttpClientInterface $httpClient = null,
+        ?CacheInterface $cache = null,
+        ?HttpClientInterface $httpClient = null,
         protected ?bool $stable = false
     ) {
         $this->httpClient = $httpClient ?? HttpClient::create(['base_uri' => 'https://api.weixin.qq.com/']);

src/OfficialAccount/Server.php

@@ -32,7 +32,7 @@ class Server implements ServerInterface
      * @throws Throwable
      */
     public function __construct(
-        ServerRequestInterface $request = null,
+        ?ServerRequestInterface $request = null,
         protected ?Encryptor $encryptor = null,
     ) {
         $this->request = $request ?? RequestUtil::createDefaultServerRequest();
@@ -122,7 +122,7 @@ protected function decryptRequestMessage(array $query): Closure
     /**
      * @throws BadRequestException
      */
-    public function getRequestMessage(ServerRequestInterface $request = null): \EasyWeChat\Kernel\Message
+    public function getRequestMessage(?ServerRequestInterface $request = null): \EasyWeChat\Kernel\Message
     {
         return Message::createFromRequest($request ?? $this->request);
     }
@@ -131,7 +131,7 @@ public function getRequestMessage(ServerRequestInterface $request = null): \Easy
      * @throws BadRequestException
      * @throws RuntimeException
      */
-    public function getDecryptedMessage(ServerRequestInterface $request = null): \EasyWeChat\Kernel\Message
+    public function getDecryptedMessage(?ServerRequestInterface $request = null): \EasyWeChat\Kernel\Message
     {
         $request = $request ?? $this->request;
         $message = $this->getRequestMessage($request);

src/OpenPlatform/ComponentAccessToken.php

@@ -29,8 +29,8 @@ public function __construct(
         protected string $secret,
         protected VerifyTicketInterface $verifyTicket,
         protected ?string $key = null,
-        CacheInterface $cache = null,
-        HttpClientInterface $httpClient = null,
+        ?CacheInterface $cache = null,
+        ?HttpClientInterface $httpClient = null,
     ) {
         $this->httpClient = $httpClient ?? HttpClient::create(['base_uri' => 'https://api.weixin.qq.com/']);
         $this->cache = $cache ?? new Psr16Cache(new FilesystemAdapter(namespace: 'easywechat', defaultLifetime: 1500));