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

Jump to bottom

[6.x] Use CommonMark For Mailable #30982

Merged
merged 6 commits into from Dec 30, 2019
Merged

[6.x] Use CommonMark For Mailable #30982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83dfd84
use common mark for safety features
taylorotwell Dec 30, 2019
a1f2ef4
Apply fixes from StyleCI (#30981)
taylorotwell Dec 30, 2019
344a3a3
fix test
taylorotwell Dec 30, 2019
fc1d701
Merge branch 'commonmark' of github.com:laravel/framework into common…
taylorotwell Dec 30, 2019
2a0c55b
update composer files
taylorotwell Dec 30, 2019
a68d163
fix test
taylorotwell Dec 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Expand Up @@ -22,7 +22,8 @@
"doctrine/inflector": "^1.1",
"dragonmantank/cron-expression": "^2.0",
"egulias/email-validator": "^2.1.10",
"erusev/parsedown": "^1.7",
"league/commonmark": "^1.1",
"league/commonmark-ext-table": "^2.1",
"league/flysystem": "^1.0.8",
"monolog/monolog": "^1.12|^2.0",
"nesbot/carbon": "^2.0",
Expand Down
14 changes: 11 additions & 3 deletions src/Illuminate/Mail/Markdown.php
View file
Open in desktop
Expand Up @@ -5,7 +5,9 @@
use Illuminate\Contracts\View\Factory as ViewFactory;
use Illuminate\Support\HtmlString;
use Illuminate\Support\Str;
use Parsedown;
use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment;
use League\CommonMark\Ext\Table\TableExtension;
use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;

class Markdown
Expand Down Expand Up @@ -98,9 +100,15 @@ public function renderText($view, array $data = [])
*/
public static function parse($text)
{
$parsedown = new Parsedown;
$environment = Environment::createCommonMarkEnvironment();

return new HtmlString($parsedown->text($text));
$environment->addExtension(new TableExtension);

$converter = new CommonMarkConverter([
'allow_unsafe_links' => false,
], $environment);

return new HtmlString($converter->convertToHtml($text));
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/Illuminate/Mail/composer.json
View file
Open in desktop
Expand Up @@ -16,7 +16,8 @@
"require": {
"php": "^7.2",
"ext-json": "*",
"erusev/parsedown": "^1.7",
"league/commonmark": "^1.1",
"league/commonmark-ext-table": "^2.1",
"illuminate/container": "^6.0",
"illuminate/contracts": "^6.0",
"illuminate/support": "^6.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/Mail/MailMarkdownTest.php
View file
Open in desktop
Expand Up @@ -66,6 +66,6 @@ public function testParseReturnsParsedMarkdown()

$result = $markdown->parse('# Something')->toHtml();

$this->assertSame('<h1>Something</h1>', $result);
$this->assertSame("<h1>Something</h1>\n", $result);
}
}