use constructor property promotion

Author: xabbuh

AcceptHeaderItem.php

@@ -18,14 +18,14 @@
  */
 class AcceptHeaderItem
 {
-    private string $value;
     private float $quality = 1.0;
     private int $index = 0;
     private array $attributes = [];
 
-    public function __construct(string $value, array $attributes = [])
-    {
-        $this->value = $value;
+    public function __construct(
+        private string $value,
+        array $attributes = [],
+    ) {
         foreach ($attributes as $name => $value) {
             $this->setAttribute($name, $value);
         }

Cookie.php

@@ -22,17 +22,10 @@ class Cookie
     public const SAMESITE_LAX = 'lax';
     public const SAMESITE_STRICT = 'strict';
 
-    protected string $name;
-    protected ?string $value;
-    protected ?string $domain;
     protected int $expire;
     protected string $path;
-    protected ?bool $secure;
-    protected bool $httpOnly;
 
-    private bool $raw;
     private ?string $sameSite = null;
-    private bool $partitioned = false;
     private bool $secureDefault = false;
 
     private const RESERVED_CHARS_LIST = "=,; \t\r\n\v\f";
@@ -94,8 +87,18 @@ public static function create(string $name, ?string $value = null, int|string|\D
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(string $name, ?string $value = null, int|string|\DateTimeInterface $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false)
-    {
+    public function __construct(
+        protected string $name,
+        protected ?string $value = null,
+        int|string|\DateTimeInterface $expire = 0,
+        ?string $path = '/',
+        protected ?string $domain = null,
+        protected ?bool $secure = null,
+        protected bool $httpOnly = true,
+        private bool $raw = false,
+        ?string $sameSite = self::SAMESITE_LAX,
+        private bool $partitioned = false,
+    ) {
         // from PHP source code
         if ($raw && false !== strpbrk($name, self::RESERVED_CHARS_LIST)) {
             throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $name));
@@ -105,16 +108,9 @@ public function __construct(string $name, ?string $value = null, int|string|\Dat
             throw new \InvalidArgumentException('The cookie name cannot be empty.');
         }
 
-        $this->name = $name;
-        $this->value = $value;
-        $this->domain = $domain;
         $this->expire = self::expiresTimestamp($expire);
         $this->path = $path ?: '/';
-        $this->secure = $secure;
-        $this->httpOnly = $httpOnly;
-        $this->raw = $raw;
         $this->sameSite = $this->withSameSite($sameSite)->sameSite;
-        $this->partitioned = $partitioned;
     }
 
     /**

File/UploadedFile.php

@@ -31,7 +31,6 @@
  */
 class UploadedFile extends File
 {
-    private bool $test;
     private string $originalName;
     private string $mimeType;
     private int $error;
@@ -61,13 +60,17 @@ class UploadedFile extends File
      * @throws FileException         If file_uploads is disabled
      * @throws FileNotFoundException If the file does not exist
      */
-    public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $error = null, bool $test = false)
-    {
+    public function __construct(
+        string $path,
+        string $originalName,
+        ?string $mimeType = null,
+        ?int $error = null,
+        private bool $test = false,
+    ) {
         $this->originalName = $this->getName($originalName);
         $this->originalPath = strtr($originalName, '\\', '/');
         $this->mimeType = $mimeType ?: 'application/octet-stream';
         $this->error = $error ?: \UPLOAD_ERR_OK;
-        $this->test = $test;
 
         parent::__construct($path, \UPLOAD_ERR_OK === $this->error);
     }

ParameterBag.php

@@ -23,11 +23,9 @@
  */
 class ParameterBag implements \IteratorAggregate, \Countable
 {
-    protected array $parameters;
-
-    public function __construct(array $parameters = [])
-    {
-        $this->parameters = $parameters;
+    public function __construct(
+        protected array $parameters = [],
+    ) {
     }
 
     /**

Session/Attribute/AttributeBag.php

@@ -21,14 +21,13 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
     protected array $attributes = [];
 
     private string $name = 'attributes';
-    private string $storageKey;
 
     /**
      * @param string $storageKey The key used to store attributes in the session
      */
-    public function __construct(string $storageKey = '_sf2_attributes')
-    {
-        $this->storageKey = $storageKey;
+    public function __construct(
+        private string $storageKey = '_sf2_attributes',
+    ) {
     }
 
     public function getName(): string

Session/Flash/AutoExpireFlashBag.php

@@ -20,14 +20,13 @@ class AutoExpireFlashBag implements FlashBagInterface
 {
     private string $name = 'flashes';
     private array $flashes = ['display' => [], 'new' => []];
-    private string $storageKey;
 
     /**
      * @param string $storageKey The key used to store flashes in the session
      */
-    public function __construct(string $storageKey = '_symfony_flashes')
-    {
-        $this->storageKey = $storageKey;
+    public function __construct(
+        private string $storageKey = '_symfony_flashes',
+    ) {
     }
 
     public function getName(): string

Session/Flash/FlashBag.php

@@ -20,14 +20,13 @@ class FlashBag implements FlashBagInterface
 {
     private string $name = 'flashes';
     private array $flashes = [];
-    private string $storageKey;
 
     /**
      * @param string $storageKey The key used to store flashes in the session
      */
-    public function __construct(string $storageKey = '_symfony_flashes')
-    {
-        $this->storageKey = $storageKey;
+    public function __construct(
+        private string $storageKey = '_symfony_flashes',
+    ) {
     }
 
     public function getName(): string

Session/SessionBagProxy.php

@@ -18,13 +18,16 @@
  */
 final class SessionBagProxy implements SessionBagInterface
 {
-    private SessionBagInterface $bag;
     private array $data;
     private ?int $usageIndex;
     private ?\Closure $usageReporter;
 
-    public function __construct(SessionBagInterface $bag, array &$data, ?int &$usageIndex, ?callable $usageReporter)
-    {
+    public function __construct(
+        private SessionBagInterface $bag,
+        array &$data,
+        ?int &$usageIndex,
+        ?callable $usageReporter,
+    ) {
         $this->bag = $bag;
         $this->data = &$data;
         $this->usageIndex = &$usageIndex;

Session/SessionFactory.php

@@ -22,14 +22,13 @@ class_exists(Session::class);
  */
 class SessionFactory implements SessionFactoryInterface
 {
-    private RequestStack $requestStack;
-    private SessionStorageFactoryInterface $storageFactory;
     private ?\Closure $usageReporter;
 
-    public function __construct(RequestStack $requestStack, SessionStorageFactoryInterface $storageFactory, ?callable $usageReporter = null)
-    {
-        $this->requestStack = $requestStack;
-        $this->storageFactory = $storageFactory;
+    public function __construct(
+        private RequestStack $requestStack,
+        private SessionStorageFactoryInterface $storageFactory,
+        ?callable $usageReporter = null,
+    ) {
         $this->usageReporter = null === $usageReporter ? null : $usageReporter(...);
     }
 

Session/Storage/Handler/MarshallingSessionHandler.php

@@ -18,13 +18,10 @@
  */
 class MarshallingSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
 {
-    private AbstractSessionHandler $handler;
-    private MarshallerInterface $marshaller;
-
-    public function __construct(AbstractSessionHandler $handler, MarshallerInterface $marshaller)
-    {
-        $this->handler = $handler;
-        $this->marshaller = $marshaller;
+    public function __construct(
+        private AbstractSessionHandler $handler,
+        private MarshallerInterface $marshaller,
+    ) {
     }
 
     public function open(string $savePath, string $name): bool