Merge branch hotfix/v2.6.9

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,11 +3,11 @@
     "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.3.*",
+        "twig/twig": "^3.21"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.5.3",
@@ -29,8 +29,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5.x-dev",
-            "dev-develop": "2.6.x-dev"
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
         }
     }
 }

src/CommonMark.php

@@ -17,6 +17,7 @@ public function __construct(
     ) {
     }
 
+    #[\Override]
     public function text(?string $markdown = null): string
     {
         if (null === $markdown) {
@@ -29,6 +30,7 @@ public function text(?string $markdown = null): string
         return $html;
     }
 
+    #[\Override]
     public function textExtra(?string $markdown = null): string
     {
         if (null === $markdown) {
@@ -41,6 +43,7 @@ public function textExtra(?string $markdown = null): string
         return $html;
     }
 
+    #[\Override]
     public function line(?string $markdown = null): string
     {
         if (null === $markdown) {

src/Twig/MarkdownExtension.php

@@ -14,14 +14,15 @@ 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']]),
         ];
     }