Merge pull request #154 from Zenexer/2.14.x

Fix #152: Use strict string comparisons for header keys
laminas · May 20, 2021 · 180c6c7 · 180c6c7
2 parents fbf9000 + 0d00f9c
commit 180c6c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Headers.php b/src/Headers.php
@@ -379,7 +379,7 @@ public function get($name)
         $key = $this->normalizeFieldName($name);
         $results = [];
 
-        foreach (array_keys($this->headersKeys, $key) as $index) {
+        foreach (array_keys($this->headersKeys, $key, true) as $index) {
             if ($this->headers[$index] instanceof Header\GenericHeader) {
                 $results[] = $this->lazyLoadHeader($index);
             } else {
@@ -409,7 +409,7 @@ public function get($name)
     public function has($name)
     {
         $name = $this->normalizeFieldName($name);
-        return in_array($name, $this->headersKeys);
+        return in_array($name, $this->headersKeys, true);
     }
 
     /**

diff --git a/test/HeadersTest.php b/test/HeadersTest.php
@@ -640,4 +640,16 @@ public function testCanInjectAlternateHeaderLocatorInstance(): void
         $headers->setHeaderLocator($locator);
         $this->assertSame($locator, $headers->getHeaderLocator());
     }
+
+    public function testStrictKeyComparisonInHas(): void
+    {
+        $headers = Mail\Headers::fromString("000: foo-bar");
+        $this->assertFalse($headers->has('0'));
+    }
+
+    public function testStrictKeyComparisonInGet(): void
+    {
+        $headers = Mail\Headers::fromString("000: foo-bar");
+        $this->assertFalse($headers->get('0'));
+    }
 }