Merge branch '2.4' into 2.5v2.5.4

* 2.4:
  Revert "minor #11808 [Security] Add more tests for StringUtils::equals (dunglas)"

1 files changed, 3 insertions, 41 deletions

diff --git a/Core/Tests/Util/StringUtilsTest.php b/Core/Tests/Util/StringUtilsTest.php
index e0366a5..89da98d 100644
--- a/Core/Tests/Util/StringUtilsTest.php
+++ b/Core/Tests/Util/StringUtilsTest.php
@@ -13,49 +13,11 @@ namespace Symfony\Component\Security\Core\Tests\Util;
 
 use Symfony\Component\Security\Core\Util\StringUtils;
 
-/**
- * Data from PHP.net's hash_equals tests
- */
 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)
+    public function testEquals()
     {
-        $this->assertFalse(StringUtils::equals($known, $user));
+        $this->assertTrue(StringUtils::equals('password', 'password'));
+        $this->assertFalse(StringUtils::equals('password', 'foo'));
     }
 }