Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 7a38637e14dc · 2017-07-29T23:26:04.000+02:00
* 2.7:
  Remove unused constant
  Fix passing options with defaultCommand
diff --git a/Tests/Encoder/BCryptPasswordEncoderTest.php b/Tests/Encoder/BCryptPasswordEncoderTest.php
@@ -20,7 +20,6 @@
 class BCryptPasswordEncoderTest extends TestCase
 {
     const PASSWORD = 'password';
-    const BYTES = '0123456789abcdef';
     const VALID_COST = '04';
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`class BCryptPasswordEncoderTest extends TestCase`
`21`	`21`	`{`
`22`	`22`	`const PASSWORD = 'password';`
`23`		`- const BYTES = '0123456789abcdef';`
`24`	`23`	`const VALID_COST = '04';`
`25`	`24`
`26`	`25`	`/**`