use constructor property promotion

Author: xabbuh

AbstractUriElement.php

@@ -20,7 +20,6 @@ abstract class AbstractUriElement
 {
     protected \DOMElement $node;
     protected ?string $method;
-    protected ?string $currentUri;
 
     /**
      * @param \DOMElement $node       A \DOMElement instance
@@ -29,11 +28,13 @@ abstract class AbstractUriElement
      *
      * @throws \InvalidArgumentException if the node is not a link
      */
-    public function __construct(\DOMElement $node, ?string $currentUri = null, ?string $method = 'GET')
-    {
+    public function __construct(
+        \DOMElement $node,
+        protected ?string $currentUri = null,
+        ?string $method = 'GET',
+    ) {
         $this->setNode($node);
         $this->method = $method ? strtoupper($method) : null;
-        $this->currentUri = $currentUri;
 
         $elementUriIsRelative = null === parse_url(trim($this->getRawUri()), \PHP_URL_SCHEME);
         $baseUriIsAbsolute = null !== $this->currentUri && \in_array(strtolower(substr($this->currentUri, 0, 4)), ['http', 'file']);

Crawler.php

@@ -23,8 +23,6 @@
  */
 class Crawler implements \Countable, \IteratorAggregate
 {
-    protected ?string $uri;
-
     /**
      * The default namespace prefix to be used with XPath and CSS expressions.
      */
@@ -60,9 +58,12 @@ class Crawler implements \Countable, \IteratorAggregate
     /**
      * @param \DOMNodeList|\DOMNode|\DOMNode[]|string|null $node A Node to use as the base for the crawling
      */
-    public function __construct(\DOMNodeList|\DOMNode|array|string|null $node = null, ?string $uri = null, ?string $baseHref = null, bool $useHtml5Parser = true)
-    {
-        $this->uri = $uri;
+    public function __construct(
+        \DOMNodeList|\DOMNode|array|string|null $node = null,
+        protected ?string $uri = null,
+        ?string $baseHref = null,
+        bool $useHtml5Parser = true,
+    ) {
         $this->baseHref = $baseHref ?: $uri;
         $this->html5Parser = $useHtml5Parser ? new HTML5(['disable_html_ns' => true]) : null;
         $this->cachedNamespaces = new \ArrayObject();

Field/FormField.php

@@ -18,7 +18,6 @@
  */
 abstract class FormField
 {
-    protected \DOMElement $node;
     protected string $name;
     protected string|array|null $value = null;
     protected \DOMDocument $document;
@@ -28,9 +27,9 @@ abstract class FormField
     /**
      * @param \DOMElement $node The node associated with this field
      */
-    public function __construct(\DOMElement $node)
-    {
-        $this->node = $node;
+    public function __construct(
+        protected \DOMElement $node,
+    ) {
         $this->name = $node->getAttribute('name');
         $this->xpath = new \DOMXPath($node->ownerDocument);
 

Form.php

@@ -23,7 +23,6 @@ class Form extends Link implements \ArrayAccess
 {
     private \DOMElement $button;
     private FormFieldRegistry $fields;
-    private ?string $baseHref;
 
     /**
      * @param \DOMElement $node       A \DOMElement instance
@@ -33,10 +32,13 @@ class Form extends Link implements \ArrayAccess
      *
      * @throws \LogicException if the node is not a button inside a form tag
      */
-    public function __construct(\DOMElement $node, ?string $currentUri = null, ?string $method = null, ?string $baseHref = null)
-    {
+    public function __construct(
+        \DOMElement $node,
+        ?string $currentUri = null,
+        ?string $method = null,
+        private ?string $baseHref = null,
+    ) {
         parent::__construct($node, $currentUri, $method);
-        $this->baseHref = $baseHref;
 
         $this->initialize();
     }

Test/Constraint/CrawlerAnySelectorTextContains.php

@@ -16,14 +16,12 @@
 
 final class CrawlerAnySelectorTextContains extends Constraint
 {
-    private string $selector;
-    private string $expectedText;
     private bool $hasNode = false;
 
-    public function __construct(string $selector, string $expectedText)
-    {
-        $this->selector = $selector;
-        $this->expectedText = $expectedText;
+    public function __construct(
+        private string $selector,
+        private string $expectedText,
+    ) {
     }
 
     public function toString(): string

Test/Constraint/CrawlerAnySelectorTextSame.php

@@ -16,13 +16,10 @@
 
 final class CrawlerAnySelectorTextSame extends Constraint
 {
-    private string $selector;
-    private string $expectedText;
-
-    public function __construct(string $selector, string $expectedText)
-    {
-        $this->selector = $selector;
-        $this->expectedText = $expectedText;
+    public function __construct(
+        private string $selector,
+        private string $expectedText,
+    ) {
     }
 
     public function toString(): string

Test/Constraint/CrawlerSelectorAttributeValueSame.php

@@ -16,15 +16,11 @@
 
 final class CrawlerSelectorAttributeValueSame extends Constraint
 {
-    private string $selector;
-    private string $attribute;
-    private string $expectedText;
-
-    public function __construct(string $selector, string $attribute, string $expectedText)
-    {
-        $this->selector = $selector;
-        $this->attribute = $attribute;
-        $this->expectedText = $expectedText;
+    public function __construct(
+        private string $selector,
+        private string $attribute,
+        private string $expectedText,
+    ) {
     }
 
     public function toString(): string

Test/Constraint/CrawlerSelectorExists.php

@@ -16,11 +16,10 @@
 
 final class CrawlerSelectorExists extends Constraint
 {
-    private string $selector;
 
-    public function __construct(string $selector)
-    {
-        $this->selector = $selector;
+    public function __construct(
+        private string $selector,
+    ) {
     }
 
     public function toString(): string

Test/Constraint/CrawlerSelectorTextContains.php

@@ -16,15 +16,13 @@
 
 final class CrawlerSelectorTextContains extends Constraint
 {
-    private string $selector;
-    private string $expectedText;
     private bool $hasNode = false;
     private string $nodeText;
 
-    public function __construct(string $selector, string $expectedText)
-    {
-        $this->selector = $selector;
-        $this->expectedText = $expectedText;
+    public function __construct(
+        private string $selector,
+        private string $expectedText,
+    ) {
     }
 
     public function toString(): string

Test/Constraint/CrawlerSelectorTextSame.php

@@ -16,13 +16,10 @@
 
 final class CrawlerSelectorTextSame extends Constraint
 {
-    private string $selector;
-    private string $expectedText;
-
-    public function __construct(string $selector, string $expectedText)
-    {
-        $this->selector = $selector;
-        $this->expectedText = $expectedText;
+    public function __construct(
+        private string $selector,
+        private string $expectedText,
+    ) {
     }
 
     public function toString(): string