minor #26424 [SecurityBundle] Make extra character non mandatory in regex (DavidPrevot)

chalasr · chalasr · commit 07cccd53df3d · 2018-03-06T10:27:07.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [SecurityBundle] Make extra character non mandatory in regex The extra character was introduced in 5f9471e, and breaks the testsuite in native php 7.2. | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Commits ------- 44b4fc8 [SecurityBundle] Make extra character non mandatory in regex
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -86,7 +86,7 @@ public function testEncodePasswordArgon2i()
         $this->assertContains('Password encoding succeeded', $output);
 
         $encoder = new Argon2iPasswordEncoder();
-        preg_match('#  Encoded password\s+(\$argon2id\$[\w\d,=\$+\/]+={0,2})\s+#', $output, $matches);
+        preg_match('#  Encoded password\s+(\$argon2id?\$[\w\d,=\$+\/]+={0,2})\s+#', $output, $matches);
         $hash = $matches[1];
         $this->assertTrue($encoder->isPasswordValid($hash, 'password', null));
     }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function testEncodePasswordArgon2i()`
`86`	`86`	`$this->assertContains('Password encoding succeeded', $output);`
`87`	`87`
`88`	`88`	`$encoder = new Argon2iPasswordEncoder();`
`89`		`- preg_match('# Encoded password\s+(\$argon2id\$[\w\d,=\$+\/]+={0,2})\s+#', $output, $matches);`
	`89`	`+ preg_match('# Encoded password\s+(\$argon2id?\$[\w\d,=\$+\/]+={0,2})\s+#', $output, $matches);`
`90`	`90`	`$hash = $matches[1];`
`91`	`91`	`$this->assertTrue($encoder->isPasswordValid($hash, 'password', null));`
`92`	`92`	`}`