minor #32372 [Validator] Fix tests (ogizanagi)

nicolas-grekas · nicolas-grekas · commit cf6a5b350add · 2019-07-04T17:42:18.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [Validator] Fix tests | Q | A | ------------- | --- | Branch? | master  | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | relates to #32265  | License | MIT | Doc PR | N/A Fixes the following tests currently failing on master, as well as a bug where a null code was printed: ```diff 1) Symfony\Component\Validator\Tests\ConstraintViolationListTest::testToString Failed asserting that two strings are equal. --- Expected +++ Actual @@ @@ 'Root:\n - Error 1\n + Error 1 (code )\n Root.foo.bar:\n - Error 2\n + Error 2 (code )\n Root[baz]:\n - Error 3\n + Error 3 (code )\n foo.bar:\n - Error 4\n + Error 4 (code )\n [baz]:\n - Error 5\n + Error 5 (code )\n 2) Symfony\Component\Validator\Tests\ConstraintViolationTest::testToStringHandlesArrays Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ 'Root.property.path: - Array' + Array (code )' 3) Symfony\Component\Validator\Tests\ConstraintViolationTest::testToStringHandlesArrayRoots Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ 'Array.some_value: - 42 cannot be used here' + 42 cannot be used here (code )' 4) Symfony\Component\Validator\Tests\ConstraintViolationTest::testToStringOmitsEmptyCodes Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ 'Array.some_value: - 42 cannot be used here' + 42 cannot be used here (code )' 5) Symfony\Component\Validator\Tests\ConstraintViolationTest::testNonStringCode Failed asserting that '42' is identical to 42. 6) Symfony\Component\Validator\Tests\Violation\ConstraintViolationBuilderTest::testNonStringCode Failed asserting that '42' is identical to 42. ``` Commits ------- 22c58f5 [Validator] Fix tests
diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php
@@ -84,7 +84,7 @@ public function __toString()
             $class .= '.';
         }
 
-        if ('' !== $code = $this->code) {
+        if ('' !== $code = (string) $this->code) {
             $code = ' (code '.$code.')';
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php b/src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php
@@ -109,10 +109,6 @@ public function testToStringOmitsEmptyCodes()
         $this->assertSame($expected, (string) $violation);
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Not using a string as the error code in Symfony\Component\Validator\ConstraintViolation::__construct() is deprecated since Symfony 4.4. A type-hint will be added in 5.0.
-     */
     public function testNonStringCode()
     {
         $violation = new ConstraintViolation(
@@ -126,6 +122,6 @@ public function testNonStringCode()
             42
         );
 
-        self::assertSame(42, $violation->getCode());
+        self::assertSame('42', $violation->getCode());
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Violation/ConstraintViolationBuilderTest.php b/src/Symfony/Component/Validator/Tests/Violation/ConstraintViolationBuilderTest.php
@@ -19,18 +19,13 @@
 
 class ConstraintViolationBuilderTest extends TestCase
 {
-    /**
-     * @group legacy
-     * @expectedDeprecation Not using a string as the error code in Symfony\Component\Validator\Violation\ConstraintViolationBuilder::setCode() is deprecated since Symfony 4.4. A type-hint will be added in 5.0.
-     * @expectedDeprecation Not using a string as the error code in Symfony\Component\Validator\ConstraintViolation::__construct() is deprecated since Symfony 4.4. A type-hint will be added in 5.0.
-     */
     public function testNonStringCode()
     {
         $constraintViolationList = new ConstraintViolationList();
         (new ConstraintViolationBuilder($constraintViolationList, new ConstraintA(), 'invalid message', [], null, 'foo', 'baz', new IdentityTranslator()))
             ->setCode(42)
             ->addViolation();
 
-        self::assertSame(42, $constraintViolationList->get(0)->getCode());
+        self::assertSame('42', $constraintViolationList->get(0)->getCode());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function __toString()`
`84`	`84`	`$class .= '.';`
`85`	`85`	`}`
`86`	`86`
`87`		`- if ('' !== $code = $this->code) {`
	`87`	`+ if ('' !== $code = (string) $this->code) {`
`88`	`88`	`$code = ' (code '.$code.')';`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,6 @@ public function testToStringOmitsEmptyCodes()`
`109`	`109`	`$this->assertSame($expected, (string) $violation);`
`110`	`110`	`}`
`111`	`111`
`112`		`- /**`
`113`		`- * @group legacy`
`114`		`- * @expectedDeprecation Not using a string as the error code in Symfony\Component\Validator\ConstraintViolation::__construct() is deprecated since Symfony 4.4. A type-hint will be added in 5.0.`
`115`		`- */`
`116`	`112`	`public function testNonStringCode()`
`117`	`113`	`{`
`118`	`114`	`$violation = new ConstraintViolation(`
`@@ -126,6 +122,6 @@ public function testNonStringCode()`
`126`	`122`	`42`
`127`	`123`	`);`
`128`	`124`
`129`		`- self::assertSame(42, $violation->getCode());`
	`125`	`+ self::assertSame('42', $violation->getCode());`
`130`	`126`	`}`
`131`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,13 @@`
`19`	`19`
`20`	`20`	`class ConstraintViolationBuilderTest extends TestCase`
`21`	`21`	`{`
`22`		`- /**`
`23`		`- * @group legacy`
`24`		`- * @expectedDeprecation Not using a string as the error code in Symfony\Component\Validator\Violation\ConstraintViolationBuilder::setCode() is deprecated since Symfony 4.4. A type-hint will be added in 5.0.`
`25`		`- * @expectedDeprecation Not using a string as the error code in Symfony\Component\Validator\ConstraintViolation::__construct() is deprecated since Symfony 4.4. A type-hint will be added in 5.0.`
`26`		`- */`
`27`	`22`	`public function testNonStringCode()`
`28`	`23`	`{`
`29`	`24`	`$constraintViolationList = new ConstraintViolationList();`
`30`	`25`	`(new ConstraintViolationBuilder($constraintViolationList, new ConstraintA(), 'invalid message', [], null, 'foo', 'baz', new IdentityTranslator()))`
`31`	`26`	`->setCode(42)`
`32`	`27`	`->addViolation();`
`33`	`28`
`34`		`- self::assertSame(42, $constraintViolationList->get(0)->getCode());`
	`29`	`+ self::assertSame('42', $constraintViolationList->get(0)->getCode());`
`35`	`30`	`}`
`36`	`31`	`}`