Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 8d39ca609282 · 2015-10-06T10:31:51.000+02:00
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Process/Process.php
diff --git a/Iterator/CustomFilterIterator.php b/Iterator/CustomFilterIterator.php
@@ -26,8 +26,8 @@ class CustomFilterIterator extends FilterIterator
     /**
      * Constructor.
      *
-     * @param \Iterator $iterator The Iterator to filter
-     * @param array     $filters  An array of PHP callbacks
+     * @param \Iterator  $iterator The Iterator to filter
+     * @param callable[] $filters  An array of PHP callbacks
      *
      * @throws \InvalidArgumentException
      */

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ class CustomFilterIterator extends FilterIterator`
`26`	`26`	`/**`
`27`	`27`	`* Constructor.`
`28`	`28`	`*`
`29`		`- * @param \Iterator $iterator The Iterator to filter`
`30`		`- * @param array $filters An array of PHP callbacks`
	`29`	`+ * @param \Iterator $iterator The Iterator to filter`
	`30`	`+ * @param callable[] $filters An array of PHP callbacks`
`31`	`31`	`*`
`32`	`32`	`* @throws \InvalidArgumentException`
`33`	`33`	`*/`