Merge branch 'release/2.4.0'

Author: endelwar

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 2.4.0 - 2025-04-10
+### Changed
+- Add support for php-weasyprint 2.0
+### Security
+- Update `symfony/http-foundation` minimal version to mitigate [CVE-2024-50345](https://github.com/advisories/GHSA-mrqx-rp3w-jpjp)
+
 ## 2.3.0 - 2024-11-04
 ### Added
 - Added support for PHP 8.4

composer.json

@@ -17,10 +17,10 @@
     ],
     "require": {
         "php": "7.4.* || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*",
-        "pontedilana/php-weasyprint": "^1.0",
+        "pontedilana/php-weasyprint": "^1.0 || ^2.0",
         "symfony/config": "^5.4 || ^6.3 || ^7.0",
         "symfony/dependency-injection": "^5.4 || ^6.3 || ^7.0",
-        "symfony/http-foundation": "^5.4 || ^6.3 || ^7.0",
+        "symfony/http-foundation": "^5.4.46 || ^6.4.14 || ^7.1.7",
         "symfony/http-kernel": "^5.4 || ^6.3 || ^7.0"
     },
     "require-dev": {

src/WeasyPrint/Response/WeasyPrintResponse.php

@@ -3,7 +3,6 @@
 namespace Pontedilana\WeasyprintBundle\WeasyPrint\Response;
 
 use Symfony\Component\HttpFoundation\Response as Base;
-use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 
 class WeasyPrintResponse extends Base
 {
@@ -18,14 +17,6 @@ public function __construct(
         int $status = 200,
         array $headers = []
     ) {
-        $contentDispositionDirectives = [
-            ResponseHeaderBag::DISPOSITION_INLINE,
-            ResponseHeaderBag::DISPOSITION_ATTACHMENT,
-        ];
-        if (!\in_array($contentDisposition, $contentDispositionDirectives, true)) {
-            throw new \InvalidArgumentException(\sprintf('Expected one of the following directives: "%s", but "%s" given.', implode('", "', $contentDispositionDirectives), $contentDisposition));
-        }
-
         parent::__construct($content, $status, $headers);
         $this->headers->add(['Content-Type' => $contentType]);
         $this->headers->add(['Content-Disposition' => $this->headers->makeDisposition($contentDisposition, $fileName)]);

tests/WeasyPrint/Response/WeasyPrintResponseTest.php

@@ -12,7 +12,7 @@ public function testExceptionMessage(): void
         try {
             new WeasyPrintResponse('', 'test.pdf', 'application/pdf', 'foo');
         } catch (\InvalidArgumentException $e) {
-            $this->assertSame('Expected one of the following directives: "inline", "attachment", but "foo" given.', $e->getMessage());
+            $this->assertSame('The disposition must be either "attachment" or "inline".', $e->getMessage());
         }
     }
 }