修复OpenWork中Authorization的错误引用 (#2584)

* fix: 修复单元测试错误

* fix: 修复OpenWork中Authorization的错误引用

* style: fix style

Co-authored-by: karlfzwang <karlfzwang@tencent.com>

src/Kernel/Config.php

@@ -9,6 +9,7 @@
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
 use EasyWeChat\Kernel\Support\Arr;
 use JetBrains\PhpStorm\Pure;
+
 use function join;
 use function strval;
 

src/Kernel/Encryptor.php

@@ -10,6 +10,7 @@
 use EasyWeChat\Kernel\Support\Xml;
 use Exception;
 use Throwable;
+
 use function base64_decode;
 use function base64_encode;
 use function implode;
@@ -24,6 +25,7 @@
 use function time;
 use function trim;
 use function unpack;
+
 use const OPENSSL_NO_PADDING;
 use const SORT_STRING;
 

src/Kernel/Form/File.php

@@ -5,12 +5,14 @@
 use EasyWeChat\Kernel\Exceptions\RuntimeException;
 use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Mime\Part\DataPart;
+
 use function file_put_contents;
 use function md5;
 use function pathinfo;
 use function strtolower;
 use function sys_get_temp_dir;
 use function tempnam;
+
 use const PATHINFO_EXTENSION;
 
 class File extends DataPart

src/Kernel/HttpClient/AccessTokenAwareClient.php

@@ -13,6 +13,7 @@
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+
 use function array_merge;
 
 /**

src/Kernel/HttpClient/RequestUtil.php

@@ -11,11 +11,13 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+
 use function array_key_exists;
 use function in_array;
 use function is_array;
 use function is_string;
 use function json_encode;
+
 use const ARRAY_FILTER_USE_KEY;
 use const JSON_FORCE_OBJECT;
 use const JSON_UNESCAPED_UNICODE;

src/Kernel/HttpClient/RequestWithPresets.php

@@ -7,6 +7,7 @@
 use EasyWeChat\Kernel\Form\File;
 use EasyWeChat\Kernel\Form\Form;
 use EasyWeChat\Kernel\Support\Str;
+
 use function array_merge;
 use function in_array;
 use function is_file;

src/Kernel/HttpClient/Response.php

@@ -24,6 +24,7 @@
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Throwable;
+
 use function array_key_exists;
 use function base64_encode;
 use function file_put_contents;
@@ -32,6 +33,7 @@
 use function str_contains;
 use function str_starts_with;
 use function strtolower;
+
 use const JSON_UNESCAPED_UNICODE;
 
 /**
@@ -186,7 +188,7 @@ public function toPsrResponse(ResponseFactoryInterface $responseFactory = null,
                 $responseFactory ??= $psr17Factory ?? Psr17FactoryDiscovery::findResponseFactory(); /** @phpstan-ignore-line */
                 $streamFactory ??= $psr17Factory ?? Psr17FactoryDiscovery::findStreamFactory(); /** @phpstan-ignore-line */
 
-            /** @phpstan-ignore-next-line */
+                /** @phpstan-ignore-next-line */
             } catch (NotFoundException $e) {
                 throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\HttplugClient" as no PSR-17 factories have been found. Try running "composer require nyholm/psr7".', 0, $e);
             }

src/Kernel/ServerResponse.php

@@ -5,13 +5,15 @@
 use JetBrains\PhpStorm\Pure;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
+
 use function array_keys;
 use function array_map;
 use function count;
 use function header;
 use function max;
 use function sprintf;
 use function ucwords;
+
 use const PHP_OUTPUT_HANDLER_CLEANABLE;
 use const PHP_OUTPUT_HANDLER_FLUSHABLE;
 use const PHP_OUTPUT_HANDLER_REMOVABLE;

src/Kernel/Support/AesCbc.php

@@ -4,9 +4,11 @@
 
 use EasyWeChat\Kernel\Contracts\Aes;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
+
 use function base64_decode;
 use function openssl_decrypt;
 use function openssl_error_string;
+
 use const OPENSSL_RAW_DATA;
 
 class AesCbc implements Aes

src/Kernel/Support/AesEcb.php

@@ -4,9 +4,11 @@
 
 use EasyWeChat\Kernel\Contracts\Aes;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
