Build response header manually

Nicals · Nicals · commit 7d0265ccc0af · 2024-02-04T12:51:22.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -217,7 +217,7 @@ public function __construct(?string $content = '', int $status = 200, array $hea
     public function __toString(): string
     {
         return
-            $this->getCommandString()."\r\n".
+            sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
             $this->headers."\r\n".
             $this->getContent();
     }
@@ -230,14 +230,6 @@ public function __clone()
         $this->headers = clone $this->headers;
     }
 
-    /**
-     * @return string The first line of the actual HTTP request
-     */
-    public function getCommandString(): string
-    {
-        return sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText);
-    }
-
     /**
      * Prepares the Response before it is sent to the client.
      *
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseIsRedirected.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseIsRedirected.php
@@ -49,7 +49,7 @@ protected function additionalFailureDescription($other): string
         if ($this->verbose || !($other instanceof Response)) {
             return (string) $other;
         } else {
-            return $other->getCommandString()."\r\n".$other->headers;
+            return explode("\r\n\r\n", (string) $other)[0];
         }
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseIsSuccessful.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseIsSuccessful.php
@@ -49,7 +49,7 @@ protected function additionalFailureDescription($other): string
         if ($this->verbose || !($other instanceof Response)) {
             return (string) $other;
         } else {
-            return $other->getCommandString()."\r\n".$other->headers;
+            return explode("\r\n\r\n", (string) $other)[0];
         }
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseIsUnprocessable.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseIsUnprocessable.php
@@ -49,7 +49,7 @@ protected function additionalFailureDescription($other): string
         if ($this->verbose || !($other instanceof Response)) {
             return (string) $other;
         } else {
-            return $other->getCommandString()."\r\n".$other->headers;
+            return explode("\r\n\r\n", (string) $other)[0];
         }
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseStatusCodeSame.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseStatusCodeSame.php
@@ -49,7 +49,7 @@ protected function additionalFailureDescription($other): string
         if ($this->verbose || !($other instanceof Response)) {
             return (string) $other;
         } else {
-            return $other->getCommandString()."\r\n".$other->headers;
+            return explode("\r\n\r\n", (string) $other)[0];
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public function __construct(?string $content = '', int $status = 200, array $hea`
`217`	`217`	`public function __toString(): string`
`218`	`218`	`{`
`219`	`219`	`return`
`220`		`- $this->getCommandString()."\r\n".`
	`220`	`+ sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".`
`221`	`221`	`$this->headers."\r\n".`
`222`	`222`	`$this->getContent();`
`223`	`223`	`}`
`@@ -230,14 +230,6 @@ public function __clone()`
`230`	`230`	`$this->headers = clone $this->headers;`
`231`	`231`	`}`
`232`	`232`
`233`		`- /**`
`234`		`- * @return string The first line of the actual HTTP request`
`235`		`- */`
`236`		`- public function getCommandString(): string`
`237`		`- {`
`238`		`- return sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText);`
`239`		`- }`
`240`		`-`
`241`	`233`	`/**`
`242`	`234`	`* Prepares the Response before it is sent to the client.`
`243`	`235`	`*`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protected function additionalFailureDescription($other): string`
`49`	`49`	`if ($this->verbose \|\| !($other instanceof Response)) {`
`50`	`50`	`return (string) $other;`
`51`	`51`	`} else {`
`52`		`- return $other->getCommandString()."\r\n".$other->headers;`
	`52`	`+ return explode("\r\n\r\n", (string) $other)[0];`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`