use constructor property promotion

Author: xabbuh

src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php

@@ -22,16 +22,17 @@
  */
 final class HtmlSanitizer implements HtmlSanitizerInterface
 {
-    private HtmlSanitizerConfig $config;
     private ParserInterface $parser;
 
     /**
      * @var array<string, DomVisitor>
      */
     private array $domVisitors = [];
 
-    public function __construct(HtmlSanitizerConfig $config, ?ParserInterface $parser = null)
-    {
+    public function __construct(
+        private HtmlSanitizerConfig $config,
+        ?ParserInterface $parser = null,
+    ) {
         $this->config = $config;
         $this->parser = $parser ?? new MastermindsParser();
     }

src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php

@@ -33,19 +33,6 @@
  */
 final class DomVisitor
 {
-    private HtmlSanitizerConfig $config;
-
-    /**
-     * Registry of allowed/blocked elements:
-     * * If an element is present as a key and contains an array, the element should be allowed
-     *   and the array is the list of allowed attributes.
-     * * If an element is present as a key and contains "false", the element should be blocked.
-     * * If an element is not present as a key, the element should be dropped.
-     *
-     * @var array<string, false|array<string, bool>>
-     */
-    private array $elementsConfig;
-
     /**
      * Registry of attributes to forcefully set on nodes, index by element and attribute.
      *
@@ -62,12 +49,16 @@ final class DomVisitor
     private array $attributeSanitizers = [];
 
     /**
-     * @param array<string, false|array<string, bool>> $elementsConfig
+     * @param array<string, false|array<string, bool>> $elementsConfig Registry of allowed/blocked elements:
+     *                                                                 * If an element is present as a key and contains an array, the element should be allowed
+     *                                                                   and the array is the list of allowed attributes.
+     *                                                                 * If an element is present as a key and contains "false", the element should be blocked.
+     *                                                                 * If an element is not present as a key, the element should be dropped.
      */
-    public function __construct(HtmlSanitizerConfig $config, array $elementsConfig)
-    {
-        $this->config = $config;
-        $this->elementsConfig = $elementsConfig;
+    public function __construct(
+        private HtmlSanitizerConfig $config,
+        private array $elementsConfig,
+    ) {
         $this->forcedAttributes = $config->getForcedAttributes();
 
         foreach ($config->getAttributeSanitizers() as $attributeSanitizer) {

src/Symfony/Component/HtmlSanitizer/Visitor/Node/BlockedNode.php

@@ -16,12 +16,11 @@
  */
 final class BlockedNode implements NodeInterface
 {
-    private NodeInterface $parentNode;
     private array $children = [];
 
-    public function __construct(NodeInterface $parentNode)
-    {
-        $this->parentNode = $parentNode;
+    public function __construct(
+        private NodeInterface $parentNode,
+    ) {
     }
 
     public function addChild(NodeInterface $node): void

src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php

@@ -37,15 +37,13 @@ final class Node implements NodeInterface
         'wbr' => true,
     ];
 
-    private NodeInterface $parent;
-    private string $tagName;
     private array $attributes = [];
     private array $children = [];
 
-    public function __construct(NodeInterface $parent, string $tagName)
-    {
-        $this->parent = $parent;
-        $this->tagName = $tagName;
+    public function __construct(
+        private NodeInterface $parent,
+        private string $tagName,
+    ) {
     }
 
     public function getParent(): ?NodeInterface

src/Symfony/Component/HttpClient/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);
 

src/Symfony/Component/HttpClient/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

src/Symfony/Component/HttpClient/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.

src/Symfony/Component/HttpClient/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

src/Symfony/Component/HttpClient/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

src/Symfony/Component/HttpClient/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;
     }
 
     /**