+
 use function base64_decode;
 use function openssl_decrypt;
 use function openssl_error_string;
+
 use const OPENSSL_RAW_DATA;
 
 class AesEcb implements Aes

src/Kernel/Support/AesGcm.php

@@ -4,11 +4,13 @@
 
 use EasyWeChat\Kernel\Contracts\Aes;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
+
 use function base64_decode;
 use function base64_encode;
 use function openssl_decrypt;
 use function openssl_encrypt;
 use function openssl_error_string;
+
 use const OPENSSL_RAW_DATA;
 
 class AesGcm implements Aes

src/Kernel/Support/Arr.php

@@ -5,6 +5,7 @@
 namespace EasyWeChat\Kernel\Support;
 
 use JetBrains\PhpStorm\Pure;
+
 use function is_string;
 
 class Arr

src/Kernel/Support/PrivateKey.php

@@ -3,6 +3,7 @@
 namespace EasyWeChat\Kernel\Support;
 
 use JetBrains\PhpStorm\Pure;
+
 use function file_exists;
 use function file_get_contents;
 use function str_starts_with;

src/Kernel/Support/PublicKey.php

@@ -3,6 +3,7 @@
 namespace EasyWeChat\Kernel\Support;
 
 use EasyWeChat\Kernel\Exceptions\InvalidConfigException;
+
 use function file_exists;
 use function file_get_contents;
 use function openssl_x509_parse;

src/Kernel/Support/Str.php

@@ -3,6 +3,7 @@
 namespace EasyWeChat\Kernel\Support;
 
 use Exception;
+
 use function base64_encode;
 use function preg_replace;
 use function random_bytes;

src/Kernel/Support/UserAgent.php

@@ -5,6 +5,7 @@
 namespace EasyWeChat\Kernel\Support;
 
 use Composer\InstalledVersions;
+
 use function array_map;
 use function array_unshift;
 use function class_exists;

src/Kernel/Support/Xml.php

@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use SimpleXMLElement;
+
 use function is_object;
 
 class Xml

src/Kernel/Traits/InteractWithConfig.php

@@ -7,6 +7,7 @@
 use EasyWeChat\Kernel\Config;
 use EasyWeChat\Kernel\Contracts\Config as ConfigInterface;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
+
 use function is_array;
 
 trait InteractWithConfig

src/Kernel/Traits/InteractWithHandlers.php

@@ -7,6 +7,7 @@
 use Closure;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
 use JetBrains\PhpStorm\ArrayShape;
+
 use function array_reverse;
 use function array_unshift;
 use function call_user_func;

src/Kernel/Traits/InteractWithHttpClient.php

@@ -8,6 +8,7 @@
 use Psr\Log\LoggerAwareInterface;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+
 use function property_exists;
 
 trait InteractWithHttpClient

src/Kernel/Traits/RespondXmlMessage.php

@@ -9,6 +9,7 @@
 use EasyWeChat\Kernel\Support\Xml;
 use Nyholm\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
+
 use function array_merge;
 use function is_array;
 use function is_callable;

src/MiniApp/Application.php

@@ -23,6 +23,7 @@
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\HttpClient\Response\AsyncContext;
 use Symfony\Component\HttpClient\RetryableHttpClient;
+
 use function array_merge;
 use function is_null;
 use function str_contains;

src/MiniApp/Decryptor.php

@@ -7,6 +7,7 @@
 use EasyWeChat\Kernel\Exceptions\DecryptException;
 use EasyWeChat\Kernel\Support\AesCbc;
 use Throwable;
+
 use function base64_decode;
 use function is_array;
 use function json_decode;

src/OfficialAccount/AccessToken.php

@@ -18,6 +18,7 @@
 use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+
 use function intval;
 use function is_string;
 use function json_encode;

src/OfficialAccount/Application.php

@@ -27,6 +27,7 @@
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\HttpClient\Response\AsyncContext;
 use Symfony\Component\HttpClient\RetryableHttpClient;
+
 use function array_merge;
 use function call_user_func;
 use function sprintf;

src/OfficialAccount/JsApiTicket.php

@@ -6,6 +6,7 @@
 
 use EasyWeChat\Kernel\Exceptions\HttpException;
 use JetBrains\PhpStorm\ArrayShape;
