Merge branch '2.4' into 2.5
* 2.4: Revert "minor #11808 [Security] Add more tests for StringUtils::equals (dunglas)"
This commit is contained in:
commit
1ec88bed2c
@ -13,49 +13,11 @@ namespace Symfony\Component\Security\Core\Tests\Util;
|
|||||||
|
|
||||||
use Symfony\Component\Security\Core\Util\StringUtils;
|
use Symfony\Component\Security\Core\Util\StringUtils;
|
||||||
|
|
||||||
/**
|
|
||||||
* Data from PHP.net's hash_equals tests
|
|
||||||
*/
|
|
||||||
class StringUtilsTest extends \PHPUnit_Framework_TestCase
|
class StringUtilsTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
public function dataProviderTrue()
|
public function testEquals()
|
||||||
{
|
{
|
||||||
return array(
|
$this->assertTrue(StringUtils::equals('password', 'password'));
|
||||||
array('same', 'same'),
|
$this->assertFalse(StringUtils::equals('password', 'foo'));
|
||||||
array('', ''),
|
|
||||||
array(123, 123),
|
|
||||||
array(null, ''),
|
|
||||||
array(null, null),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function dataProviderFalse()
|
|
||||||
{
|
|
||||||
return array(
|
|
||||||
array('not1same', 'not2same'),
|
|
||||||
array('short', 'longer'),
|
|
||||||
array('longer', 'short'),
|
|
||||||
array('', 'notempty'),
|
|
||||||
array('notempty', ''),
|
|
||||||
array(123, 'NaN'),
|
|
||||||
array('NaN', 123),
|
|
||||||
array(null, 123),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dataProvider dataProviderTrue
|
|
||||||
*/
|
|
||||||
public function testEqualsTrue($known, $user)
|
|
||||||
{
|
|
||||||
$this->assertTrue(StringUtils::equals($known, $user));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dataProvider dataProviderFalse
|
|
||||||
*/
|
|
||||||
public function testEqualsFalse($known, $user)
|
|
||||||
{
|
|
||||||
$this->assertFalse(StringUtils::equals($known, $user));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user