Merge branch hotfix/v2.7.24

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.2', '8.3']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2024 Ambroise Maupate
+Copyright © 2025 Ambroise Maupate
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

composer.json

@@ -3,14 +3,14 @@
     "description": "Markdown services and Twig extension for Roadiz",
     "type": "library",
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.3",
         "doctrine/collections": ">=1.6",
         "league/commonmark": "^2.2.0",
-        "symfony/stopwatch": "6.4.*",
-        "twig/twig": "^3.16"
+        "symfony/stopwatch": "7.4.*",
+        "twig/twig": "^3.21"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.5.3",
+        "phpstan/phpstan": "^2.1.36",
         "phpstan/phpdoc-parser": "<2"
     },
     "license": "MIT",
@@ -29,8 +29,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5.x-dev",
-            "dev-develop": "2.6.x-dev"
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
         }
     }
 }

src/CommonMark.php

@@ -13,34 +13,41 @@ public function __construct(
         private MarkdownConverter $textConverter,
         private MarkdownConverter $textExtraConverter,
         private MarkdownConverter $lineConverter,
+        private MarkdownConverter $textHtmlConverter,
+        private MarkdownConverter $textExtraHtmlConverter,
         private ?Stopwatch $stopwatch = null,
     ) {
     }
 
-    public function text(?string $markdown = null): string
+    #[\Override]
+    public function text(?string $markdown = null, bool $allowHtml = false): string
     {
         if (null === $markdown) {
             return '';
         }
         $this->stopwatch?->start(CommonMark::class.'::text');
-        $html = $this->textConverter->convert($markdown)->getContent();
+        $converter = $allowHtml ? $this->textHtmlConverter : $this->textConverter;
+        $html = $converter->convert($markdown)->getContent();
         $this->stopwatch?->stop(CommonMark::class.'::text');
 
         return $html;
     }
 
-    public function textExtra(?string $markdown = null): string
+    #[\Override]
+    public function textExtra(?string $markdown = null, bool $allowHtml = false): string
     {
         if (null === $markdown) {
             return '';
         }
         $this->stopwatch?->start(CommonMark::class.'::textExtra');
-        $html = $this->textExtraConverter->convert($markdown)->getContent();
+        $converter = $allowHtml ? $this->textExtraHtmlConverter : $this->textExtraConverter;
+        $html = $converter->convert($markdown)->getContent();
         $this->stopwatch?->stop(CommonMark::class.'::textExtra');
 
         return $html;
     }
 
+    #[\Override]
     public function line(?string $markdown = null): string
     {
         if (null === $markdown) {

src/MarkdownInterface.php

@@ -8,13 +8,19 @@ interface MarkdownInterface
 {
     /**
      * Convert Markdown to HTML using standard Markdown syntax.
+     *
+     * @param bool $allowHtml Pass true to allow raw HTML (including script/style tags) through
+     *                        unchanged. Defaults to false (raw HTML is stripped).
      */
-    public function text(?string $markdown = null): string;
+    public function text(?string $markdown = null, bool $allowHtml = false): string;
 
     /**
      * Convert Markdown to HTML using standard Markdown Extra syntax.
+     *
+     * @param bool $allowHtml Pass true to allow raw HTML (including script/style tags) through
+     *                        unchanged. Defaults to false (raw HTML is stripped).
      */
-    public function textExtra(?string $markdown = null): string;
+    public function textExtra(?string $markdown = null, bool $allowHtml = false): string;
 
     /**
      * Convert Markdown to HTML using only inline HTML elements.

src/Twig/MarkdownExtension.php

@@ -14,24 +14,30 @@ public function __construct(private readonly MarkdownInterface $markdown)
     {
     }
 
+    #[\Override]
     public function getFilters(): array
     {
         return [
-            new TwigFilter('markdown', [$this, 'markdown'], ['is_safe' => ['html']]),
-            new TwigFilter('inlineMarkdown', [$this, 'inlineMarkdown'], ['is_safe' => ['html']]),
-            new TwigFilter('inline_markdown', [$this, 'inlineMarkdown'], ['is_safe' => ['html']]),
-            new TwigFilter('markdownExtra', [$this, 'markdownExtra'], ['is_safe' => ['html']]),
-            new TwigFilter('markdown_extra', [$this, 'markdownExtra'], ['is_safe' => ['html']]),
+            new TwigFilter('markdown', $this->markdown(...), ['is_safe' => ['html']]),
+            new TwigFilter('inlineMarkdown', $this->inlineMarkdown(...), ['is_safe' => ['html']]),
+            new TwigFilter('inline_markdown', $this->inlineMarkdown(...), ['is_safe' => ['html']]),
+            new TwigFilter('markdownExtra', $this->markdownExtra(...), ['is_safe' => ['html']]),
+            new TwigFilter('markdown_extra', $this->markdownExtra(...), ['is_safe' => ['html']]),
         ];
     }
 
-    public function markdown(?string $input): string
+    /**
+     * @param bool $allowHtml Set to true to allow raw HTML (including script/style tags) through
+     *                        unchanged. Defaults to false — raw HTML is stripped.
+     *                        Usage: {{ content|markdown(true) }}
+     */
+    public function markdown(?string $input, bool $allowHtml = false): string
     {
         if (null === $input) {
             return '';
         }
 
-        return $this->markdown->text($input);
+        return $this->markdown->text($input, $allowHtml);
     }
 
     public function inlineMarkdown(?string $input): string
@@ -43,12 +49,17 @@ public function inlineMarkdown(?string $input): string
         return $this->markdown->line($input);
     }
 
-    public function markdownExtra(?string $input): string
+    /**
+     * @param bool $allowHtml Set to true to allow raw HTML (including script/style tags) through
+     *                        unchanged. Defaults to false — raw HTML is stripped.
+     *                        Usage: {{ content|markdownExtra(true) }}
+     */
+    public function markdownExtra(?string $input, bool $allowHtml = false): string
     {
         if (null === $input) {
             return '';
         }
 
-        return $this->markdown->textExtra($input);
+        return $this->markdown->textExtra($input, $allowHtml);
     }
 }