+
 use function sprintf;
 
 class JsApiTicket extends AccessToken

src/OfficialAccount/Utils.php

@@ -10,6 +10,7 @@
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+
 use function time;
 
 class Utils

src/OpenPlatform/Application.php

@@ -32,6 +32,7 @@
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+
 use function array_merge;
 use function is_string;
 use function md5;

src/OpenPlatform/Authorization.php

@@ -27,7 +27,7 @@ public function getAppId(): string
     public function getAccessToken(): AuthorizerAccessToken
     {
         return new AuthorizerAccessToken(
-        /** @phpstan-ignore-next-line */
+            /** @phpstan-ignore-next-line */
             $this->attributes['authorization_info']['authorizer_appid'] ?? '',
 
             /** @phpstan-ignore-next-line */

src/OpenPlatform/ComponentAccessToken.php

@@ -13,6 +13,7 @@
 use Symfony\Component\Cache\Psr16Cache;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+
 use function abs;
 use function intval;
 use function json_encode;

src/OpenPlatform/Server.php

@@ -18,6 +18,7 @@
 use Nyholm\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+
 use function func_get_args;
 
 class Server implements ServerInterface

src/OpenPlatform/VerifyTicket.php

@@ -10,6 +10,7 @@
 use Psr\SimpleCache\InvalidArgumentException;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Psr16Cache;
+
 use function is_string;
 use function sprintf;
 

src/OpenWork/Application.php

@@ -14,12 +14,12 @@
 use EasyWeChat\Kernel\Traits\InteractWithConfig;
 use EasyWeChat\Kernel\Traits\InteractWithHttpClient;
 use EasyWeChat\Kernel\Traits\InteractWithServerRequest;
-use EasyWeChat\OpenPlatform\Authorization;
 use EasyWeChat\OpenWork\Contracts\Account as AccountInterface;
 use EasyWeChat\OpenWork\Contracts\Application as ApplicationInterface;
 use EasyWeChat\OpenWork\Contracts\SuiteTicket as SuiteTicketInterface;
 use Overtrue\Socialite\Contracts\ProviderInterface as SocialiteProviderInterface;
 use Overtrue\Socialite\Providers\OpenWeWork;
+
 use function array_merge;
 
 class Application implements ApplicationInterface

src/OpenWork/ProviderAccessToken.php

@@ -12,7 +12,9 @@
 use Symfony\Component\Cache\Psr16Cache;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+
 use function intval;
+
 use const JSON_UNESCAPED_UNICODE;
 
 class ProviderAccessToken implements RefreshableAccessTokenInterface

src/OpenWork/Server.php

@@ -18,6 +18,7 @@
 use Nyholm\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+
 use function func_get_args;
 
 class Server implements ServerInterface

src/OpenWork/SuiteAccessToken.php

@@ -13,9 +13,11 @@
 use Symfony\Component\Cache\Psr16Cache;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+
 use function abs;
 use function intval;
 use function json_encode;
+
 use const JSON_UNESCAPED_UNICODE;
 
 class SuiteAccessToken implements RefreshableAccessTokenInterface

src/OpenWork/SuiteTicket.php

@@ -10,6 +10,7 @@
 use Psr\SimpleCache\InvalidArgumentException;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Psr16Cache;
+
 use function is_string;
 use function sprintf;
 

src/Pay/Client.php

@@ -26,6 +26,7 @@
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
+
 use function is_array;
 use function is_string;
 use function str_starts_with;

src/Pay/LegacySignature.php

@@ -8,6 +8,7 @@
 use EasyWeChat\Kernel\Exceptions\RuntimeException;
 use EasyWeChat\Kernel\Support\Str;
 use EasyWeChat\Pay\Contracts\Merchant as MerchantInterface;
+
 use function call_user_func_array;
 use function hash_hmac;
 use function http_build_query;

src/Pay/Merchant.php

@@ -9,6 +9,7 @@
 use EasyWeChat\Kernel\Support\PrivateKey;
 use EasyWeChat\Kernel\Support\PublicKey;
 use EasyWeChat\Pay\Contracts\Merchant as MerchantInterface;
+
 use function array_is_list;
 use function intval;
 use function is_string;