summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2012-10-27 10:27:26 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-10-28 08:06:37 +0100
commit1fd9900caddeb88e2882e7572c5345bdf6769ba5 (patch)
tree53cca7a99531a0252dc0f41b02f6ad5ee8419bb6
parent8646ebf807e6197a899dc6dc1072bcd027da9be6 (diff)
downloadsymfony-security-1fd9900caddeb88e2882e7572c5345bdf6769ba5.zip
symfony-security-1fd9900caddeb88e2882e7572c5345bdf6769ba5.tar.gz
symfony-security-1fd9900caddeb88e2882e7572c5345bdf6769ba5.tar.bz2
rename String to StringUtils
-rw-r--r--Core/Encoder/BasePasswordEncoder.php4
-rw-r--r--Core/Util/StringUtils.php (renamed from Core/Util/String.php)2
-rwxr-xr-xTests/Core/Util/StringTest.php6
3 files changed, 6 insertions, 6 deletions
diff --git a/Core/Encoder/BasePasswordEncoder.php b/Core/Encoder/BasePasswordEncoder.php
index e73bbbd..1ef134b 100644
--- a/Core/Encoder/BasePasswordEncoder.php
+++ b/Core/Encoder/BasePasswordEncoder.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Security\Core\Encoder;
-use Symfony\Component\Security\Core\Util\String;
+use Symfony\Component\Security\Core\Util\StringUtils;
/**
* BasePasswordEncoder is the base class for all password encoders.
@@ -79,6 +79,6 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
*/
protected function comparePasswords($password1, $password2)
{
- return String::equals($password1, $password2);
+ return StringUtils::equals($password1, $password2);
}
}
diff --git a/Core/Util/String.php b/Core/Util/StringUtils.php
index 096878b..adc6fe9 100644
--- a/Core/Util/String.php
+++ b/Core/Util/StringUtils.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\Security\Core\Util;
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-final class String
+final class StringUtils
{
private final function __construct()
{
diff --git a/Tests/Core/Util/StringTest.php b/Tests/Core/Util/StringTest.php
index fe4eae4..e5f8160 100755
--- a/Tests/Core/Util/StringTest.php
+++ b/Tests/Core/Util/StringTest.php
@@ -2,13 +2,13 @@
namespace Symfony\Component\Security\Tests\Core\Util;
-use Symfony\Component\Security\Core\Util\String;
+use Symfony\Component\Security\Core\Util\StringUtils;
class StringTest extends \PHPUnit_Framework_TestCase
{
public function testEquals()
{
- $this->assertTrue(String::equals('password', 'password'));
- $this->assertFalse(String::equals('password', 'foo'));
+ $this->assertTrue(StringUtils::equals('password', 'password'));
+ $this->assertFalse(StringUtils::equals('password', 'foo'));
}
}