Merge branch '5.4' into 6.0

derrabus · derrabus · commit 652b57032f26 · 2021-11-03T14:44:55.000+01:00
* 5.4:
  [Console] Restore psr/log &gt;= 3.0 conflict
  [Security] Make the abstract Voter class implement CacheableVoterInterface
  Add generic types to traversable implementations
  [Security] Fix TypeError message
  [Security] Fix deprecation layer
  [FrameworkBundle] Add completion for workflow:dump
  Fix cancel button
  Fix misleading error on missing provider with authenticator manager
  Don't limit retries of toolbar loading
diff --git a/InputStream.php b/InputStream.php
@@ -17,6 +17,8 @@
  * Provides a way to continuously write to the input of a Process until the InputStream is closed.
  *
  * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @implements \IteratorAggregate<int, string>
  */
 class InputStream implements \IteratorAggregate
 {
diff --git a/Process.php b/Process.php
@@ -27,6 +27,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Romain Neutron <imprec@gmail.com>
+ *
+ * @implements \IteratorAggregate<string, string>
  */
 class Process implements \IteratorAggregate
 {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`* Provides a way to continuously write to the input of a Process until the InputStream is closed.`
`18`	`18`	`*`
`19`	`19`	`* @author Nicolas Grekas <p@tchwork.com>`
	`20`	`+ *`
	`21`	`+ * @implements \IteratorAggregate<int, string>`
`20`	`22`	`*/`
`21`	`23`	`class InputStream implements \IteratorAggregate`
`22`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`*`
`28`	`28`	`* @author Fabien Potencier <fabien@symfony.com>`
`29`	`29`	`* @author Romain Neutron <imprec@gmail.com>`
	`30`	`+ *`
	`31`	`+ * @implements \IteratorAggregate<string, string>`
`30`	`32`	`*/`
`31`	`33`	`class Process implements \IteratorAggregate`
`32`	`34`	`{`