Skip to content

Commit 3d22d93

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: replaced the last remaining is_integer() call [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup [Validator] Added missing galician (gl) translations [travis] Tests Security sub-components [travis] Tests Security sub-components CS fixes [travis] test with php nightly Conflicts: src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2 parents 0d17826 + d409da1 commit 3d22d93

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Authentication/Provider/PreAuthenticatedAuthenticationProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function authenticate(TokenInterface $token)
6060
throw new BadCredentialsException('No pre-authenticated principal found in request.');
6161
}
6262

63-
$user = $this->userProvider->loadUserByUsername($user);
63+
$user = $this->userProvider->loadUserByUsername($user);
6464

6565
$this->userChecker->checkPostAuth($user);
6666

Tests/Util/SecureRandomTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function testPoker($secureRandom)
4141

4242
for ($j = 1; $j <= 5000; $j++) {
4343
$k = 4 * $j - 1;
44-
$c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]] += 1;
44+
++$c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]];
4545
}
4646

4747
$f = 0;
@@ -73,14 +73,14 @@ public function testRun($secureRandom)
7373
$run = 6;
7474
}
7575

76-
$runs[$run] += 1;
76+
++$runs[$run];
7777
};
7878

7979
$currentRun = 0;
8080
$lastBit = null;
8181
for ($i = 0; $i < 20000; $i++) {
8282
if ($lastBit === $b[$i]) {
83-
$currentRun += 1;
83+
++$currentRun;
8484
} else {
8585
if ($currentRun > 0) {
8686
$addRun($currentRun);
@@ -115,7 +115,7 @@ public function testLongRun($secureRandom)
115115
$lastBit = null;
116116
for ($i = 0; $i < 20000; $i++) {
117117
if ($lastBit === $b[$i]) {
118-
$currentRun += 1;
118+
++$currentRun;
119119
} else {
120120
if ($currentRun > $longestRun) {
121121
$longestRun = $currentRun;

0 commit comments

Comments
 (0)