Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
derrabus committed Nov 3, 2021
2 parents 9b07634 + 6393f2b commit 6c9295a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion PropertyPath.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
* Default implementation of {@link PropertyPathInterface}.
*
* @author Bernhard Schussek <[email protected]>
*
* @implements \IteratorAggregate<int, string>
*/
class PropertyPath implements \IteratorAggregate, PropertyPathInterface
{
Expand All @@ -30,7 +32,7 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface
/**
* The elements of the property path.
*
* @var array
* @var string[]
*/
private $elements = [];

Expand Down
4 changes: 3 additions & 1 deletion PropertyPathInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* A sequence of property names or array indices.
*
* @author Bernhard Schussek <[email protected]>
*
* @extends \Traversable<int, string>
*/
interface PropertyPathInterface extends \Traversable
{
Expand Down Expand Up @@ -45,7 +47,7 @@ public function getParent();
/**
* Returns the elements of the property path as array.
*
* @return array
* @return string[]
*/
public function getElements();

Expand Down
4 changes: 3 additions & 1 deletion PropertyPathIteratorInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@

/**
* @author Bernhard Schussek <[email protected]>
*
* @extends \SeekableIterator<int, string>
*/
interface PropertyPathIteratorInterface extends \Iterator, \SeekableIterator
interface PropertyPathIteratorInterface extends \SeekableIterator
{
/**
* Returns whether the current element in the property path is an array
Expand Down

0 comments on commit 6c9295a

Please sign in to comment.