Skip to content

[Mime] Add null check for EmailHeaderSame #46366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
May 17, 2022
Merged

[Mime] Add null check for EmailHeaderSame #46366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Symfony/Component/Mime/Test/Constraint/EmailHeaderSame.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,14 @@ protected function matches($message): bool
*/
protected function failureDescription($message): string
{
return sprintf('the Email %s (value is %s)', $this->toString(), $this->getHeaderValue($message));
return sprintf('the Email %s (value is %s)', $this->toString(), $this->getHeaderValue($message) ?? 'null');
}

private function getHeaderValue($message): string
private function getHeaderValue($message): ?string
{
$header = $message->getHeaders()->get($this->headerName);
if (null === $header = $message->getHeaders()->get($this->headerName)) {
return null;
}

return $header instanceof UnstructuredHeader ? $header->getValue() : $header->getBodyAsString();
}
Expand Down
12 changes: 12 additions & 0 deletions src/Symfony/Component/Mime/Tests/EmailTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Symfony\Component\Mime\Tests;

use PHPUnit\Framework\ExpectationFailedException;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Mime\Address;
use Symfony\Component\Mime\Email;
Expand All @@ -19,6 +20,7 @@
use Symfony\Component\Mime\Part\Multipart\MixedPart;
use Symfony\Component\Mime\Part\Multipart\RelatedPart;
use Symfony\Component\Mime\Part\TextPart;
use Symfony\Component\Mime\Test\Constraint\EmailHeaderSame;

class EmailTest extends TestCase
{
Expand Down Expand Up @@ -384,4 +386,14 @@ public function testSerialize()
$this->assertEquals($expected->getHeaders(), $n->getHeaders());
$this->assertEquals($e->getBody(), $n->getBody());
}

public function testMissingHeaderDoesNotThrowError()
{
$this->expectException(ExpectationFailedException::class);
$this->expectExceptionMessage('Failed asserting that the Email has header "foo" with value "bar" (value is null).');

$e = new Email();
$emailHeaderSame = new EmailHeaderSame('foo', 'bar');
$emailHeaderSame->evaluate($e);
}
}