From 817ee776d654ce877bbdae0cc61943f14057c6a2 Mon Sep 17 00:00:00 2001 From: theo Date: Fri, 31 May 2024 15:38:58 +0200 Subject: [PATCH 1/2] =?UTF-8?q?m=C3=A0j=20symfony=207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 16 ++++++++-------- src/Generator/WordToPdfGenerator.php | 1 - src/Lib/Signature.php | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 0f44f1e..50577c5 100644 --- a/composer.json +++ b/composer.json @@ -9,25 +9,25 @@ "require": { "php": "^8.0", "laminas/laminas-escaper": "^2.11", - "symfony/property-access": "^6.0", + "symfony/property-access": "^7.0", "phpoffice/phpword": "^0.18", "tecnickcom/tcpdf": "^6.3", "vich/uploader-bundle": "^1.19 || ^2.0", - "symfony/yaml": "^6.0", + "symfony/yaml": "^7.0", "laminas/laminas-stdlib": "^3.15", - "symfony/http-foundation": "^6.0", + "symfony/http-foundation": "^7.0", "symfony/http-client-contracts": "^v3.4.0", "doctrine/orm": "^2.6 || ^3.0", - "symfony/routing": "^6.0", - "symfony/framework-bundle": "^6.0", + "symfony/routing": "^7.0", + "symfony/framework-bundle": "^7.0", "doctrine/annotations": "^1.13", - "symfony/serializer": "^6.0", + "symfony/serializer": "^7.0", "twig/twig": "^3.4.3", "setasign/fpdi": "^2.3.6", - "symfony/process": "^6.0", + "symfony/process": "^7.0", "setasign/fpdf": "1.8.4", "alexanderpavlov/pdfmerger": "^1.0", - "symfony/dotenv": "^6.0" + "symfony/dotenv": "^7.0" }, "autoload": { "psr-4": { diff --git a/src/Generator/WordToPdfGenerator.php b/src/Generator/WordToPdfGenerator.php index a1fa007..dc22d7d 100644 --- a/src/Generator/WordToPdfGenerator.php +++ b/src/Generator/WordToPdfGenerator.php @@ -21,7 +21,6 @@ class WordToPdfGenerator extends AbstractPdfGenerator { public function __construct( private PropertyAccessorInterface $propertyAccess, - private Environment $twig, private HttpClientInterface $httpClient, private ParameterBagInterface $parameterBag, ) { diff --git a/src/Lib/Signature.php b/src/Lib/Signature.php index f60a981..a08d700 100644 --- a/src/Lib/Signature.php +++ b/src/Lib/Signature.php @@ -193,7 +193,7 @@ public function signeTcpdfFpdi(Fpdi $pdf): Fpdi ); if ($this->image) { - $pdf->setSignatureAppearance($x ?? 0, $y ?? 0, $w ?? 0, $h ?? 0); + $pdf->setSignatureAppearance($x, $y, $w, $h); } } From f85d2d78e003af7cb385f084a16eb119cc2027d1 Mon Sep 17 00:00:00 2001 From: theo Date: Wed, 5 Jun 2024 10:28:09 +0200 Subject: [PATCH 2/2] add sf6 comlpatibility --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 50577c5..100a987 100644 --- a/composer.json +++ b/composer.json @@ -9,25 +9,25 @@ "require": { "php": "^8.0", "laminas/laminas-escaper": "^2.11", - "symfony/property-access": "^7.0", + "symfony/property-access": "^6.0 || ^7.0", "phpoffice/phpword": "^0.18", "tecnickcom/tcpdf": "^6.3", "vich/uploader-bundle": "^1.19 || ^2.0", - "symfony/yaml": "^7.0", + "symfony/yaml": "^6.0 || ^7.0", "laminas/laminas-stdlib": "^3.15", - "symfony/http-foundation": "^7.0", + "symfony/http-foundation": "^6.0 || ^7.0", "symfony/http-client-contracts": "^v3.4.0", "doctrine/orm": "^2.6 || ^3.0", - "symfony/routing": "^7.0", - "symfony/framework-bundle": "^7.0", + "symfony/routing": "^6.0 || ^7.0", + "symfony/framework-bundle": "^6.0 || ^7.0", "doctrine/annotations": "^1.13", - "symfony/serializer": "^7.0", + "symfony/serializer": "^6.0 || ^7.0", "twig/twig": "^3.4.3", "setasign/fpdi": "^2.3.6", - "symfony/process": "^7.0", + "symfony/process": "^6.0 || ^7.0", "setasign/fpdf": "1.8.4", "alexanderpavlov/pdfmerger": "^1.0", - "symfony/dotenv": "^7.0" + "symfony/dotenv": "^6.0 || ^7.0" }, "autoload": { "psr-4": {