minor #17073 [Security] skip bcrypt tests on incompatible platforms (Christian Flothmann, xabbuh)

nicolas-grekas · nicolas-grekas · commit 337957ad2694 · 2015-12-22T12:51:12.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Security] skip bcrypt tests on incompatible platforms | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17055 | License | MIT | Doc PR | Not all PHP versions before 5.3.7 have backported fixes that make it possible to use `password_hash()` function. Therefore, we have to skip tests on not supported platforms. Commits ------- 2a6fa7b use requires annotation 65eb188 skip bcrypt tests on incompatible platforms
diff --git a/src/Symfony/Component/Security/Tests/Core/Encoder/BCryptPasswordEncoderTest.php b/src/Symfony/Component/Security/Tests/Core/Encoder/BCryptPasswordEncoderTest.php
@@ -45,13 +45,19 @@ public function testCostInRange()
         }
     }
 
+    /**
+     * @requires PHP 5.3.7
+     */
     public function testResultLength()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);
         $result = $encoder->encodePassword(self::PASSWORD, null);
         $this->assertEquals(60, strlen($result));
     }
 
+    /**
+     * @requires PHP 5.3.7
+     */
     public function testValidation()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);
@@ -70,6 +76,9 @@ public function testEncodePasswordLength()
         $encoder->encodePassword(str_repeat('a', 73), 'salt');
     }
 
+    /**
+     * @requires PHP 5.3.7
+     */
     public function testCheckPasswordLength()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,19 @@ public function testCostInRange()`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ /**`
	`49`	`+ * @requires PHP 5.3.7`
	`50`	`+ */`
`48`	`51`	`public function testResultLength()`
`49`	`52`	`{`
`50`	`53`	`$encoder = new BCryptPasswordEncoder(self::VALID_COST);`
`51`	`54`	`$result = $encoder->encodePassword(self::PASSWORD, null);`
`52`	`55`	`$this->assertEquals(60, strlen($result));`
`53`	`56`	`}`
`54`	`57`
	`58`	`+ /**`
	`59`	`+ * @requires PHP 5.3.7`
	`60`	`+ */`
`55`	`61`	`public function testValidation()`
`56`	`62`	`{`
`57`	`63`	`$encoder = new BCryptPasswordEncoder(self::VALID_COST);`
`@@ -70,6 +76,9 @@ public function testEncodePasswordLength()`
`70`	`76`	`$encoder->encodePassword(str_repeat('a', 73), 'salt');`
`71`	`77`	`}`
`72`	`78`
	`79`	`+ /**`
	`80`	`+ * @requires PHP 5.3.7`
	`81`	`+ */`
`73`	`82`	`public function testCheckPasswordLength()`
`74`	`83`	`{`
`75`	`84`	`$encoder = new BCryptPasswordEncoder(self::VALID_COST);`