[Validator] fix merge

nicolas-grekas · nicolas-grekas · commit 1780dff34d75 · 2020-04-28T20:23:58.000+02:00
diff --git a/Tests/Violation/ConstraintViolationBuilderTest.php b/Tests/Violation/ConstraintViolationBuilderTest.php
@@ -70,10 +70,10 @@ public function testAppendMultiplePropertyPaths()
     public function testCodeCanBeSet()
     {
         $this->builder
-            ->setCode(5)
+            ->setCode('5')
             ->addViolation();
 
-        $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data', 'foo', null, 5, new Valid()));
+        $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data', 'foo', null, '5', new Valid()));
     }
 
     public function testCauseCanBeSet()

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,10 @@ public function testAppendMultiplePropertyPaths()`
`70`	`70`	`public function testCodeCanBeSet()`
`71`	`71`	`{`
`72`	`72`	`$this->builder`
`73`		`- ->setCode(5)`
	`73`	`+ ->setCode('5')`
`74`	`74`	`->addViolation();`
`75`	`75`
`76`		`- $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data', 'foo', null, 5, new Valid()));`
	`76`	`+ $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data', 'foo', null, '5', new Valid()));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public function testCauseCanBeSet()`