Skip to content

Commit 47f804f

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1] [ci] Use current PHP_BINARY when running ./phpunit Fixed typos [UPGRADE-3.0] fix bullet indentation Fix PropertyAccessor modifying array in object when array key does not exist [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
2 parents 1f55425 + a5ce392 commit 47f804f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Translation/PhpExtractor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected function normalizeToken($token)
9090
/**
9191
* Seeks to a non-whitespace token.
9292
*/
93-
private function seekToNextReleventToken(\Iterator $tokenIterator)
93+
private function seekToNextRelevantToken(\Iterator $tokenIterator)
9494
{
9595
for (; $tokenIterator->valid(); $tokenIterator->next()) {
9696
$t = $tokenIterator->current();
@@ -153,7 +153,7 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
153153
$tokenIterator->seek($key);
154154

155155
foreach ($sequence as $item) {
156-
$this->seekToNextReleventToken($tokenIterator);
156+
$this->seekToNextRelevantToken($tokenIterator);
157157

158158
if ($this->normalizeToken($tokenIterator->current()) == $item) {
159159
$tokenIterator->next();

0 commit comments

Comments
 (0)