bug #42289 [HttpFoundation] Fixed type mismatch (Toflar)

derrabus · derrabus · commit b68cefa06dc9 · 2021-07-27T16:32:31.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [HttpFoundation] Fixed type mismatch | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #42290 | License | MIT | Doc PR | - Fixes > Argument 1 passed to str_contains() must be of the type string, null given, called in /.../vendor/symfony/http-foundation/Response.php on line 327 in case there's no `cache-control` response header. This doesn't happen by default as the `Response` is initialized with one by default but any class extending from it can adjust that. Technically speaking, it's not disallowed to have no `cache-control` header set. Want me to add a test for that? :) Commits ------- 31591c3 [HttpFoundation] Fixed type mismatch
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -311,7 +311,7 @@ public function prepare(Request $request)
         }
 
         // Check if we need to send extra expire info headers
-        if ('1.0' == $this->getProtocolVersion() && str_contains($headers->get('Cache-Control'), 'no-cache')) {
+        if ('1.0' == $this->getProtocolVersion() && str_contains($headers->get('Cache-Control', ''), 'no-cache')) {
             $headers->set('pragma', 'no-cache');
             $headers->set('expires', -1);
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -578,6 +578,12 @@ public function testPrepareSetsPragmaOnHttp10Only()
         $this->assertEquals('no-cache', $response->headers->get('pragma'));
         $this->assertEquals('-1', $response->headers->get('expires'));
 
+        $response = new Response('foo');
+        $response->headers->remove('cache-control');
+        $response->prepare($request);
+        $this->assertFalse($response->headers->has('pragma'));
+        $this->assertFalse($response->headers->has('expires'));
+
         $request->server->set('SERVER_PROTOCOL', 'HTTP/1.1');
         $response = new Response('foo');
         $response->prepare($request);

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ public function prepare(Request $request)`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`// Check if we need to send extra expire info headers`
`314`		`- if ('1.0' == $this->getProtocolVersion() && str_contains($headers->get('Cache-Control'), 'no-cache')) {`
	`314`	`+ if ('1.0' == $this->getProtocolVersion() && str_contains($headers->get('Cache-Control', ''), 'no-cache')) {`
`315`	`315`	`$headers->set('pragma', 'no-cache');`
`316`	`316`	`$headers->set('expires', -1);`
`317`	`317`	`}`