Symfony components 7.x #2787

composer.json

@@ -28,11 +28,11 @@
     "overtrue/socialite": "^3.5.4|^4.0.1",
     "psr/simple-cache": "^1.0|^2.0|^3.0",
     "psr/http-client": "^1.0",
-    "symfony/cache": "^5.4|^6.0",
-    "symfony/http-foundation": "^5.4|^6.0",
+    "symfony/cache": "^5.4|^6.0|^7.0",
+    "symfony/http-foundation": "^5.4|^6.0|^7.0",
     "symfony/psr-http-message-bridge": "^2.1.2|^6.4.0",
-    "symfony/http-client": "^5.4|^6.0",
-    "symfony/mime": "^5.4|^6.0",
+    "symfony/http-client": "^5.4|^6.0|^7.0",
+    "symfony/mime": "^5.4|^6.0|^7.0",
     "symfony/polyfill-php81": "^1.25",
     "thenorthmemory/xml": "^1.0"
   },
@@ -93,7 +93,8 @@
   },
   "config": {
     "allow-plugins": {
-      "composer/package-versions-deprecated": true
+      "composer/package-versions-deprecated": true,
+      "php-http/discovery": true
     }
   }
 }

src/Kernel/Config.php

@@ -54,7 +54,7 @@ public function get(array|string $key, mixed $default = null): mixed
 
     /**
      * @param  array<string>  $keys
-     * @return  array<string, mixed>
+     * @return array<string, mixed>
      */
     #[Pure]
     public function getMany(array $keys): array
@@ -78,7 +78,7 @@ public function set(string $key, mixed $value = null): void
     }
 
     /**
-     * @return  array<string, mixed>
+     * @return array<string, mixed>
      */
     public function all(): array
     {

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,11 +38,11 @@ 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 (null === $contentType) {
+        if ($contentType === null) {
             $mimeTypes = new MimeTypes();
 
             if ($filename) {
@@ -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/Form/Form.php

@@ -24,7 +24,7 @@ public static function create(array $fields): Form
     }
 
     /**
-     * @return  array<string,mixed>
+     * @return array<string,mixed>
      */
     #[ArrayShape(['headers' => 'array', 'body' => 'string'])]
     public function toArray(): array

src/Kernel/HttpClient/AccessTokenAwareClient.php

@@ -27,12 +27,12 @@ class AccessTokenAwareClient implements AccessTokenAwareHttpClientInterface
 {
     use AsyncDecoratorTrait;
     use HttpClientMethods;
-    use RetryableClient;
     use MockableHttpClient;
     use RequestWithPresets;
+    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

@@ -41,7 +41,7 @@
  *
  * @see \Symfony\Contracts\HttpClient\ResponseInterface
  */
-class Response implements Jsonable, Arrayable, ArrayAccess, ResponseInterface, StreamableInterface
+class Response implements Arrayable, ArrayAccess, Jsonable, ResponseInterface, StreamableInterface
 {
     public function __construct(
         protected ResponseInterface $response,
@@ -98,7 +98,7 @@ public function isFailed(): bool
         }
 
         try {
-            return 400 <= $this->getStatusCode();
+            return $this->getStatusCode() >= 400;
         } catch (Throwable $e) {
             return true;
         }
@@ -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,11 +175,11 @@ 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;
 
-        if (null === $responseFactory || null === $streamFactory) {
+        if ($responseFactory === null || $streamFactory === null) {
             if (! class_exists(Psr17Factory::class) && ! class_exists(Psr17FactoryDiscovery::class)) {
                 throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\Psr18Client" as no PSR-17 factories have been provided. Try running "composer require nyholm/psr7".');
             }
@@ -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

@@ -12,11 +12,12 @@
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
-class ScopingHttpClient implements HttpClientInterface, ResetInterface, LoggerAwareInterface
+class ScopingHttpClient implements HttpClientInterface, LoggerAwareInterface, ResetInterface
 {
     use HttpClientTrait;
 
     private HttpClientInterface $client;
+
     private array $defaultOptionsByRegexp;
 
     public function __construct(HttpClientInterface $client, array $defaultOptionsByRegexp)
@@ -37,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/Message.php

@@ -18,7 +18,7 @@
  *
  * @implements ArrayAccess<array-key, mixed>
  */
-abstract class Message implements ArrayAccess, Jsonable, \JsonSerializable
+abstract class Message implements \JsonSerializable, ArrayAccess, Jsonable
 {
     use HasAttributes;
 
@@ -47,14 +47,14 @@ public static function createFromRequest(ServerRequestInterface $request): Messa
      */
     public static function format(string $originContent): array
     {
-        if (0 === stripos($originContent, '<')) {
+        if (stripos($originContent, '<') === 0) {
             $attributes = Xml::parse($originContent);
         }
 
         // Handle JSON format.
         $dataSet = json_decode($originContent, true);
 
-        if (JSON_ERROR_NONE === json_last_error() && $originContent) {
+        if (json_last_error() === JSON_ERROR_NONE && $originContent) {
             $attributes = $dataSet;
         }
 

src/Kernel/ServerResponse.php

@@ -134,7 +134,7 @@ public function sendHeaders(): static
         }
 
         foreach ($this->getHeaders() as $name => $values) {
-            $replace = 0 === \strcasecmp($name, 'Content-Type');
+            $replace = \strcasecmp($name, 'Content-Type') === 0;
 
             foreach ($values as $value) {
                 header($name.': '.$value, $replace, $this->getStatusCode());

src/Kernel/Support/AesCbc.php

@@ -16,11 +16,11 @@ 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);
 
-        if (false === $ciphertext) {
+        if ($ciphertext === false) {
             throw new InvalidArgumentException(openssl_error_string() ?: 'Encrypt AES CBC error.');
         }
 
@@ -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),
@@ -40,7 +40,7 @@ public static function decrypt(string $ciphertext, string $key, string $iv = nul
             (string) $iv
         );
 
-        if (false === $plaintext) {
+        if ($plaintext === false) {
             throw new InvalidArgumentException(openssl_error_string() ?: 'Decrypt AES CBC error.');
         }