Merge branch '4.2' into 4.3

Robin Chalas · Robin Chalas · commit 2a93351bea6a · 2019-05-31T20:55:30.000+02:00
* 4.2:
  [DomCrawler] Fix type error with null Form::$currentUri
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
@@ -44,7 +44,7 @@ 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, string $method = null, string $baseHref = null)
+    public function __construct(\DOMElement $node, string $currentUri = null, string $method = null, string $baseHref = null)
     {
         parent::__construct($node, $currentUri, $method);
         $this->baseHref = $baseHref;
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
@@ -1042,6 +1042,7 @@ public function getBaseTagWithFormData()
             ['/basepath', '/registration', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and form action'],
             ['/basepath', '', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and empty form action'],
             ['http://base.com/', '/registration', 'http://base.com/registration', 'http://domain.com/registration', '<base> tag does work with a URL and form action'],
+            ['http://base.com/', 'http://base.com/registration', 'http://base.com/registration', null, '<base> tag does work with a URL and form action'],
             ['http://base.com', '', 'http://domain.com/path/form', 'http://domain.com/path/form', '<base> tag does work with a URL and an empty form action'],
             ['http://base.com/path', '/registration', 'http://base.com/registration', 'http://domain.com/path/form', '<base> tag does work with a URL and form action'],
         ];

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class Form extends Link implements \ArrayAccess`
`44`	`44`	`*`
`45`	`45`	`* @throws \LogicException if the node is not a button inside a form tag`
`46`	`46`	`*/`
`47`		`- public function __construct(\DOMElement $node, string $currentUri, string $method = null, string $baseHref = null)`
	`47`	`+ public function __construct(\DOMElement $node, string $currentUri = null, string $method = null, string $baseHref = null)`
`48`	`48`	`{`
`49`	`49`	`parent::__construct($node, $currentUri, $method);`
`50`	`50`	`$this->baseHref = $baseHref;`