diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-02-11 14:52:09 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-02-11 14:52:09 +0100 |
| commit | ae020b9dc10e6438dc4033103c16bae7d46a4dd6 (patch) | |
| tree | 9c97b190916296a384c99d47ff167771702640b7 /Core/Tests/Util | |
| parent | d8edd9cf953bc18a76312aae4c10ff1f5d4783f9 (diff) | |
| parent | fc8250e983069954aa8b74703664cf5dc988d863 (diff) | |
| download | symfony-security-ae020b9dc10e6438dc4033103c16bae7d46a4dd6.zip symfony-security-ae020b9dc10e6438dc4033103c16bae7d46a4dd6.tar.gz symfony-security-ae020b9dc10e6438dc4033103c16bae7d46a4dd6.tar.bz2 | |
Merge branch '2.3' into 2.4v2.4.2
* 2.3:
fixed various inconsistencies
reduced recursion when building DumperPrefixCollection
renamed variables - making next change more readable
removing dead code.
[DomCrawler] Fixed filterXPath() chaining
[DomCrawler] Fixed incorrect handling of image inputs
Conflicts:
src/Symfony/Component/DomCrawler/Crawler.php
src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
Diffstat (limited to 'Core/Tests/Util')
| -rw-r--r-- | Core/Tests/Util/SecureRandomTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Core/Tests/Util/SecureRandomTest.php b/Core/Tests/Util/SecureRandomTest.php index 4cfdb2c..e3fde69 100644 --- a/Core/Tests/Util/SecureRandomTest.php +++ b/Core/Tests/Util/SecureRandomTest.php @@ -111,8 +111,8 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase { $b = $this->getBitSequence($secureRandom, 20000); - $longestRun = 0; - $currentRun = $lastBit = null; + $longestRun = $currentRun = 0; + $lastBit = null; for ($i = 0; $i < 20000; $i++) { if ($lastBit === $b[$i]) { $currentRun += 1; |