From 0af6e82a4327692fc04fa84fd73e934c5d73728a Mon Sep 17 00:00:00 2001 From: silvioq Date: Sat, 10 Oct 2020 23:57:12 -0300 Subject: [PATCH 1/3] Template engine deprecation - Change EngineInterface by Twig\Environment - Adjust test - Change service definition --- src/EventListener/PdfListener.php | 4 ++-- src/Resources/config/pdf.xml | 4 ++-- tests/EventListener/PdfListenerTest.php | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/EventListener/PdfListener.php b/src/EventListener/PdfListener.php index 68f7d69..2d4c5b4 100644 --- a/src/EventListener/PdfListener.php +++ b/src/EventListener/PdfListener.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\FilterControllerEvent; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; -use Symfony\Component\Templating\EngineInterface; +use Twig\Environment as Engine; /** * This listener will replace reponse content by pdf document's content if Pdf annotations is found. @@ -33,7 +33,7 @@ class PdfListener private $templatingEngine; private $cache; - public function __construct(FacadeBuilder $pdfFacadeBuilder, Reader $annotationReader, Factory $reflectionFactory, EngineInterface $templatingEngine, Cache $cache) + public function __construct(FacadeBuilder $pdfFacadeBuilder, Reader $annotationReader, Factory $reflectionFactory, Engine $templatingEngine, Cache $cache) { $this->pdfFacadeBuilder = $pdfFacadeBuilder; $this->annotationReader = $annotationReader; diff --git a/src/Resources/config/pdf.xml b/src/Resources/config/pdf.xml index 266d5cf..b86005b 100644 --- a/src/Resources/config/pdf.xml +++ b/src/Resources/config/pdf.xml @@ -62,7 +62,7 @@ - + @@ -86,4 +86,4 @@ %ps_pdf.cache.options% - \ No newline at end of file + diff --git a/tests/EventListener/PdfListenerTest.php b/tests/EventListener/PdfListenerTest.php index d1ba47b..e013711 100644 --- a/tests/EventListener/PdfListenerTest.php +++ b/tests/EventListener/PdfListenerTest.php @@ -16,7 +16,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\FilterControllerEvent; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; -use Symfony\Component\Templating\EngineInterface; +use Twig\Environment as Engine; class PdfListenerTest extends TestCase { @@ -43,7 +43,8 @@ protected function setUp(): void ->setMethods(['render']) ->getMock(); - $this->templatingEngine = $this->getMockBuilder(EngineInterface::class) + $this->templatingEngine = $this->getMockBuilder(Engine::class) + ->disableOriginalConstructor() ->setMethods(['render', 'supports', 'exists']) ->getMock(); From ebe9fe686673c3e939f190729f5b70fcb6fd62e7 Mon Sep 17 00:00:00 2001 From: Silvio Date: Thu, 24 Nov 2022 21:58:55 -0300 Subject: [PATCH 2/3] Prueba de pasar a php8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b1131d7..263eb93 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "sort-packages": true }, "require": { - "php": "^7.1", + "php": ">7.1", "doctrine/annotations": "^1.0", "psliwa/php-pdf": "^1.1.5", "sensio/framework-extra-bundle": "^2|^3|^4|^5", From d87385a18d2d55af51fb3ceb453547da541b01ed Mon Sep 17 00:00:00 2001 From: Silvio Date: Sun, 27 Nov 2022 13:31:41 +0000 Subject: [PATCH 3/3] PHP >= 8 compatibility --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 263eb93..d1f4b96 100644 --- a/composer.json +++ b/composer.json @@ -16,9 +16,9 @@ "sort-packages": true }, "require": { - "php": ">7.1", + "php": "^7.1|^8", "doctrine/annotations": "^1.0", - "psliwa/php-pdf": "^1.1.5", + "psliwa/php-pdf": "^1.1.5|^2", "sensio/framework-extra-bundle": "^2|^3|^4|^5", "symfony/config": "^3.4|^4.0", "symfony/dependency-injection": "^3.4|^4.0",