Merge branch '5.3' into 5.4

derrabus · derrabus · commit 402901cbdfa4 · 2021-07-07T19:16:39.000+01:00
* 5.3:
  [DomCrawler] Backport type fixes
diff --git a/src/Symfony/Component/DomCrawler/AbstractUriElement.php b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
@@ -35,7 +35,7 @@ abstract class AbstractUriElement
 
     /**
      * @param \DOMElement $node       A \DOMElement instance
-     * @param string      $currentUri The URI of the page where the link is embedded (or the base href)
+     * @param string|null $currentUri The URI of the page where the link is embedded (or the base href)
      * @param string|null $method     The method to use for the link (GET by default)
      *
      * @throws \InvalidArgumentException if the node is not a link
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -21,15 +21,22 @@
  */
 class Crawler implements \Countable, \IteratorAggregate
 {
+    /**
+     * @var string|null
+     */
     protected $uri;
 
     /**
-     * @var string The default namespace prefix to be used with XPath and CSS expressions
+     * The default namespace prefix to be used with XPath and CSS expressions.
+     *
+     * @var string
      */
     private $defaultNamespacePrefix = 'default';
 
     /**
-     * @var array A map of manually registered namespaces
+     * A map of manually registered namespaces.
+     *
+     * @var array<string, string>
      */
     private $namespaces = [];
 
@@ -39,7 +46,9 @@ class Crawler implements \Countable, \IteratorAggregate
     private $cachedNamespaces;
 
     /**
-     * @var string The base href value
+     * The base href value.
+     *
+     * @var string|null
      */
     private $baseHref;
 
@@ -81,7 +90,7 @@ public function __construct($node = null, string $uri = null, string $baseHref =
     /**
      * Returns the current URI.
      *
-     * @return string
+     * @return string|null
      */
     public function getUri()
     {
@@ -91,7 +100,7 @@ public function getUri()
     /**
      * Returns base href.
      *
-     * @return string
+     * @return string|null
      */
     public function getBaseHref()
     {
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
@@ -38,9 +38,9 @@ class Form extends Link implements \ArrayAccess
 
     /**
      * @param \DOMElement $node       A \DOMElement instance
-     * @param string      $currentUri The URI of the page where the form is embedded
-     * @param string      $method     The method to use for the link (if null, it defaults to the method defined by the form)
-     * @param string      $baseHref   The URI of the <base> used for relative links, but not for empty action
+     * @param string|null $currentUri The URI of the page where the form is embedded
+     * @param string|null $method     The method to use for the link (if null, it defaults to the method defined by the form)
+     * @param string|null $baseHref   The URI of the <base> used for relative links, but not for empty action
      *
      * @throws \LogicException if the node is not a button inside a form tag
      */

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ abstract class AbstractUriElement`
`35`	`35`
`36`	`36`	`/**`
`37`	`37`	`* @param \DOMElement $node A \DOMElement instance`
`38`		`- * @param string $currentUri The URI of the page where the link is embedded (or the base href)`
	`38`	`+ * @param string\|null $currentUri The URI of the page where the link is embedded (or the base href)`
`39`	`39`	`* @param string\|null $method The method to use for the link (GET by default)`
`40`	`40`	`*`
`41`	`41`	`* @throws \InvalidArgumentException if the node is not a link`