Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 304c69e46d42 · 2025-06-20T18:16:24.000+02:00
* 7.4: remove useless @legacy annotation disable the Lock integration to not register the deduplicate middleware [HttpFoundation] Use lowercase utf-8 as default response charset [Mailer] [Transport] Send clone of `RawMessage` instance in `RoundRobinTransport` [DependencyInjection] Fix generating adapters of functional interfaces [Runtime] Automatically use FrankenPHP runner when its worker mode is detected
diff --git a/Response.php b/Response.php
@@ -261,7 +261,7 @@ public function prepare(Request $request): static
             }
 
             // Fix Content-Type
-            $charset = $this->charset ?: 'UTF-8';
+            $charset = $this->charset ?: 'utf-8';
             if (!$headers->has('Content-Type')) {
                 $headers->set('Content-Type', 'text/html; charset='.$charset);
             } elseif (0 === stripos($headers->get('Content-Type') ?? '', 'text/') && false === stripos($headers->get('Content-Type') ?? '', 'charset')) {
diff --git a/Tests/ResponseTest.php b/Tests/ResponseTest.php
@@ -63,7 +63,7 @@ public function testSend()
     public function testGetCharset()
     {
         $response = new Response();
-        $charsetOrigin = 'UTF-8';
+        $charsetOrigin = 'utf-8';
         $response->setCharset($charsetOrigin);
         $charset = $response->getCharset();
         $this->assertEquals($charsetOrigin, $charset);
@@ -534,7 +534,7 @@ public function testDefaultContentType()
         $response = new Response('foo');
         $response->prepare(new Request());
 
-        $this->assertSame('text/html; charset=UTF-8', $response->headers->get('Content-Type'));
+        $this->assertSame('text/html; charset=utf-8', $response->headers->get('Content-Type'));
     }
 
     public function testContentTypeCharset()
@@ -545,7 +545,7 @@ public function testContentTypeCharset()
         // force fixContentType() to be called
         $response->prepare(new Request());
 
-        $this->assertEquals('text/css; charset=UTF-8', $response->headers->get('Content-Type'));
+        $this->assertEquals('text/css; charset=utf-8', $response->headers->get('Content-Type'));
     }
 
     public function testContentTypeIsNull()
@@ -565,7 +565,7 @@ public function testPrepareDoesNothingIfContentTypeIsSet()
 
         $response->prepare(new Request());
 
-        $this->assertEquals('text/plain; charset=UTF-8', $response->headers->get('content-type'));
+        $this->assertEquals('text/plain; charset=utf-8', $response->headers->get('content-type'));
     }
 
     public function testPrepareDoesNothingIfRequestFormatIsNotDefined()
@@ -574,7 +574,7 @@ public function testPrepareDoesNothingIfRequestFormatIsNotDefined()
 
         $response->prepare(new Request());
 
-        $this->assertEquals('text/html; charset=UTF-8', $response->headers->get('content-type'));
+        $this->assertEquals('text/html; charset=utf-8', $response->headers->get('content-type'));
     }
 
     /**
@@ -588,7 +588,7 @@ public function testPrepareDoesNotSetContentTypeBasedOnRequestAcceptHeader()
         $request->headers->set('Accept', 'application/json');
         $response->prepare($request);
 
-        $this->assertSame('text/html; charset=UTF-8', $response->headers->get('content-type'));
+        $this->assertSame('text/html; charset=utf-8', $response->headers->get('content-type'));
     }
 
     public function testPrepareSetContentType()
@@ -1021,7 +1021,7 @@ public function testSettersAreChainable()
 
         $setters = [
             'setProtocolVersion' => '1.0',
-            'setCharset' => 'UTF-8',
+            'setCharset' => 'utf-8',
             'setPublic' => null,
             'setPrivate' => null,
             'setDate' => $this->createDateTimeNow(),

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ public function prepare(Request $request): static`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`// Fix Content-Type`
`264`		`- $charset = $this->charset ?: 'UTF-8';`
	`264`	`+ $charset = $this->charset ?: 'utf-8';`
`265`	`265`	`if (!$headers->has('Content-Type')) {`
`266`	`266`	`$headers->set('Content-Type', 'text/html; charset='.$charset);`
`267`	`267`	`} elseif (0 === stripos($headers->get('Content-Type') ?? '', 'text/') && false === stripos($headers->get('Content-Type') ?? '', 'charset')) {`