try to work around the LogicalNot(ResponseHeaderSame) behaviour

jschaedl · jschaedl · commit adafb8bc2cff · 2023-11-26T19:56:33.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/BrowserKitAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/BrowserKitAssertionsTrait.php
@@ -79,7 +79,7 @@ public static function assertResponseHeaderSame(string $headerName, string $expe
 
     public static function assertResponseHeaderNotSame(string $headerName, string $expectedValue, string $message = ''): void
     {
-        self::assertThatForResponse(new LogicalNot(new ResponseConstraint\ResponseHeaderSame($headerName, $expectedValue)), $message);
+        self::assertThatForResponse(new LogicalNot(new ResponseConstraint\ResponseHeaderSame($headerName, $expectedValue, true)), $message);
     }
 
     public static function assertResponseHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHeaderSame.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHeaderSame.php
@@ -18,12 +18,14 @@ final class ResponseHeaderSame extends Constraint
 {
     private string $headerName;
     private string $expectedValue;
+    private bool $logicalNot;
     private ?string $actualValue = null;
 
-    public function __construct(string $headerName, string $expectedValue)
+    public function __construct(string $headerName, string $expectedValue, bool $logicalNot = false)
     {
         $this->headerName = $headerName;
         $this->expectedValue = $expectedValue;
+        $this->logicalNot = $logicalNot;
     }
 
     public function toString(): string
@@ -34,7 +36,7 @@ public function toString(): string
             $output .= sprintf(', header "%s" is not set', $this->headerName);
         }
 
-        if (null !== $this->actualValue) {
+        if (null !== $this->actualValue && !$this->logicalNot) {
             $output .= sprintf(', value of header "%s" is "%s"', $this->headerName, $this->actualValue);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public static function assertResponseHeaderSame(string $headerName, string $expe`
`79`	`79`
`80`	`80`	`public static function assertResponseHeaderNotSame(string $headerName, string $expectedValue, string $message = ''): void`
`81`	`81`	`{`
`82`		`- self::assertThatForResponse(new LogicalNot(new ResponseConstraint\ResponseHeaderSame($headerName, $expectedValue)), $message);`
	`82`	`+ self::assertThatForResponse(new LogicalNot(new ResponseConstraint\ResponseHeaderSame($headerName, $expectedValue, true)), $message);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public static function assertResponseHasCookie(string $name, string $path = '/', string $domain = null, string $message = ''): void`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,14 @@ final class ResponseHeaderSame extends Constraint`
`18`	`18`	`{`
`19`	`19`	`private string $headerName;`
`20`	`20`	`private string $expectedValue;`
	`21`	`+ private bool $logicalNot;`
`21`	`22`	`private ?string $actualValue = null;`
`22`	`23`
`23`		`- public function __construct(string $headerName, string $expectedValue)`
	`24`	`+ public function __construct(string $headerName, string $expectedValue, bool $logicalNot = false)`
`24`	`25`	`{`
`25`	`26`	`$this->headerName = $headerName;`
`26`	`27`	`$this->expectedValue = $expectedValue;`
	`28`	`+ $this->logicalNot = $logicalNot;`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`public function toString(): string`
`@@ -34,7 +36,7 @@ public function toString(): string`
`34`	`36`	`$output .= sprintf(', header "%s" is not set', $this->headerName);`
`35`	`37`	`}`
`36`	`38`
`37`		`- if (null !== $this->actualValue) {`
	`39`	`+ if (null !== $this->actualValue && !$this->logicalNot) {`
`38`	`40`	`$output .= sprintf(', value of header "%s" is "%s"', $this->headerName, $this->actualValue);`
`39`	`41`	`}`
`40`	`42`