Skip to content

Commit 2a98f26

Browse files
author
Robin Chalas
committed
Merge branch '4.3' into 4.4
* 4.3: [Security\Core] Make SodiumPasswordEncoder validate BCrypt-ed passwords [Validator] Fix TimezoneValidator default option [Messenger] Inject RoutableMessageBus instead of bus locator [DomCrawler] Fix type error with null Form::$currentUri [Contracts] Fixed typos do not enable validator auto mapping by default [HttpClient] remove unused argument
2 parents 99d37bb + 06ee58f commit 2a98f26

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Form extends Link implements \ArrayAccess
4444
*
4545
* @throws \LogicException if the node is not a button inside a form tag
4646
*/
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)
4848
{
4949
parent::__construct($node, $currentUri, $method);
5050
$this->baseHref = $baseHref;

Tests/AbstractCrawlerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,7 @@ public function getBaseTagWithFormData()
10421042
['/basepath', '/registration', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and form action'],
10431043
['/basepath', '', 'http://domain.com/registration', 'http://domain.com/registration', '<base> tag does work with a path and empty form action'],
10441044
['http://base.com/', '/registration', 'http://base.com/registration', 'http://domain.com/registration', '<base> tag does work with a URL and form action'],
1045+
['http://base.com/', 'http://base.com/registration', 'http://base.com/registration', null, '<base> tag does work with a URL and form action'],
10451046
['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'],
10461047
['http://base.com/path', '/registration', 'http://base.com/registration', 'http://domain.com/path/form', '<base> tag does work with a URL and form action'],
10471048
];

0 commit comments

Comments
 (0)