feature #1080 Update markdown (abdounikarim)

This PR was squashed before being merged into the master branch (closes #1080).

Discussion
----------

Update markdown

Hello,

I remove the Markdown class which was used to convert markdown to html.
I used the [markdown_to_html](https://twig.symfony.com/doc/2.x/filters/markdown_to_html.html) filter instead.

I run the tests after and hey still works.

Commits
-------

4d690c7 Update markdown

Author: javiereguiluz

composer.json

@@ -35,8 +35,9 @@
         "symfony/validator": "5.0.*",
         "symfony/webpack-encore-bundle": "^1.4",
         "symfony/yaml": "5.0.*",
-        "tgalopin/html-sanitizer-bundle": "^1.1",
+        "tgalopin/html-sanitizer-bundle": "^1.2",
         "twig/intl-extra": "^3.0",
+        "twig/markdown-extra": "^3.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {

composer.lock

@@ -13,6 +13,7 @@
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
-    HtmlSanitizer\Bundle\HtmlSanitizerBundle::class => ['all' => true],
     Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
+    Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
+    HtmlSanitizer\Bundle\HtmlSanitizerBundle::class => ['all' => true],
 ];

config/bundles.php

@@ -10,6 +10,8 @@ html_sanitizer:
                 - 'table'
                 - 'image'
                 - 'code'
+                # - 'iframe'
+                # - 'extra'
 
             # Read https://github.com/tgalopin/html-sanitizer/blob/master/docs/3-configuration-reference.md
             # to discover all the available options for each extension.

config/packages/html_sanitizer.yaml

@@ -32,6 +32,3 @@ services:
     # 'arguments' key and define the arguments just below the service class
     App\EventSubscriber\CommentNotificationSubscriber:
         $sender: '%app.notifications.email_sender%'
-
-    # needed to activate the filters provided by Twig Intl Extension
-    Twig\Extra\Intl\IntlExtension: null

config/services.yaml

@@ -11,16 +11,12 @@
 
 namespace App\Twig;
 
-use App\Utils\Markdown;
 use Symfony\Component\Intl\Locales;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 
 /**
- * This Twig extension adds a new 'md2html' filter to easily transform Markdown
- * contents into HTML contents inside Twig templates.
- *
  * See https://symfony.com/doc/current/templating/twig_extension.html
  *
  * @author Ryan Weaver <weaverryan@gmail.com>
@@ -29,29 +25,16 @@
  */
 class AppExtension extends AbstractExtension
 {
-    private $parser;
     private $localeCodes;
     private $locales;
 
-    public function __construct(Markdown $parser, string $locales)
+    public function __construct(string $locales)
     {
-        $this->parser = $parser;
-
         $localeCodes = explode('|', $locales);
         sort($localeCodes);
         $this->localeCodes = $localeCodes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFilters(): array
-    {
-        return [
-            new TwigFilter('md2html', [$this, 'markdownToHtml'], ['is_safe' => ['html']]),
-        ];
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -62,14 +45,6 @@ public function getFunctions(): array
         ];
     }
 
-    /**
-     * Transforms the given Markdown content into HTML content.
-     */
-    public function markdownToHtml(string $content): string
-    {
-        return $this->parser->toHtml($content);
-    }
-
     /**
      * Takes the list of codes of the locales (languages) enabled in the
      * application and returns an array with the name of each locale written

src/Twig/AppExtension.php

@@ -473,6 +473,9 @@
             "templates/base.html.twig"
         ]
     },
+    "symfony/twig-pack": {
+        "version": "v1.0.0"
+    },
     "symfony/validator": {
         "version": "4.3",
         "recipe": {
@@ -524,7 +527,7 @@
         "version": "v4.3.3"
     },
     "tgalopin/html-sanitizer": {
-        "version": "1.3.0"
+        "version": "1.4.0"
     },
     "tgalopin/html-sanitizer-bundle": {
         "version": "1.0",
@@ -533,11 +536,20 @@
             "branch": "master",
             "version": "1.0",
             "ref": "26a72f38eede2c53b5d3ccbed5c150e10a93268d"
-        }
+        },
+        "files": [
+            "config/packages/html_sanitizer.yaml"
+        ]
+    },
+    "twig/extra-bundle": {
+        "version": "v3.0.3"
     },
     "twig/intl-extra": {
         "version": "v3.0.0"
     },
+    "twig/markdown-extra": {
+        "version": "v3.0.3"
+    },
     "twig/twig": {
         "version": "v2.12.2"
     },

src/Utils/Markdown.php

@@ -14,7 +14,7 @@
         <p class="m-b-0"><strong>{{ 'label.summary'|trans }}</strong>: {{ post.summary }}</p>
     </div>
 
-    {{ post.content|md2html }}
+    {{ post.content|markdown_to_html|sanitize_html }}
 
     {{ include('blog/_post_tags.html.twig') }}
 {% endblock %}

symfony.lock

@@ -10,7 +10,7 @@
         <span class="metadata"><i class="fa fa-user"></i> {{ post.author.fullName }}</span>
     </p>
 
-    {{ post.content|md2html }}
+    {{ post.content|markdown_to_html|sanitize_html }}
 
     {{ include('blog/_post_tags.html.twig') }}
 
@@ -48,7 +48,7 @@
                 <strong>{{ comment.publishedAt|format_datetime('medium', 'short', '', 'UTC') }}</strong>
             </h4>
             <div class="col-sm-9">
-                {{ comment.content|md2html }}
+                {{ comment.content|markdown_to_html|sanitize_html }}
             </div>
         </div>
     {% else %}