[BUGFIX] Always execute pbkdf2 tests 22/48422/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Tue, 31 May 2016 14:46:07 +0000 (16:46 +0200)
committerTymoteusz Motylewski <t.motylewski@gmail.com>
Tue, 31 May 2016 17:04:27 +0000 (19:04 +0200)
The test annotation "@requires function hash_pbkdf2" doesn't
work for whatever reason, those tests are always skipped.
Since PHP7 always comes with hash_pbkdf2() built-in, the patch
now just drops the annotation.

Change-Id: Ice3adcebbeadf2c01e81960144c842bc4af268d2
Resolves: #76404
Releases: master
Reviewed-on: https://review.typo3.org/48422
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php

index d5b4555..e69c993 100644 (file)
@@ -74,7 +74,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function nonEmptyPasswordResultsInNonNullSaltedPassword()
     {
@@ -84,7 +83,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function createdSaltedHashOfProperStructure()
     {
@@ -95,7 +93,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function createdSaltedHashOfProperStructureForCustomSaltWithoutSetting()
     {
@@ -110,7 +107,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function createdSaltedHashOfProperStructureForMinimumHashCount()
     {
@@ -130,7 +126,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      * same "salted password hash" when using the same salt.
      *
      * @test
-     * @requires function hash_pbkdf2
      */
     public function authenticationWithValidAlphaCharClassPassword()
     {
@@ -146,7 +141,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      * same "salted password hash" when using the same salt.
      *
      * @test
-     * @requires function hash_pbkdf2
      */
     public function authenticationWithValidNumericCharClassPassword()
     {
@@ -162,7 +156,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      * same "salted password hash" when using the same salt.
      *
      * @test
-     * @requires function hash_pbkdf2
      */
     public function authenticationWithValidAsciiSpecialCharClassPassword()
     {
@@ -178,7 +171,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      * same "salted password hash" when using the same salt.
      *
      * @test
-     * @requires function hash_pbkdf2
      */
     public function authenticationWithValidLatin1SpecialCharClassPassword()
     {
@@ -198,7 +190,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      * same "salted password hash" when using the same salt.
      *
      * @test
-     * @requires function hash_pbkdf2
      */
     public function authenticationWithValidLatin1UmlautCharClassPassword()
     {
@@ -218,7 +209,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function authenticationWithNonValidPassword()
     {
@@ -230,7 +220,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function passwordVariationsResultInDifferentHashes()
     {
@@ -292,7 +281,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function updateNecessityForValidSaltedPassword()
     {
@@ -318,7 +306,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function updateNecessityForDecreasedHashcount()
     {
@@ -334,7 +321,6 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     /**
      * @test
-     * @requires function hash_pbkdf2
      */
     public function isCompatibleWithPythonPasslibHashes()
     {