Merge branch '4.2' into 4.3

xabbuh · xabbuh · commit 7084a7466922 · 2019-06-21T12:01:08.000+02:00
* 4.2:
  fix translation domain
  tag the FileType service as a form type
  [Validator] Fix GroupSequenceProvider annotation
  Update ajax security cheat sheet link
  Fix AuthenticationException::getToken typehint
diff --git a/Constraints/GroupSequence.php b/Constraints/GroupSequence.php
@@ -57,7 +57,7 @@ class GroupSequence
     /**
      * The groups in the sequence.
      *
-     * @var string[]|array[]|GroupSequence[]
+     * @var string[]|string[][]|GroupSequence[]
      */
     public $groups;
 
diff --git a/GroupSequenceProviderInterface.php b/GroupSequenceProviderInterface.php
@@ -22,7 +22,7 @@ interface GroupSequenceProviderInterface
      * Returns which validation groups should be used for a certain state
      * of the object.
      *
-     * @return string[]|GroupSequence An array of validation groups
+     * @return string[]|string[][]|GroupSequence An array of validation groups
      */
     public function getGroupSequence();
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class GroupSequence`
`57`	`57`	`/**`
`58`	`58`	`* The groups in the sequence.`
`59`	`59`	`*`
`60`		`- * @var string[]\|array[]\|GroupSequence[]`
	`60`	`+ * @var string[]\|string[][]\|GroupSequence[]`
`61`	`61`	`*/`
`62`	`62`	`public $groups;`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ interface GroupSequenceProviderInterface`
`22`	`22`	`* Returns which validation groups should be used for a certain state`
`23`	`23`	`* of the object.`
`24`	`24`	`*`
`25`		`- * @return string[]\|GroupSequence An array of validation groups`
	`25`	`+ * @return string[]\|string[][]\|GroupSequence An array of validation groups`
`26`	`26`	`*/`
`27`	`27`	`public function getGroupSequence();`
`28`	`28`	`}`