summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Core/Tests/Util/StringUtilsTest.php63
-rw-r--r--Core/Util/StringUtils.php70
2 files changed, 0 insertions, 133 deletions
diff --git a/Core/Tests/Util/StringUtilsTest.php b/Core/Tests/Util/StringUtilsTest.php
deleted file mode 100644
index 78d9b05..0000000
--- a/Core/Tests/Util/StringUtilsTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Core\Tests\Util;
-
-use Symfony\Component\Security\Core\Util\StringUtils;
-
-/**
- * Data from PHP.net's hash_equals tests.
- *
- * @group legacy
- */
-class StringUtilsTest extends \PHPUnit_Framework_TestCase
-{
- public function dataProviderTrue()
- {
- return array(
- array('same', 'same'),
- 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));
- }
-}
diff --git a/Core/Util/StringUtils.php b/Core/Util/StringUtils.php
deleted file mode 100644
index 5900812..0000000
--- a/Core/Util/StringUtils.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Core\Util;
-
-@trigger_error('The '.__NAMESPACE__.'\\StringUtils class is deprecated since version 2.8 and will be removed in 3.0. Use hash_equals() instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Polyfill\Util\Binary;
-
-/**
- * String utility functions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 2.8, to be removed in 3.0.
- */
-class StringUtils
-{
- /**
- * This class should not be instantiated.
- */
- private function __construct()
- {
- }
-
- /**
- * Compares two strings.
- *
- * This method implements a constant-time algorithm to compare strings.
- * Regardless of the used implementation, it will leak length information.
- *
- * @param string $knownString The string of known length to compare against
- * @param string $userInput The string that the user can control
- *
- * @return bool true if the two strings are the same, false otherwise
- */
- public static function equals($knownString, $userInput)
- {
- // Avoid making unnecessary duplications of secret data
- if (!is_string($knownString)) {
- $knownString = (string) $knownString;
- }
-
- if (!is_string($userInput)) {
- $userInput = (string) $userInput;
- }
-
- return hash_equals($knownString, $userInput);
- }
-
- /**
- * Returns the number of bytes in a string.
- *
- * @param string $string The string whose length we wish to obtain
- *
- * @return int
- */
- public static function safeStrlen($string)
- {
- return Binary::strlen($string);
- }
-}