Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit b54fc2b6af45 · 2018-07-05T13:53:42.000+02:00
* 3.4:
  [DomCrawler] Fix ChoiceFormField::select() PHPDoc
  [HttpFoundation] add tests for FlashBagInterface::setAll()
  Check for Hyper terminal on all operating systems.
  [DI] Don't show internal service id on binding errors
  Prevent toolbar links color override by css
diff --git a/Field/ChoiceFormField.php b/Field/ChoiceFormField.php
@@ -75,7 +75,7 @@ public function isDisabled()
     /**
      * Sets the value of the field.
      *
-     * @param string $value The value of the field
+     * @param string|array $value The value of the field
      */
     public function select($value)
     {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function isDisabled()`
`75`	`75`	`/**`
`76`	`76`	`* Sets the value of the field.`
`77`	`77`	`*`
`78`		`- * @param string $value The value of the field`
	`78`	`+ * @param string\|array $value The value of the field`
`79`	`79`	`*/`
`80`	`80`	`public function select($value)`
`81`	`81`	`{`