Merge branch '5.2' into 5.x

chalasr · chalasr · commit c8fec9749ac4 · 2021-02-15T19:57:44.000+01:00
* 5.2:
  [Workflow] Re-add InvalidTokenConfigurationException for BC
  Fix PHP 8.1 null values
  [Console] Fix PHP 8.1 null error for preg_match flag
  Fix: Article
  Definition::removeMethodCall should remove all matching calls
  [HttpFoundation] Fix typo in exception message
  mark the LazyIterator class as internal
  fix extracting mixed type-hinted property types
  [Worflow] Fixed GuardListener when using the new Security system
  keep valid submitted choices when additional choices are submitted
diff --git a/Field/ChoiceFormField.php b/Field/ChoiceFormField.php
@@ -14,7 +14,7 @@
 /**
  * ChoiceFormField represents a choice form field.
  *
- * It is constructed from a HTML select tag, or a HTML checkbox, or radio inputs.
+ * It is constructed from an HTML select tag, or an HTML checkbox, or radio inputs.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`/**`
`15`	`15`	`* ChoiceFormField represents a choice form field.`
`16`	`16`	`*`
`17`		`- * It is constructed from a HTML select tag, or a HTML checkbox, or radio inputs.`
	`17`	`+ * It is constructed from an HTML select tag, or an HTML checkbox, or radio inputs.`
`18`	`18`	`*`
`19`	`19`	`* @author Fabien Potencier <fabien@symfony.com>`
`20`	`20`	`*/`