chore: bumped

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -1,4 +1,4 @@
-name: Static analysis and code style
+name: Unit tests, static analysis and code style
 
 on:
     push:
@@ -15,11 +15,11 @@ on:
             - ready_for_review
 
 jobs:
-    static-analysis-tests:
+    run-tests:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.3', '8.4', '8.5']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

composer.json

@@ -6,11 +6,11 @@
         "php": ">=8.3",
         "doctrine/collections": ">=1.6",
         "league/commonmark": "^2.2.0",
-        "symfony/stopwatch": "7.4.*",
+        "symfony/stopwatch": "7.3.*",
         "twig/twig": "^3.21"
     },
     "require-dev": {
-        "phpstan/phpstan": "^2.1.36",
+        "phpstan/phpstan": "^1.5.3",
         "phpstan/phpdoc-parser": "<2"
     },
     "license": "MIT",
@@ -29,8 +29,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7.x-dev",
-            "dev-develop": "2.8.x-dev"
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
         }
     }
 }

src/CommonMark.php

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

src/MarkdownInterface.php

@@ -8,19 +8,13 @@ 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, bool $allowHtml = false): string;
+    public function text(?string $markdown = null): 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, bool $allowHtml = false): string;
+    public function textExtra(?string $markdown = null): string;
 
     /**
      * Convert Markdown to HTML using only inline HTML elements.

src/Twig/MarkdownExtension.php

@@ -26,18 +26,13 @@ public function getFilters(): array
         ];
     }
 
-    /**
-     * @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
+    public function markdown(?string $input): string
     {
         if (null === $input) {
             return '';
         }
 
-        return $this->markdown->text($input, $allowHtml);
+        return $this->markdown->text($input);
     }
 
     public function inlineMarkdown(?string $input): string
@@ -49,17 +44,12 @@ public function inlineMarkdown(?string $input): string
         return $this->markdown->line($input);
     }
 
-    /**
-     * @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
+    public function markdownExtra(?string $input): string
     {
         if (null === $input) {
             return '';
         }
 
-        return $this->markdown->textExtra($input, $allowHtml);
+        return $this->markdown->textExtra($input);
     }
 }