Fix the lint failings and optim the codes in FQN style (#2960)

TheNorthMemory · web-flow · commit cbece8ba1a26 · 2025-10-25T14:19:18.000+08:00
diff --git a/docs/package.json b/docs/package.json
@@ -12,14 +12,14 @@
     "clipboard": "^2.0.11",
     "dynamics.js": "^1.1.5",
     "gsap": "^3.13.0",
-    "tailwindcss": "^3.4.17"
+    "tailwindcss": "^3.4.18"
   },
   "devDependencies": {
     "@types/markdown-it": "^14.1.2",
-    "@types/node": "^22.18.6",
+    "@types/node": "^22.18.12",
     "postcss": "^8.5.6",
     "postcss-import": "^16.1.1",
-    "tenyun": "^0.13.4",
+    "tenyun": "^0.14.0",
     "vitepress": "1.6.3"
   },
   "packageManager": "pnpm@9.12.3+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee"
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/phpstan.neon b/phpstan.neon
@@ -57,9 +57,6 @@ parameters:
         -
             message: '#Method EasyWeChat\\Pay\\Client::createMockClient\(\) should return Mockery\\Mock\|Symfony\\Contracts\\HttpClient\\HttpClientInterface but returns Mockery\\LegacyMockInterface#'
             path: src/Pay/Client.php
-        -
-            message: '#Call to function is_string\(\) with string will always evaluate to true#'
-            path: src/Pay/Client.php
         -
             message: '#Parameter \#1 \$scopes of method Overtrue\\Socialite\\Providers\\Base::scopes\(\) expects array<string>#'
             path: src/Work/Application.php
diff --git a/src/Kernel/Config.php b/src/Kernel/Config.php
@@ -8,7 +8,6 @@
 use EasyWeChat\Kernel\Contracts\Config as ConfigInterface;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
 use EasyWeChat\Kernel\Support\Arr;
-use JetBrains\PhpStorm\Pure;
 
 use function strval;
 
