Skip to content

Commit b659bb1

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Typos In Comments remove duplicated catch block s/<\br>/<br> [HttpClient] Fix retrying requests when the content is used by the strategy
2 parents c69331e + b8fd0ff commit b659bb1

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

FormFieldRegistry.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function add(FormField $field)
4646
}
4747

4848
/**
49-
* Removes a field based on the fully qualifed name and its children from the registry.
49+
* Removes a field based on the fully qualified name and its children from the registry.
5050
*/
5151
public function remove(string $name)
5252
{
@@ -63,7 +63,7 @@ public function remove(string $name)
6363
}
6464

6565
/**
66-
* Returns the value of the field based on the fully qualifed name and its children.
66+
* Returns the value of the field based on the fully qualified name and its children.
6767
*
6868
* @return FormField|FormField[]|FormField[][]
6969
*

Tests/AbstractCrawlerTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,8 +1062,6 @@ public function testChildren()
10621062
$this->assertTrue(true, '->children() does not trigger a notice if the node has no children');
10631063
} catch (\PHPUnit\Framework\Error\Notice $e) {
10641064
$this->fail('->children() does not trigger a notice if the node has no children');
1065-
} catch (\PHPUnit\Framework\Error\Notice $e) {
1066-
$this->fail('->children() does not trigger a notice if the node has no children');
10671065
}
10681066
}
10691067

0 commit comments

Comments
 (0)