[DomCrawler] Add types to private properties

Author: derrabus

Crawler.php

@@ -28,53 +28,35 @@ class Crawler implements \Countable, \IteratorAggregate
 
     /**
      * The default namespace prefix to be used with XPath and CSS expressions.
-     *
-     * @var string
      */
-    private $defaultNamespacePrefix = 'default';
+    private string $defaultNamespacePrefix = 'default';
 
     /**
      * A map of manually registered namespaces.
      *
      * @var array<string, string>
      */
-    private $namespaces = [];
+    private array $namespaces = [];
 
     /**
      * A map of cached namespaces.
-     *
-     * @var \ArrayObject
-     */
-    private $cachedNamespaces;
-
-    /**
-     * The base href value.
-     *
-     * @var string|null
      */
-    private $baseHref;
+    private \ArrayObject $cachedNamespaces;
 
-    /**
-     * @var \DOMDocument|null
-     */
-    private $document;
+    private ?string $baseHref;
+    private ?\DOMDocument $document = null;
 
     /**
      * @var \DOMNode[]
      */
-    private $nodes = [];
+    private array $nodes = [];
 
     /**
      * Whether the Crawler contains HTML or XML content (used when converting CSS to XPath).
-     *
-     * @var bool
      */
-    private $isHtml = true;
+    private bool $isHtml = true;
 
-    /**
-     * @var HTML5|null
-     */
-    private $html5Parser;
+    private ?HTML5 $html5Parser;
 
     /**
      * @param \DOMNodeList|\DOMNode|\DOMNode[]|string|null $node A Node to use as the base for the crawling

Field/ChoiceFormField.php

@@ -20,22 +20,10 @@
  */
 class ChoiceFormField extends FormField
 {
-    /**
-     * @var string
-     */
-    private $type;
-    /**
-     * @var bool
-     */
-    private $multiple;
-    /**
-     * @var array
-     */
-    private $options;
-    /**
-     * @var bool
-     */
-    private $validationDisabled = false;
+    private string $type;
+    private bool $multiple;
+    private array $options;
+    private bool $validationDisabled = false;
 
     /**
      * Returns true if the field should be included in the submitted values.

Form.php

@@ -21,20 +21,9 @@
  */
 class Form extends Link implements \ArrayAccess
 {
-    /**
-     * @var \DOMElement
-     */
-    private $button;
-
-    /**
-     * @var FormFieldRegistry
-     */
-    private $fields;
-
-    /**
-     * @var string
-     */
-    private $baseHref;
+    private \DOMElement $button;
+    private FormFieldRegistry $fields;
+    private ?string $baseHref;
 
     /**
      * @param \DOMElement $node       A \DOMElement instance

FormFieldRegistry.php

@@ -20,9 +20,8 @@
  */
 class FormFieldRegistry
 {
-    private $fields = [];
-
-    private $base = '';
+    private array $fields = [];
+    private string $base = '';
 
     /**
      * Adds a field to the registry.

Test/Constraint/CrawlerSelectorAttributeValueSame.php

@@ -16,9 +16,9 @@
 
 final class CrawlerSelectorAttributeValueSame extends Constraint
 {
-    private $selector;
-    private $attribute;
-    private $expectedText;
+    private string $selector;
+    private string $attribute;
+    private string $expectedText;
 
     public function __construct(string $selector, string $attribute, string $expectedText)
     {

Test/Constraint/CrawlerSelectorExists.php

@@ -16,7 +16,7 @@
 
 final class CrawlerSelectorExists extends Constraint
 {
-    private $selector;
+    private string $selector;
 
     public function __construct(string $selector)
     {

Test/Constraint/CrawlerSelectorTextContains.php

@@ -16,8 +16,8 @@
 
 final class CrawlerSelectorTextContains extends Constraint
 {
-    private $selector;
-    private $expectedText;
+    private string $selector;
+    private string $expectedText;
 
     public function __construct(string $selector, string $expectedText)
     {

Test/Constraint/CrawlerSelectorTextSame.php

@@ -16,8 +16,8 @@
 
 final class CrawlerSelectorTextSame extends Constraint
 {
-    private $selector;
-    private $expectedText;
+    private string $selector;
+    private string $expectedText;
 
     public function __construct(string $selector, string $expectedText)
     {