Merge branch '2.5' into 2.6

fabpot · fabpot · commit 887bcdd527e7 · 2015-01-05T15:28:40.000+01:00
* 2.5:
  [2.5] cleanup deprecated uses
diff --git a/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -86,7 +86,8 @@ public function testPasswordIsNotValid()
 
         $this->validator->validate('secret', $constraint);
 
-        $this->assertViolation('myMessage');
+        $this->buildViolation('myMessage')
+            ->assertRaised();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ public function testPasswordIsNotValid()`
`86`	`86`
`87`	`87`	`$this->validator->validate('secret', $constraint);`
`88`	`88`
`89`		`- $this->assertViolation('myMessage');`
	`89`	`+ $this->buildViolation('myMessage')`
	`90`	`+ ->assertRaised();`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`/**`