summaryrefslogtreecommitdiffstats
path: root/Core/Tests
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-03-30 17:54:10 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2015-03-30 17:54:10 +0200
commit06dbcd5a5464cccf4c748071f338f34130ecad06 (patch)
tree428d8a384142a48561d6092a5583da954649b7b6 /Core/Tests
parent94465e02e58f9a17b29dd4afbcac5c02af4bf7e0 (diff)
parent25e914f2b63d4021af1fb0e510ac0843f1bdb3ee (diff)
downloadsymfony-security-06dbcd5a5464cccf4c748071f338f34130ecad06.zip
symfony-security-06dbcd5a5464cccf4c748071f338f34130ecad06.tar.gz
symfony-security-06dbcd5a5464cccf4c748071f338f34130ecad06.tar.bz2
Merge branch '2.3' into 2.6v2.6.6
* 2.3: [Validator] Add missing pt_BR translations Add parsing of hexadecimal strings for PHP 7 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition [Validator] Added missing Hungarian translation [Validator] Fixed grammar in Hungarian translation CS: Unary operators should be placed adjacent to their operands CS: Binary operators should be arounded by at least one space remove useless tests that fail in php 7 [Translator] fix test for php 7 compatibility Update phpdoc of ProcessBuilder#setPrefix() Conflicts: src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf src/Symfony/Component/Yaml/Parser.php
Diffstat (limited to 'Core/Tests')
-rw-r--r--Core/Tests/Authentication/Token/RememberMeTokenTest.php17
-rw-r--r--Core/Tests/Util/SecureRandomTest.php2
2 files changed, 1 insertions, 18 deletions
diff --git a/Core/Tests/Authentication/Token/RememberMeTokenTest.php b/Core/Tests/Authentication/Token/RememberMeTokenTest.php
index 691f54c..7449204 100644
--- a/Core/Tests/Authentication/Token/RememberMeTokenTest.php
+++ b/Core/Tests/Authentication/Token/RememberMeTokenTest.php
@@ -52,23 +52,6 @@ class RememberMeTokenTest extends \PHPUnit_Framework_TestCase
);
}
- /**
- * @expectedException \PHPUnit_Framework_Error
- * @dataProvider getUserArguments
- */
- public function testConstructorUserCannotBeNull($user)
- {
- new RememberMeToken($user, 'foo', 'foo');
- }
-
- public function getUserArguments()
- {
- return array(
- array(null),
- array('foo'),
- );
- }
-
protected function getUser($roles = array('ROLE_FOO'))
{
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
diff --git a/Core/Tests/Util/SecureRandomTest.php b/Core/Tests/Util/SecureRandomTest.php
index 590efd3..5dfe1c8 100644
--- a/Core/Tests/Util/SecureRandomTest.php
+++ b/Core/Tests/Util/SecureRandomTest.php
@@ -49,7 +49,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
$f += $c[$i] * $c[$i];
}
- $Y = 16/5000 * $f - 5000;
+ $Y = 16 / 5000 * $f - 5000;
$this->assertTrue($Y > 1.03 && $Y < 57.4, 'Poker test failed, Y = '.$Y);
}