feature #30484 [Mime] added Headers::toArray() (fabpot)

fabpot · fabpot · commit d0d188f0b91a · 2019-03-08T08:26:22.000+01:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [Mime] added Headers::toArray() | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | n/a | License | MIT | Doc PR | n/a That helps when using the Mime component to create a form submission HTTP body (where you need to merge the headers of the MIME body with the HTTP headers): ```php $body->getPreparedHeaders()->toArray(); vs foreach ($body->getPreparedHeaders()->getAll() as $header) { $headers[] = $header->toString(); } ``` Commits ------- 788bb81 [Mime] added Headers::toArray()
diff --git a/src/Symfony/Component/Mime/Header/Headers.php b/src/Symfony/Component/Mime/Header/Headers.php
@@ -210,13 +210,23 @@ public static function isUniqueHeader(string $name): bool
     public function toString(): string
     {
         $string = '';
+        foreach ($this->toArray() as $str) {
+            $string .= $str."\r\n";
+        }
+
+        return $string;
+    }
+
+    public function toArray(): array
+    {
+        $arr = [];
         foreach ($this->getAll() as $header) {
             if ('' !== $header->getBodyAsString()) {
-                $string .= $header->toString()."\r\n";
+                $arr[] = $header->toString();
             }
         }
 
-        return $string;
+        return $arr;
     }
 
     /**
diff --git a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
@@ -231,4 +231,15 @@ public function testHeadersWithoutBodiesAreNotDisplayed()
         $headers->addTextHeader('Zip', '');
         $this->assertEquals("Foo: bar\r\n", $headers->toString());
     }
+
+    public function testToArray()
+    {
+        $headers = new Headers();
+        $headers->addIdHeader('Message-ID', 'some@id');
+        $headers->addTextHeader('Foo', str_repeat('a', 60).pack('C', 0x8F));
+        $this->assertEquals([
+            'Message-ID: <some@id>',
+            "Foo: =?utf-8?Q?aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?=\r\n =?utf-8?Q?aaaa?=",
+        ], $headers->toArray());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -210,13 +210,23 @@ public static function isUniqueHeader(string $name): bool`
`210`	`210`	`public function toString(): string`
`211`	`211`	`{`
`212`	`212`	`$string = '';`
	`213`	`+ foreach ($this->toArray() as $str) {`
	`214`	`+ $string .= $str."\r\n";`
	`215`	`+ }`
	`216`	`+`
	`217`	`+ return $string;`
	`218`	`+ }`
	`219`	`+`
	`220`	`+ public function toArray(): array`
	`221`	`+ {`
	`222`	`+ $arr = [];`
`213`	`223`	`foreach ($this->getAll() as $header) {`
`214`	`224`	`if ('' !== $header->getBodyAsString()) {`
`215`		`- $string .= $header->toString()."\r\n";`
	`225`	`+ $arr[] = $header->toString();`
`216`	`226`	`}`
`217`	`227`	`}`
`218`	`228`
`219`		`- return $string;`
	`229`	`+ return $arr;`
`220`	`230`	`}`
`221`	`231`
`222`	`232`	`/**`