summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-03-07 08:44:26 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2015-03-07 08:44:26 +0100
commita717a745480d9b7839871c8afa02508f17904be7 (patch)
tree147164e1e415ac194417218fa479b4d41311169f /Core
parent8787e41ac6d0bc2dda6ff8aede0de30dc020f6fb (diff)
parent73e7adac6f6441c8bac6d18c853ec18081f4f5bd (diff)
downloadsymfony-security-a717a745480d9b7839871c8afa02508f17904be7.zip
symfony-security-a717a745480d9b7839871c8afa02508f17904be7.tar.gz
symfony-security-a717a745480d9b7839871c8afa02508f17904be7.tar.bz2
Merge branch '2.7'
* 2.7: (22 commits) Php Inspections (EA Extended): squash all PR-13813 commits replaced the last remaining is_integer() call [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup [FrameworkBundle] simplify dep declaration [VarDumper] Fix "next element is already occupied" [Serializer] Introduce ObjectNormalizer [Serializer] Refactoring of metadata [Validator] Added missing galician (gl) translations [WebProfilerBundle] Update ajax calls in toolbar to add the css error class [PropertyAccess] stop overwriting once a reference is reached (3rd) [OptionsResolver] Remove Unused Variable from Foreach Cycles [travis] Tests Security sub-components [Serializer] Test that normalizers ignore non-existing attributes. [Twig] bootstrap_3_layout.html.twig is usable as a trait [travis] Tests Security sub-components [Serializer] Fix ClassMetadataFactory PHPDoc CS fixes [Serializer] rename exception interface [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty ... Conflicts: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php src/Symfony/Component/Serializer/composer.json
Diffstat (limited to 'Core')
-rw-r--r--Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php2
-rw-r--r--Core/Tests/Util/SecureRandomTest.php8
2 files changed, 5 insertions, 5 deletions
diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
index 4f73254..c17a954 100644
--- a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -60,7 +60,7 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
throw new BadCredentialsException('No pre-authenticated principal found in request.');
}
- $user = $this->userProvider->loadUserByUsername($user);
+ $user = $this->userProvider->loadUserByUsername($user);
$this->userChecker->checkPostAuth($user);
diff --git a/Core/Tests/Util/SecureRandomTest.php b/Core/Tests/Util/SecureRandomTest.php
index 6e12ef2..590efd3 100644
--- a/Core/Tests/Util/SecureRandomTest.php
+++ b/Core/Tests/Util/SecureRandomTest.php
@@ -41,7 +41,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
for ($j = 1; $j <= 5000; $j++) {
$k = 4 * $j - 1;
- $c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]] += 1;
+ ++$c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]];
}
$f = 0;
@@ -73,14 +73,14 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
$run = 6;
}
- $runs[$run] += 1;
+ ++$runs[$run];
};
$currentRun = 0;
$lastBit = null;
for ($i = 0; $i < 20000; $i++) {
if ($lastBit === $b[$i]) {
- $currentRun += 1;
+ ++$currentRun;
} else {
if ($currentRun > 0) {
$addRun($currentRun);
@@ -115,7 +115,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
$lastBit = null;
for ($i = 0; $i < 20000; $i++) {
if ($lastBit === $b[$i]) {
- $currentRun += 1;
+ ++$currentRun;
} else {
if ($currentRun > $longestRun) {
$longestRun = $currentRun;