test: add test for null format

dunglas · dunglas · commit 3d3a6f773393 · 2021-01-02T12:16:36.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php
@@ -84,6 +84,7 @@ public function testAssertResponseFormat()
 
         $this->getResponseTester(new Response('', 200, ['Content-Type' => 'application/vnd.myformat']))->assertResponseFormatSame('custom');
         $this->getResponseTester(new Response('', 200, ['Content-Type' => 'application/ld+json']))->assertResponseFormatSame('jsonld');
+        $this->getResponseTester(new Response())->assertResponseFormatSame(null);
         $this->expectException(AssertionFailedError::class);
         $this->expectExceptionMessage("Failed asserting that the Response format is jsonld.\nHTTP/1.0 200 OK");
         $this->getResponseTester(new Response())->assertResponseFormatSame('jsonld');
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseFormatSame.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseFormatSame.php
@@ -25,7 +25,7 @@ final class ResponseFormatSame extends Constraint
     private $request;
     private $format;
 
-    public function __construct(Request $request, string $format)
+    public function __construct(Request $request, ?string $format)
     {
         $this->request = $request;
         $this->format = $format;
@@ -36,7 +36,7 @@ public function __construct(Request $request, string $format)
      */
     public function toString(): string
     {
-        return 'format is '.$this->format;
+        return 'format is '.($this->format ?? 'null');
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseFormatSameTest.php b/src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseFormatSameTest.php
@@ -42,4 +42,20 @@ public function testConstraint()
 
         $this->fail();
     }
+
+    public function testNullFormat()
+    {
+        $constraint = new ResponseFormatSame(new Request(), null);
+        $this->assertTrue($constraint->evaluate(new Response(), '', true));
+
+        try {
+            $constraint->evaluate(new Response('', 200, ['Content-Type' => 'application/ld+json']));
+        } catch (ExpectationFailedException $e) {
+            $this->assertStringContainsString("Failed asserting that the Response format is null.\nHTTP/1.0 200 OK", TestFailure::exceptionToString($e));
+
+            return;
+        }
+
+        $this->fail();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ final class ResponseFormatSame extends Constraint`
`25`	`25`	`private $request;`
`26`	`26`	`private $format;`
`27`	`27`
`28`		`- public function __construct(Request $request, string $format)`
	`28`	`+ public function __construct(Request $request, ?string $format)`
`29`	`29`	`{`
`30`	`30`	`$this->request = $request;`
`31`	`31`	`$this->format = $format;`
`@@ -36,7 +36,7 @@ public function __construct(Request $request, string $format)`
`36`	`36`	`*/`
`37`	`37`	`public function toString(): string`
`38`	`38`	`{`
`39`		`- return 'format is '.$this->format;`
	`39`	`+ return 'format is '.($this->format ?? 'null');`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`