Skip to content
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

External relative links #124

Merged
merged 1 commit into from
Sep 12, 2020
Merged

External relative links #124

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
9 changes: 7 additions & 2 deletions src/CssInlinerPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,13 @@ public function loadOptions($options)
{
if (isset($options['css-files']) && count($options['css-files']) > 0) {
$this->css = '';
foreach ($options['css-files'] as $file) {
$this->css .= file_get_contents($file);
foreach ($options['css-files'] as $fileUrl) {
// Fix relative protocols on hrefs. Assume https.
if (substr($fileUrl, 0, 2) === '//') {
$fileUrl = 'https:' . $fileUrl;
}

$this->css .= file_get_contents($fileUrl);
}
}
}
Expand Down
48 changes: 48 additions & 0 deletions tests/CssInlinerPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,16 @@ class CssInlinerPluginTest extends TestCase
'converted-html',
'converted-html-with-css',
'converted-html-with-link-css',
'converted-html-with-link-external',
'converted-html-with-link-relative-external',
'converted-html-with-links-css',
'converted-html-with-mixed-type-links',
'converted-html-with-non-stylesheet-link',
'original-html',
'original-html-with-css',
'original-html-with-link-css',
'original-html-with-link-external',
'original-html-with-link-relative-external',
'original-html-with-links-css',
'original-html-with-mixed-type-links',
'original-html-with-non-stylesheet-link',
Expand Down Expand Up @@ -238,6 +242,50 @@ public function itShouldWorkWithMixedTypeLinks()
);
}

/** @test **/
public function itShouldWorkWithExternalLink()
{
$mailer = new Swift_Mailer(new Swift_NullTransport());

$mailer->registerPlugin(new CssInlinerPlugin($this->options));

$message = new Swift_Message('Test');

$message->setFrom('[email protected]');
$message->setTo('[email protected]');

$message->setBody($this->stubs['original-html-with-link-external'], 'text/html');

$mailer->send($message);

$this->assertEquals(
$this->stubs['converted-html-with-link-external'],
$this->normalize($message->getBody())
);
}

/** @test **/
public function itShouldWorkWithRelativeExternalLink()
{
$mailer = new Swift_Mailer(new Swift_NullTransport());

$mailer->registerPlugin(new CssInlinerPlugin($this->options));

$message = new Swift_Message('Test');

$message->setFrom('[email protected]');
$message->setTo('[email protected]');

$message->setBody($this->stubs['original-html-with-link-relative-external'], 'text/html');

$mailer->send($message);

$this->assertEquals(
$this->stubs['converted-html-with-link-relative-external'],
$this->normalize($message->getBody())
);
}

protected function normalize(string $html): string
{
$document = new \DomDocument();
Expand Down
20 changes: 20 additions & 0 deletions tests/stubs/converted-html-with-link-external.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>

</head>
<body>
<div class="pixels-10" style="width: 10px;">
text

<ul>
<li>
Big list
</li>
<li>
Small list
</li>
</ul>
</div>
</body>
</html>
20 changes: 20 additions & 0 deletions tests/stubs/converted-html-with-link-relative-external.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>

</head>
<body>
<div class="pixels-10" style="width: 10px;">
text

<ul>
<li>
Big list
</li>
<li>
Small list
</li>
</ul>
</div>
</body>
</html>
21 changes: 21 additions & 0 deletions tests/stubs/original-html-with-link-external.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
<link rel="stylesheet" type="text/css" href="https://github.com/fedeisas/laravel-mail-css-inliner/raw/master/tests/css/test.css">
</head>
<body>
<div class="pixels-10">
text

<ul>
<li>
Big list
</li>
<li>
Small list
</li>
</ul>
</div>
</body>
</html>

21 changes: 21 additions & 0 deletions tests/stubs/original-html-with-link-relative-external.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
<link rel="stylesheet" type="text/css" href="//github.com/fedeisas/laravel-mail-css-inliner/raw/master/tests/css/test.css">
</head>
<body>
<div class="pixels-10">
text

<ul>
<li>
Big list
</li>
<li>
Small list
</li>
</ul>
</div>
</body>
</html>