[SecurityBundle] Make extra character non mandatory in regex

DavidPrevot · DavidPrevot · commit 44b4fc8db56e · 2018-03-05T22:53:32.000-10:00
The extra character was introduced in 5f9471e, and breaks the testsuite
in native php 7.2.
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`	`}`