Skip to content

Commit 201f7e9

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Console] Restore psr/log >= 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
2 parents 6fe98aa + aedf2a8 commit 201f7e9

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Loader/AnnotationClassLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ abstract protected function configureRoute(Route $route, \ReflectionClass $class
363363
/**
364364
* @param \ReflectionClass|\ReflectionMethod $reflection
365365
*
366-
* @return iterable|RouteAnnotation[]
366+
* @return iterable<int, RouteAnnotation>
367367
*/
368368
private function getAnnotations(object $reflection): iterable
369369
{

RouteCollection.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
*
2323
* @author Fabien Potencier <fabien@symfony.com>
2424
* @author Tobias Schultze <http://tobion.de>
25+
*
26+
* @implements \IteratorAggregate<string, Route>
2527
*/
2628
class RouteCollection implements \IteratorAggregate, \Countable
2729
{
@@ -83,7 +85,7 @@ public function add(string $name, Route $route, int $priority = 0)
8385
/**
8486
* Returns all routes in this collection.
8587
*
86-
* @return Route[]
88+
* @return array<string, Route>
8789
*/
8890
public function all(): array
8991
{

0 commit comments

Comments
 (0)