bug #39954 [Mailer][Mime] Fix case-sensitive handling of header names (piku235)

fabpot · fabpot · commit 7dee6a43493f · 2021-02-02T07:10:15.000+01:00
This PR was squashed before being merged into the 5.2 branch. Discussion ---------- [Mailer][Mime] Fix case-sensitive handling of header names | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39953 | License | MIT | Doc PR | - Fixes case-sensitive handling of header names in "Mime" and "Mailer" component, more in the [ticket](symfony/symfony#39953). Commits ------- d563c846f6 [Mailer][Mime] Fix case-sensitive handling of header names
diff --git a/Header/Headers.php b/Header/Headers.php
@@ -143,7 +143,7 @@ public function addParameterizedHeader(string $name, string $value, array $param
      */
     public function addHeader(string $name, $argument, array $more = []): self
     {
-        $parts = explode('\\', self::HEADER_CLASS_MAP[$name] ?? UnstructuredHeader::class);
+        $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class);
         $method = 'add'.ucfirst(array_pop($parts));
         if ('addUnstructuredHeader' === $method) {
             $method = 'addTextHeader';
@@ -217,7 +217,7 @@ public function remove(string $name): void
 
     public static function isUniqueHeader(string $name): bool
     {
-        return \in_array($name, self::UNIQUE_HEADERS, true);
+        return \in_array(strtolower($name), self::UNIQUE_HEADERS, true);
     }
 
     /**
diff --git a/Tests/Header/HeadersTest.php b/Tests/Header/HeadersTest.php
@@ -239,6 +239,20 @@ public function testRemoveIsNotCaseSensitive()
         $this->assertFalse($headers->has('Message-ID'));
     }
 
+    public function testAddHeaderIsNotCaseSensitive()
+    {
+        $headers = new Headers();
+        $headers->addHeader('From', ['from@example.com']);
+
+        $this->assertInstanceOf(MailboxListHeader::class, $headers->get('from'));
+        $this->assertEquals([new Address('from@example.com')], $headers->get('from')->getBody());
+    }
+
+    public function testIsUniqueHeaderIsNotCaseSensitive()
+    {
+        $this->assertTrue(Headers::isUniqueHeader('From'));
+    }
+
     public function testToStringJoinsHeadersTogether()
     {
         $headers = new Headers();

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public function addParameterizedHeader(string $name, string $value, array $param`
`143`	`143`	`*/`
`144`	`144`	`public function addHeader(string $name, $argument, array $more = []): self`
`145`	`145`	`{`
`146`		`- $parts = explode('\\', self::HEADER_CLASS_MAP[$name] ?? UnstructuredHeader::class);`
	`146`	`+ $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class);`
`147`	`147`	`$method = 'add'.ucfirst(array_pop($parts));`
`148`	`148`	`if ('addUnstructuredHeader' === $method) {`
`149`	`149`	`$method = 'addTextHeader';`
`@@ -217,7 +217,7 @@ public function remove(string $name): void`
`217`	`217`
`218`	`218`	`public static function isUniqueHeader(string $name): bool`
`219`	`219`	`{`
`220`		`- return \in_array($name, self::UNIQUE_HEADERS, true);`
	`220`	`+ return \in_array(strtolower($name), self::UNIQUE_HEADERS, true);`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`/**`