Merge branch hotfix/v2.3.28

.github/workflows/run-test.yml

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

LICENSE.md

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright © 2024 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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

composer.json

@@ -3,11 +3,11 @@
     "description": "Markdown services and Twig extension for Roadiz",
     "type": "library",
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "league/commonmark": "^2.2.0",
         "twig/twig": "^3.1",
         "doctrine/collections": ">=1.6",
-        "symfony/stopwatch": "5.4.*"
+        "symfony/stopwatch": "6.4.*"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.5",
@@ -29,8 +29,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev",
-            "dev-develop": "2.2.x-dev"
+            "dev-master": "2.3.x-dev",
+            "dev-develop": "2.4.x-dev"
         }
     }
 }

phpstan.neon

@@ -1,12 +1,14 @@
 parameters:
-    level: max
+    level: 7
     paths:
         - src
     excludePaths:
         - */node_modules/*
         - */bower_components/*
         - */static/*
     ignoreErrors:
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics
         - '#Instantiated class Memcached not found#'
         - '#Instantiated class Redis not found#'
     reportUnmatchedIgnoredErrors: false

src/CommonMark.php

@@ -9,41 +9,22 @@
 
 final class CommonMark implements MarkdownInterface
 {
-    private ?Stopwatch $stopwatch;
-    private MarkdownConverter $textConverter;
-    private MarkdownConverter $lineConverter;
-    private MarkdownConverter $textExtraConverter;
-
-    /**
-     * @param MarkdownConverter $textConverter
-     * @param MarkdownConverter $textExtraConverter
-     * @param MarkdownConverter $lineConverter
-     * @param Stopwatch|null      $stopwatch
-     */
     public function __construct(
-        MarkdownConverter $textConverter,
-        MarkdownConverter $textExtraConverter,
-        MarkdownConverter $lineConverter,
-        ?Stopwatch $stopwatch = null
+        private readonly MarkdownConverter $textConverter,
+        private readonly MarkdownConverter $textExtraConverter,
+        private readonly MarkdownConverter $lineConverter,
+        private readonly ?Stopwatch $stopwatch = null
     ) {
-        $this->textConverter = $textConverter;
-        $this->textExtraConverter = $textExtraConverter;
-        $this->lineConverter = $lineConverter;
-        $this->stopwatch = $stopwatch;
     }
 
     public function text(string $markdown = null): string
     {
         if (null === $markdown) {
             return '';
         }
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->start(CommonMark::class . '::text');
-        }
+        $this->stopwatch?->start(CommonMark::class . '::text');
         $html = $this->textConverter->convert($markdown)->getContent();
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->stop(CommonMark::class . '::text');
-        }
+        $this->stopwatch?->stop(CommonMark::class . '::text');
         return $html;
     }
 
@@ -52,13 +33,9 @@ public function textExtra(string $markdown = null): string
         if (null === $markdown) {
             return '';
         }
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->start(CommonMark::class . '::textExtra');
-        }
+        $this->stopwatch?->start(CommonMark::class . '::textExtra');
         $html = $this->textExtraConverter->convert($markdown)->getContent();
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->stop(CommonMark::class . '::textExtra');
-        }
+        $this->stopwatch?->stop(CommonMark::class . '::textExtra');
         return $html;
     }
 
@@ -67,13 +44,9 @@ public function line(string $markdown = null): string
         if (null === $markdown) {
             return '';
         }
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->start(CommonMark::class . '::line');
-        }
+        $this->stopwatch?->start(CommonMark::class . '::line');
         $html = $this->lineConverter->convert($markdown)->getContent();
-        if (null !== $this->stopwatch) {
-            $this->stopwatch->stop(CommonMark::class . '::line');
-        }
+        $this->stopwatch?->stop(CommonMark::class . '::line');
         return $html;
     }
 }

src/Twig/MarkdownExtension.php

@@ -10,11 +10,8 @@
 
 final class MarkdownExtension extends AbstractExtension
 {
-    private MarkdownInterface $markdown;
-
-    public function __construct(MarkdownInterface $markdown)
+    public function __construct(private readonly MarkdownInterface $markdown)
     {
-        $this->markdown = $markdown;
     }
 
     public function getFilters(): array