Skip to content

Commit

Permalink
Merge branch '3.4' into 4.3
Browse files Browse the repository at this point in the history
* 3.4:
  Cleanup tests
  [Finder] Prevent unintentional file locks in Windows
  [DomCrawler] Fix FileFormField PHPDoc
  Fix #33395 PHP 5.3 compatibility
  • Loading branch information
nicolas-grekas committed Sep 2, 2019
2 parents cc68655 + 29cffc3 commit 8098e30
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Field/ChoiceFormField.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function untick()
/**
* Sets the value of the field.
*
* @param string|array $value The value of the field
* @param string|array|bool $value The value of the field
*
* @throws \InvalidArgumentException When value type provided is not correct
*/
Expand Down
2 changes: 1 addition & 1 deletion Field/FileFormField.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function upload($value)
/**
* Sets the value of the field.
*
* @param string $value The value of the field
* @param string|null $value The value of the field
*/
public function setValue($value)
{
Expand Down
2 changes: 1 addition & 1 deletion Field/FormField.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function getValue()
/**
* Sets the value of the field.
*
* @param string $value The value of the field
* @param string|array|bool|null $value The value of the field
*/
public function setValue($value)
{
Expand Down

0 comments on commit 8098e30

Please sign in to comment.