Skip to content

Commit

Permalink
Merge branch '6.0' into 6.1
Browse files Browse the repository at this point in the history
* 6.0:
  Typos In Comments
  Typos on 6.0 branch
  remove duplicated catch block
  s/<\br>/<br>
  [HttpClient] Fix retrying requests when the content is used by the strategy
  • Loading branch information
fabpot committed Oct 28, 2022
2 parents 8cb4c6e + b659bb1 commit 66be2a0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions FormFieldRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function add(FormField $field)
}

/**
* Removes a field based on the fully qualifed name and its children from the registry.
* Removes a field based on the fully qualified name and its children from the registry.
*/
public function remove(string $name)
{
Expand All @@ -63,7 +63,7 @@ public function remove(string $name)
}

/**
* Returns the value of the field based on the fully qualifed name and its children.
* Returns the value of the field based on the fully qualified name and its children.
*
* @return FormField|FormField[]|FormField[][]
*
Expand Down
2 changes: 0 additions & 2 deletions Tests/AbstractCrawlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1062,8 +1062,6 @@ public function testChildren()
$this->assertTrue(true, '->children() does not trigger a notice if the node has no children');
} catch (\PHPUnit\Framework\Error\Notice $e) {
$this->fail('->children() does not trigger a notice if the node has no children');
} catch (\PHPUnit\Framework\Error\Notice $e) {
$this->fail('->children() does not trigger a notice if the node has no children');
}
}

Expand Down

0 comments on commit 66be2a0

Please sign in to comment.