minor #57281 [HtmlSanitizer][HttpClient][HttpFoundation][Ldap][Lock][PropertyInfo] use constructor property promotion (xabbuh)

This PR was merged into the 7.2 branch.

Discussion
----------

[HtmlSanitizer][HttpClient][HttpFoundation][Ldap][Lock][PropertyInfo]  use constructor property promotion

| Q             | A
| ------------- | ---
| Branch?       | 7.2
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Issues        |
| License       | MIT

Commits
-------

557641cd88 use constructor property promotion

Author: fabpot

CachingHttpClient.php

@@ -35,17 +35,18 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface
 {
     use HttpClientTrait;
 
-    private HttpClientInterface $client;
     private HttpCache $cache;
     private array $defaultOptions = self::OPTIONS_DEFAULTS;
 
-    public function __construct(HttpClientInterface $client, StoreInterface $store, array $defaultOptions = [])
-    {
+    public function __construct(
+        private HttpClientInterface $client,
+        StoreInterface $store,
+        array $defaultOptions = [],
+    ) {
         if (!class_exists(HttpClientKernel::class)) {
             throw new \LogicException(sprintf('Using "%s" requires that the HttpKernel component version 4.3 or higher is installed, try running "composer require symfony/http-kernel:^5.4".', __CLASS__));
         }
 
-        $this->client = $client;
         $kernel = new HttpClientKernel($client);
         $this->cache = new HttpCache($kernel, $store, null, $defaultOptions);
 

EventSourceHttpClient.php

@@ -31,12 +31,11 @@ final class EventSourceHttpClient implements HttpClientInterface, ResetInterface
         AsyncDecoratorTrait::withOptions insteadof HttpClientTrait;
     }
 
-    private float $reconnectionTime;
-
-    public function __construct(?HttpClientInterface $client = null, float $reconnectionTime = 10.0)
-    {
+    public function __construct(
+        ?HttpClientInterface $client = null,
+        private float $reconnectionTime = 10.0,
+    ) {
         $this->client = $client ?? HttpClient::create();
-        $this->reconnectionTime = $reconnectionTime;
     }
 
     public function connect(string $url, array $options = [], string $method = 'GET'): ResponseInterface

HttpClientTrait.php

@@ -16,7 +16,6 @@
 use Symfony\Component\HttpClient\Response\StreamableInterface;
 use Symfony\Component\HttpClient\Response\StreamWrapper;
 use Symfony\Component\Mime\MimeTypes;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * Provides the common logic from writing HttpClientInterface implementations.

NoPrivateNetworkHttpClient.php

@@ -30,21 +30,17 @@ final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwa
 {
     use HttpClientTrait;
 
-    private HttpClientInterface $client;
-    private string|array|null $subnets;
-
     /**
      * @param string|array|null $subnets String or array of subnets using CIDR notation that will be used by IpUtils.
      *                                   If null is passed, the standard private subnets will be used.
      */
-    public function __construct(HttpClientInterface $client, string|array|null $subnets = null)
-    {
+    public function __construct(
+        private HttpClientInterface $client,
+        private string|array|null $subnets = null,
+    ) {
         if (!class_exists(IpUtils::class)) {
             throw new \LogicException(sprintf('You cannot use "%s" if the HttpFoundation component is not installed. Try running "composer require symfony/http-foundation".', __CLASS__));
         }
-
-        $this->client = $client;
-        $this->subnets = $subnets;
     }
 
     public function request(string $method, string $url, array $options = []): ResponseInterface

Psr18Client.php

@@ -182,12 +182,11 @@ public function reset(): void
  */
 class Psr18NetworkException extends \RuntimeException implements NetworkExceptionInterface
 {
-    private RequestInterface $request;
-
-    public function __construct(TransportExceptionInterface $e, RequestInterface $request)
-    {
+    public function __construct(
+        TransportExceptionInterface $e,
+        private RequestInterface $request,
+    ) {
         parent::__construct($e->getMessage(), 0, $e);
-        $this->request = $request;
     }
 
     public function getRequest(): RequestInterface
@@ -201,12 +200,11 @@ public function getRequest(): RequestInterface
  */
 class Psr18RequestException extends \InvalidArgumentException implements RequestExceptionInterface
 {
-    private RequestInterface $request;
-
-    public function __construct(TransportExceptionInterface $e, RequestInterface $request)
-    {
+    public function __construct(
+        TransportExceptionInterface $e,
+        private RequestInterface $request,
+    ) {
         parent::__construct($e->getMessage(), 0, $e);
-        $this->request = $request;
     }
 
     public function getRequest(): RequestInterface

Response/AsyncContext.php

@@ -27,24 +27,23 @@ final class AsyncContext
 {
     /** @var callable|null */
     private $passthru;
-    private HttpClientInterface $client;
     private ResponseInterface $response;
     private array $info = [];
-    /** @var resource|null */
-    private $content;
-    private int $offset;
 
     /**
      * @param resource|null $content
      */
-    public function __construct(?callable &$passthru, HttpClientInterface $client, ResponseInterface &$response, array &$info, $content, int $offset)
-    {
+    public function __construct(
+        ?callable &$passthru,
+        private HttpClientInterface $client,
+        ResponseInterface &$response,
+        array &$info,
+        private $content,
+        private int $offset,
+    ) {
         $this->passthru = &$passthru;
-        $this->client = $client;
         $this->response = &$response;
         $this->info = &$info;
-        $this->content = $content;
-        $this->offset = $offset;
     }
 
     /**

Retry/GenericRetryStrategy.php

@@ -36,11 +36,6 @@ class GenericRetryStrategy implements RetryStrategyInterface
         510 => self::IDEMPOTENT_METHODS,
     ];
 
-    private int $delayMs;
-    private float $multiplier;
-    private int $maxDelayMs;
-    private float $jitter;
-
     /**
      * @param array $statusCodes List of HTTP status codes that trigger a retry
      * @param int   $delayMs     Amount of time to delay (or the initial value when multiplier is used)
@@ -50,30 +45,26 @@ class GenericRetryStrategy implements RetryStrategyInterface
      */
     public function __construct(
         private array $statusCodes = self::DEFAULT_RETRY_STATUS_CODES,
-        int $delayMs = 1000,
-        float $multiplier = 2.0,
-        int $maxDelayMs = 0,
-        float $jitter = 0.1,
+        private int $delayMs = 1000,
+        private float $multiplier = 2.0,
+        private int $maxDelayMs = 0,
+        private float $jitter = 0.1,
     ) {
         if ($delayMs < 0) {
             throw new InvalidArgumentException(sprintf('Delay must be greater than or equal to zero: "%s" given.', $delayMs));
         }
-        $this->delayMs = $delayMs;
 
         if ($multiplier < 1) {
             throw new InvalidArgumentException(sprintf('Multiplier must be greater than or equal to one: "%s" given.', $multiplier));
         }
-        $this->multiplier = $multiplier;
 
         if ($maxDelayMs < 0) {
             throw new InvalidArgumentException(sprintf('Max delay must be greater than or equal to zero: "%s" given.', $maxDelayMs));
         }
-        $this->maxDelayMs = $maxDelayMs;
 
         if ($jitter < 0 || $jitter > 1) {
             throw new InvalidArgumentException(sprintf('Jitter must be between 0 and 1: "%s" given.', $jitter));
         }
-        $this->jitter = $jitter;
     }
 
     public function shouldRetry(AsyncContext $context, ?string $responseContent, ?TransportExceptionInterface $exception): ?bool

RetryableHttpClient.php

@@ -32,19 +32,19 @@ class RetryableHttpClient implements HttpClientInterface, ResetInterface
     use AsyncDecoratorTrait;
 
     private RetryStrategyInterface $strategy;
-    private int $maxRetries;
-    private ?LoggerInterface $logger;
     private array $baseUris = [];
 
     /**
      * @param int $maxRetries The maximum number of times to retry
      */
-    public function __construct(HttpClientInterface $client, ?RetryStrategyInterface $strategy = null, int $maxRetries = 3, ?LoggerInterface $logger = null)
-    {
+    public function __construct(
+        HttpClientInterface $client,
+        ?RetryStrategyInterface $strategy = null,
+        private int $maxRetries = 3,
+        private ?LoggerInterface $logger = null,
+    ) {
         $this->client = $client;
         $this->strategy = $strategy ?? new GenericRetryStrategy();
-        $this->maxRetries = $maxRetries;
-        $this->logger = $logger;
     }
 
     public function withOptions(array $options): static

ScopingHttpClient.php

@@ -28,16 +28,11 @@ class ScopingHttpClient implements HttpClientInterface, ResetInterface, LoggerAw
 {
     use HttpClientTrait;
 
-    private HttpClientInterface $client;
-    private array $defaultOptionsByRegexp;
-    private ?string $defaultRegexp;
-
-    public function __construct(HttpClientInterface $client, array $defaultOptionsByRegexp, ?string $defaultRegexp = null)
-    {
-        $this->client = $client;
-        $this->defaultOptionsByRegexp = $defaultOptionsByRegexp;
-        $this->defaultRegexp = $defaultRegexp;
-
+    public function __construct(
+        private HttpClientInterface $client,
+        private array $defaultOptionsByRegexp,
+        private ?string $defaultRegexp = null,
+    ) {
         if (null !== $defaultRegexp && !isset($defaultOptionsByRegexp[$defaultRegexp])) {
             throw new InvalidArgumentException(sprintf('No options are mapped to the provided "%s" default regexp.', $defaultRegexp));
         }

Tests/AsyncDecoratorTraitTest.php

@@ -41,11 +41,10 @@ protected function getHttpClient(string $testCase, ?\Closure $chunkFilter = null
         return new class($decoratedClient ?? parent::getHttpClient($testCase), $chunkFilter) implements HttpClientInterface {
             use AsyncDecoratorTrait;
 
-            private ?\Closure $chunkFilter;
-
-            public function __construct(HttpClientInterface $client, ?\Closure $chunkFilter = null)
-            {
-                $this->chunkFilter = $chunkFilter;
+            public function __construct(
+                HttpClientInterface $client,
+                private ?\Closure $chunkFilter = null,
+            ) {
                 $this->client = $client;
             }