@@ -33,7 +32,7 @@ public function __construct(
         $this->checkMissingKeys();
     }
 
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function has(string $key): bool
     {
         return Arr::has($this->items, $key);
@@ -42,7 +41,7 @@ public function has(string $key): bool
     /**
      * @param  array<string>|string  $key
      */
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function get(array|string $key, mixed $default = null): mixed
     {
         if (is_array($key)) {
@@ -56,7 +55,7 @@ public function get(array|string $key, mixed $default = null): mixed
      * @param  array<string>  $keys
      * @return array<string, mixed>
      */
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function getMany(array $keys): array
     {
         $config = [];
@@ -85,13 +84,13 @@ public function all(): array
         return $this->items;
     }
 
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function offsetExists(mixed $offset): bool
     {
         return $this->has(strval($offset));
     }
 
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function offsetGet(mixed $offset): mixed
     {
         return $this->get(strval($offset));
diff --git a/src/Kernel/Form/Form.php b/src/Kernel/Form/Form.php
@@ -2,7 +2,6 @@
 
 namespace EasyWeChat\Kernel\Form;
 
-use JetBrains\PhpStorm\ArrayShape;
 use Symfony\Component\Mime\Part\DataPart;
 use Symfony\Component\Mime\Part\Multipart\FormDataPart;
 
@@ -26,7 +25,7 @@ public static function create(array $fields): Form
     /**
      * @return array{headers:array<string,string|string[]>,body:string}
      */
-    #[ArrayShape(['headers' => 'array', 'body' => 'string'])]
+    #[\JetBrains\PhpStorm\ArrayShape(['headers' => 'array', 'body' => 'string'])]
     public function toArray(): array
     {
         return $this->toOptions();
@@ -35,7 +34,7 @@ public function toArray(): array
     /**
      * @return array{headers:array<string,string|string[]>,body:string}
      */
-    #[ArrayShape(['headers' => 'array', 'body' => 'string'])]
+    #[\JetBrains\PhpStorm\ArrayShape(['headers' => 'array', 'body' => 'string'])]
     public function toOptions(): array
     {
         $formData = new FormDataPart($this->fields);
diff --git a/src/Kernel/HttpClient/RequestUtil.php b/src/Kernel/HttpClient/RequestUtil.php
@@ -9,7 +9,6 @@
 use EasyWeChat\Kernel\Support\UserAgent;
 use EasyWeChat\Kernel\Support\Xml;
 use InvalidArgumentException;
-use JetBrains\PhpStorm\ArrayShape;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7Server\ServerRequestCreator;
 use Psr\Http\Message\ServerRequestInterface;
@@ -28,7 +27,7 @@ class RequestUtil
      * @param  array<string, mixed>  $options
      * @return array<string, mixed>
      */
-    #[ArrayShape([
+    #[\JetBrains\PhpStorm\ArrayShape([
         'status_codes' => 'array',
         'delay' => 'int',
         'max_delay' => 'int',
diff --git a/src/Kernel/Support/Arr.php b/src/Kernel/Support/Arr.php
@@ -4,13 +4,11 @@
 
 namespace EasyWeChat\Kernel\Support;
 
-use JetBrains\PhpStorm\Pure;
-
 use function is_string;
 
 class Arr
 {
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public static function get(mixed $array, string|int|null $key, mixed $default = null): mixed
     {
         if (! is_array($array)) {
@@ -97,7 +95,7 @@ public static function dot(array $array, string $prepend = ''): array
      * @param  array<string|int, mixed>  $array
      * @param  string|int|array<string|int, mixed>|null  $keys
      */
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public static function has(array $array, string|int|array|null $keys): bool
     {
         if (is_null($keys)) {
diff --git a/src/Kernel/Support/PrivateKey.php b/src/Kernel/Support/PrivateKey.php
@@ -2,8 +2,6 @@
 
 namespace EasyWeChat\Kernel\Support;
 
-use JetBrains\PhpStorm\Pure;
-
 use function file_exists;
 use function file_get_contents;
 use function str_starts_with;
@@ -31,7 +29,7 @@ public function getPassphrase(): ?string
         return $this->passphrase;
     }
 
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function __toString(): string
     {
         return $this->getKey();
diff --git a/src/Kernel/Traits/InteractWithHandlers.php b/src/Kernel/Traits/InteractWithHandlers.php
@@ -6,7 +6,6 @@
 
 use Closure;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
-use JetBrains\PhpStorm\ArrayShape;
 
 use function array_reverse;
 use function array_unshift;
@@ -52,7 +51,7 @@ public function withHandler(callable|string $handler): static
     /**
      * @return array{hash: string, handler: callable}
      */
-    #[ArrayShape(['hash' => 'string', 'handler' => 'callable'])]
+    #[\JetBrains\PhpStorm\ArrayShape(['hash' => 'string', 'handler' => 'callable'])]
     public function createHandlerItem(callable|string $handler): array
     {
         return [
diff --git a/src/Kernel/Traits/MockableHttpClient.php b/src/Kernel/Traits/MockableHttpClient.php
@@ -2,7 +2,6 @@
 
 namespace EasyWeChat\Kernel\Traits;
 
-use JetBrains\PhpStorm\Pure;
 use Mockery\Mock;
 use Symfony\Component\HttpClient\DecoratorTrait;
 use Symfony\Component\HttpClient\MockHttpClient;
@@ -53,13 +52,13 @@ public function __call(string $name, array $arguments): mixed
                 return $this->client->$name(...$arguments);
             }
 
-            #[Pure]
+            #[\JetBrains\PhpStorm\Pure]
             public function getRequestMethod(): string
             {
                 return $this->mockResponse->getRequestMethod();
             }
 
-            #[Pure]
+            #[\JetBrains\PhpStorm\Pure]
             public function getRequestUrl(): string
             {
                 return $this->mockResponse->getRequestUrl();
@@ -68,7 +67,7 @@ public function getRequestUrl(): string
             /**
              * @return array<string, mixed>
              */
-            #[Pure]
+            #[\JetBrains\PhpStorm\Pure]
             public function getRequestOptions(): array
             {
                 return $this->mockResponse->getRequestOptions();
diff --git a/src/MiniApp/Application.php b/src/MiniApp/Application.php
@@ -19,7 +19,6 @@
 use EasyWeChat\Kernel\Traits\InteractWithServerRequest;
 use EasyWeChat\MiniApp\Contracts\Account as AccountInterface;
 use EasyWeChat\MiniApp\Contracts\Application as ApplicationInterface;
-use JetBrains\PhpStorm\Pure;
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\HttpClient\Response\AsyncContext;
 use Symfony\Component\HttpClient\RetryableHttpClient;
@@ -141,7 +140,7 @@ public function setAccessToken(AccessTokenInterface $accessToken): static
         return $this;
     }
 
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function getUtils(): Utils
     {
         return new Utils($this);
diff --git a/src/OfficialAccount/AccessToken.php b/src/OfficialAccount/AccessToken.php
@@ -6,7 +6,6 @@
 
 use EasyWeChat\Kernel\Contracts\RefreshableAccessToken as RefreshableAccessTokenInterface;
 use EasyWeChat\Kernel\Exceptions\HttpException;
-use JetBrains\PhpStorm\ArrayShape;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Psr16Cache;
@@ -64,7 +63,7 @@ public function getToken(): string
     /**
      * @return array{access_token:string}
      */
-    #[ArrayShape(['access_token' => 'string'])]
+    #[\JetBrains\PhpStorm\ArrayShape(['access_token' => 'string'])]
     public function toQuery(): array
     {
         return ['access_token' => $this->getToken()];
diff --git a/src/OfficialAccount/Application.php b/src/OfficialAccount/Application.php
@@ -23,7 +23,6 @@
 use EasyWeChat\Kernel\Traits\InteractWithServerRequest;
 use EasyWeChat\OfficialAccount\Contracts\Account as AccountInterface;
 use EasyWeChat\OfficialAccount\Contracts\Application as ApplicationInterface;
-use JetBrains\PhpStorm\Pure;
 use Overtrue\Socialite\Contracts\ProviderInterface as SocialiteProviderInterface;
 use Overtrue\Socialite\Providers\WeChat;
 use Psr\Log\LoggerAwareTrait;
@@ -205,7 +204,7 @@ public function setTicket(JsApiTicketInterface|RefreshableJsApiTicketInterface $
         return $this;
     }
 
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function getUtils(): Utils
     {
         return new Utils($this);
diff --git a/src/OfficialAccount/JsApiTicket.php b/src/OfficialAccount/JsApiTicket.php
@@ -6,7 +6,6 @@
 
 use EasyWeChat\Kernel\Contracts\RefreshableJsApiTicket as RefreshableJsApiTicketInterface;
 use EasyWeChat\Kernel\Exceptions\HttpException;
-use JetBrains\PhpStorm\ArrayShape;
 
 use function sprintf;
 
@@ -44,7 +43,7 @@ public function refreshTicket(): string
     /**
      * @return array<string,mixed>
      */
-    #[ArrayShape([
+    #[\JetBrains\PhpStorm\ArrayShape([
         'url' => 'string',
         'nonceStr' => 'string',
         'timestamp' => 'int',
diff --git a/src/OpenPlatform/Authorization.php b/src/OpenPlatform/Authorization.php
@@ -8,7 +8,6 @@
 use EasyWeChat\Kernel\Contracts\Arrayable;
 use EasyWeChat\Kernel\Contracts\Jsonable;
 use EasyWeChat\Kernel\Traits\HasAttributes;
-use JetBrains\PhpStorm\Pure;
 
 /**
  * @implements ArrayAccess<string, mixed>
@@ -23,7 +22,7 @@ public function getAppId(): string
         return (string) $this->attributes['authorization_info']['authorizer_appid'] ?? '';
     }
 
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function getAccessToken(): AuthorizerAccessToken
     {
         return new AuthorizerAccessToken(
diff --git a/src/OpenPlatform/AuthorizerAccessToken.php b/src/OpenPlatform/AuthorizerAccessToken.php
@@ -5,8 +5,6 @@
 namespace EasyWeChat\OpenPlatform;
 
 use EasyWeChat\Kernel\Contracts\AccessToken;
-use JetBrains\PhpStorm\ArrayShape;
-use JetBrains\PhpStorm\Pure;
 use Stringable;
 
 class AuthorizerAccessToken implements AccessToken, Stringable
@@ -33,8 +31,8 @@ public function __toString()
     /**
      * @return array<string, string>
      */
-    #[Pure]
-    #[ArrayShape(['access_token' => 'string'])]
+    #[\JetBrains\PhpStorm\Pure]
+    #[\JetBrains\PhpStorm\ArrayShape(['access_token' => 'string'])]
     public function toQuery(): array
     {
         return ['access_token' => $this->getToken()];
diff --git a/src/OpenPlatform/ComponentAccessToken.php b/src/OpenPlatform/ComponentAccessToken.php
@@ -7,7 +7,6 @@
 use EasyWeChat\Kernel\Contracts\RefreshableAccessToken as RefreshableAccessTokenInterface;
 use EasyWeChat\Kernel\Exceptions\HttpException;
 use EasyWeChat\OpenPlatform\Contracts\VerifyTicket as VerifyTicketInterface;
-use JetBrains\PhpStorm\ArrayShape;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Psr16Cache;
@@ -59,7 +58,7 @@ public function getToken(): string
         return $this->refresh();
     }
 
-    #[ArrayShape(['component_access_token' => 'string'])]
+    #[\JetBrains\PhpStorm\ArrayShape(['component_access_token' => 'string'])]
     public function toQuery(): array
     {
         return ['component_access_token' => $this->getToken()];
diff --git a/src/OpenWork/AuthorizerAccessToken.php b/src/OpenWork/AuthorizerAccessToken.php
@@ -7,7 +7,6 @@
 use EasyWeChat\Kernel\Contracts\AccessToken as AccessTokenInterface;
 use EasyWeChat\Kernel\Contracts\RefreshableAccessToken;
 use EasyWeChat\Kernel\Exceptions\HttpException;
-use JetBrains\PhpStorm\ArrayShape;
 use Psr\SimpleCache\CacheInterface;
 use Stringable;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
@@ -58,7 +57,7 @@ public function __toString()
         return $this->getToken();
     }
 
-    #[ArrayShape(['access_token' => 'string'])]
+    #[\JetBrains\PhpStorm\ArrayShape(['access_token' => 'string'])]
     public function toQuery(): array
     {
         return ['access_token' => $this->getToken()];
diff --git a/src/OpenWork/Encryptor.php b/src/OpenWork/Encryptor.php
@@ -2,11 +2,9 @@
 
 namespace EasyWeChat\OpenWork;
 
-use JetBrains\PhpStorm\Pure;
-
 class Encryptor extends \EasyWeChat\Kernel\Encryptor
 {
-    #[Pure]
+    #[\JetBrains\PhpStorm\Pure]
     public function __construct(string $corpId, string $token, string $aesKey)
     {
         parent::__construct($corpId, $token, $aesKey, null);
diff --git a/src/OpenWork/ProviderAccessToken.php b/src/OpenWork/ProviderAccessToken.php
@@ -8,7 +8,6 @@
 
 use EasyWeChat\Kernel\Contracts\RefreshableAccessToken as RefreshableAccessTokenInterface;
 use EasyWeChat\Kernel\Exceptions\HttpException;
-use JetBrains\PhpStorm\ArrayShape;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Psr16Cache;
@@ -60,7 +59,7 @@ public function getToken(): string
     /**
      * @return array<string, string>
      */
-    #[ArrayShape(['provider_access_token' => 'string'])]
+    #[\JetBrains\PhpStorm\ArrayShape(['provider_access_token' => 'string'])]
     public function toQuery(): array
     {
         return ['provider_access_token' => $this->getToken()];
diff --git a/src/OpenWork/SuiteAccessToken.php b/src/OpenWork/SuiteAccessToken.php
diff --git a/src/OpenWork/SuiteEncryptor.php b/src/OpenWork/SuiteEncryptor.php
diff --git a/src/Pay/Client.php b/src/Pay/Client.php
diff --git a/src/Pay/Utils.php b/src/Pay/Utils.php
diff --git a/src/Work/AccessToken.php b/src/Work/AccessToken.php
diff --git a/src/Work/Encryptor.php b/src/Work/Encryptor.php
diff --git a/src/Work/JsApiTicket.php b/src/Work/JsApiTicket.php

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,6 @@ parameters:`
`57`	`57`	`-`
`58`	`58`	`message: '#Method EasyWeChat\\Pay\\Client::createMockClient\(\) should return Mockery\\Mock\\|Symfony\\Contracts\\HttpClient\\HttpClientInterface but returns Mockery\\LegacyMockInterface#'`
`59`	`59`	`path: src/Pay/Client.php`
`60`		`- -`
`61`		`- message: '#Call to function is_string\(\) with string will always evaluate to true#'`
`62`		`- path: src/Pay/Client.php`
`63`	`60`	`-`
`64`	`61`	`message: '#Parameter \#1 \$scopes of method Overtrue\\Socialite\\Providers\\Base::scopes\(\) expects array<string>#'`
`65`	`62`	`path: src/Work/Application.php`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`use EasyWeChat\Kernel\Contracts\Config as ConfigInterface;`
`9`	`9`	`use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;`
`10`	`10`	`use EasyWeChat\Kernel\Support\Arr;`
`11`		`-use JetBrains\PhpStorm\Pure;`
`12`	`11`
`13`	`12`	`use function strval;`
`14`	`13`
`@@ -33,7 +32,7 @@ public function __construct(`
`33`	`32`	`$this->checkMissingKeys();`
`34`	`33`	`}`
`35`	`34`
`36`		`- #[Pure]`
	`35`	`+ #[\JetBrains\PhpStorm\Pure]`
`37`	`36`	`public function has(string $key): bool`
`38`	`37`	`{`
`39`	`38`	`return Arr::has($this->items, $key);`
`@@ -42,7 +41,7 @@ public function has(string $key): bool`
`42`	`41`	`/**`
`43`	`42`	`* @param array<string>\|string $key`
`44`	`43`	`*/`
`45`		`- #[Pure]`
	`44`	`+ #[\JetBrains\PhpStorm\Pure]`
`46`	`45`	`public function get(array\|string $key, mixed $default = null): mixed`
`47`	`46`	`{`
`48`	`47`	`if (is_array($key)) {`
`@@ -56,7 +55,7 @@ public function get(array\|string $key, mixed $default = null): mixed`
`56`	`55`	`* @param array<string> $keys`
`57`	`56`	`* @return array<string, mixed>`
`58`	`57`	`*/`
`59`		`- #[Pure]`
	`58`	`+ #[\JetBrains\PhpStorm\Pure]`
`60`	`59`	`public function getMany(array $keys): array`
`61`	`60`	`{`
`62`	`61`	`$config = [];`
`@@ -85,13 +84,13 @@ public function all(): array`
`85`	`84`	`return $this->items;`
`86`	`85`	`}`
`87`	`86`
`88`		`- #[Pure]`
	`87`	`+ #[\JetBrains\PhpStorm\Pure]`
`89`	`88`	`public function offsetExists(mixed $offset): bool`
`90`	`89`	`{`
`91`	`90`	`return $this->has(strval($offset));`
`92`	`91`	`}`
`93`	`92`
`94`		`- #[Pure]`
	`93`	`+ #[\JetBrains\PhpStorm\Pure]`
`95`	`94`	`public function offsetGet(mixed $offset): mixed`
`96`	`95`	`{`
`97`	`96`	`return $this->get(strval($offset));`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace EasyWeChat\Kernel\Support;`
`4`	`4`
`5`		`-use JetBrains\PhpStorm\Pure;`
`6`		`-`
`7`	`5`	`use function file_exists;`
`8`	`6`	`use function file_get_contents;`
`9`	`7`	`use function str_starts_with;`
`@@ -31,7 +29,7 @@ public function getPassphrase(): ?string`
`31`	`29`	`return $this->passphrase;`
`32`	`30`	`}`
`33`	`31`
`34`		`- #[Pure]`
	`32`	`+ #[\JetBrains\PhpStorm\Pure]`
`35`	`33`	`public function __toString(): string`
`36`	`34`	`{`
`37`	`35`	`return $this->getKey();`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace EasyWeChat\Kernel\Traits;`
`4`	`4`
`5`		`-use JetBrains\PhpStorm\Pure;`
`6`	`5`	`use Mockery\Mock;`
`7`	`6`	`use Symfony\Component\HttpClient\DecoratorTrait;`
`8`	`7`	`use Symfony\Component\HttpClient\MockHttpClient;`
`@@ -53,13 +52,13 @@ public function __call(string $name, array $arguments): mixed`
`53`	`52`	`return $this->client->$name(...$arguments);`
`54`	`53`	`}`
`55`	`54`
`56`		`- #[Pure]`
	`55`	`+ #[\JetBrains\PhpStorm\Pure]`
`57`	`56`	`public function getRequestMethod(): string`
`58`	`57`	`{`
`59`	`58`	`return $this->mockResponse->getRequestMethod();`
`60`	`59`	`}`
`61`	`60`
`62`		`- #[Pure]`
	`61`	`+ #[\JetBrains\PhpStorm\Pure]`
`63`	`62`	`public function getRequestUrl(): string`
`64`	`63`	`{`
`65`	`64`	`return $this->mockResponse->getRequestUrl();`
`@@ -68,7 +67,7 @@ public function getRequestUrl(): string`
`68`	`67`	`/**`
`69`	`68`	`* @return array<string, mixed>`
`70`	`69`	`*/`
`71`		`- #[Pure]`
	`70`	`+ #[\JetBrains\PhpStorm\Pure]`
`72`	`71`	`public function getRequestOptions(): array`
`73`	`72`	`{`
`74`	`73`	`return $this->mockResponse->getRequestOptions();`