Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 482945cbe51f · 2017-11-19T20:40:28.000+02:00
* 2.8:
  [SecurityBundle] Fix syntax error in test
  [Console] Remove remaining dead code
  bumped Symfony version to 2.8.32
  bumped Symfony version to 2.7.39
  updated VERSION for 2.8.31
  updated CHANGELOG for 2.8.31
  updated VERSION for 2.7.38
  updated CHANGELOG for 2.7.38
  Replace array|\Traversable by iterable
  Fix ambiguous pattern
diff --git a/ChoiceList/ArrayChoiceList.php b/ChoiceList/ArrayChoiceList.php
@@ -56,11 +56,11 @@ class ArrayChoiceList implements ChoiceListInterface
      *
      * The given choice array must have the same array keys as the value array.
      *
-     * @param array|\Traversable $choices The selectable choices
-     * @param callable|null      $value   The callable for creating the value
-     *                                    for a choice. If `null` is passed,
-     *                                    incrementing integers are used as
-     *                                    values
+     * @param iterable      $choices The selectable choices
+     * @param callable|null $value   The callable for creating the value
+     *                               for a choice. If `null` is passed,
+     *                               incrementing integers are used as
+     *                               values
      */
     public function __construct($choices, callable $value = null)
     {
diff --git a/ChoiceList/Factory/ChoiceListFactoryInterface.php b/ChoiceList/Factory/ChoiceListFactoryInterface.php
@@ -31,9 +31,9 @@ interface ChoiceListFactoryInterface
      * The callable receives the choice as first and the array key as the second
      * argument.
      *
-     * @param array|\Traversable $choices The choices
-     * @param null|callable      $value   The callable generating the choice
-     *                                    values
+     * @param iterable      $choices The choices
+     * @param null|callable $value   The callable generating the choice
+     *                               values
      *
      * @return ChoiceListInterface The choice list
      */
diff --git a/ChoiceList/Factory/PropertyAccessDecorator.php b/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -63,7 +63,7 @@ public function getDecoratedFactory()
     /**
      * {@inheritdoc}
      *
-     * @param array|\Traversable                $choices The choices
+     * @param iterable                          $choices The choices
      * @param null|callable|string|PropertyPath $value   The callable or path for
      *                                                   generating the choice values
      *

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,11 @@ class ArrayChoiceList implements ChoiceListInterface`
`56`	`56`	`*`
`57`	`57`	`* The given choice array must have the same array keys as the value array.`
`58`	`58`	`*`
`59`		`- * @param array\|\Traversable $choices The selectable choices`
`60`		`- * @param callable\|null $value The callable for creating the value`
`61`		- * for a choice. If `null` is passed,
`62`		`- * incrementing integers are used as`
`63`		`- * values`
	`59`	`+ * @param iterable $choices The selectable choices`
	`60`	`+ * @param callable\|null $value The callable for creating the value`
	`61`	+ * for a choice. If `null` is passed,
	`62`	`+ * incrementing integers are used as`
	`63`	`+ * values`
`64`	`64`	`*/`
`65`	`65`	`public function __construct($choices, callable $value = null)`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ interface ChoiceListFactoryInterface`
`31`	`31`	`* The callable receives the choice as first and the array key as the second`
`32`	`32`	`* argument.`
`33`	`33`	`*`
`34`		`- * @param array\|\Traversable $choices The choices`
`35`		`- * @param null\|callable $value The callable generating the choice`
`36`		`- * values`
	`34`	`+ * @param iterable $choices The choices`
	`35`	`+ * @param null\|callable $value The callable generating the choice`
	`36`	`+ * values`
`37`	`37`	`*`
`38`	`38`	`* @return ChoiceListInterface The choice list`
`39`	`39`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function getDecoratedFactory()`
`63`	`63`	`/**`
`64`	`64`	`* {@inheritdoc}`
`65`	`65`	`*`
`66`		`- * @param array\|\Traversable $choices The choices`
	`66`	`+ * @param iterable $choices The choices`
`67`	`67`	`* @param null\|callable\|string\|PropertyPath $value The callable or path for`
`68`	`68`	`* generating the choice values`
`69`	`69`	`*`