Add support for TYPO3 v13

.github/ISSUE_TEMPLATE/support-question.md

@@ -11,4 +11,4 @@ assignees: maechler
 - Have you googled your question?
 - Have you asked your colleagues for help?
 
-If you could answer all this questions with yes, please feel free to open an issue with your question. We will try our best to help you.
+If you could answer all these questions with yes, please feel free to open an issue with your question. We will try our best to help you.

.github/workflows/build.yml

@@ -6,21 +6,20 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
       matrix:
         env:
-          - { TYPO3_VERSION: 11, PHP_VERSION: 7.4 }
-          - { TYPO3_VERSION: 11, PHP_VERSION: 8.0 }
           - { TYPO3_VERSION: 12, PHP_VERSION: 8.1 }
           - { TYPO3_VERSION: 12, PHP_VERSION: 8.2 }
-          - { TYPO3_VERSION: 12, PHP_VERSION: 8.3 }
+          - { TYPO3_VERSION: 13, PHP_VERSION: 8.3 }
+          - { TYPO3_VERSION: 13, PHP_VERSION: 8.4 }
 
     env:
-      TCPDF_VERSION: 6.6.2
-      FPDI_VERSION: 2.5.0
+      TCPDF_VERSION: 6.8.2
+      FPDI_VERSION: 2.6.3
 
     steps:
       - name: Checkout

.github/workflows/ter.yml

@@ -5,9 +5,7 @@ on:
       - "**"
 jobs:
   TERUpload:
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog for TYPO3 CMS Extension pdfviewhelpers
 
+## 3.1.0 - Not yet released
+
+- Adds support for TYPO3 13 LTS
+- Drops support for TYPO3 11 LTS
+- Drops support for PHP < 8.1
+
 ## 3.0.2 - February 8, 2025
 
 - Fixes version in docs and `ext_emconf.php`

Classes/Hooks/TypoScriptFrontendControllerHook.php → Classes/EventListener/AfterCacheableContentIsGeneratedEventListener.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bithost\Pdfviewhelpers\Hooks;
+namespace Bithost\Pdfviewhelpers\EventListener;
 
 /* * *
  *
@@ -30,26 +30,25 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  * * */
 
-use TYPO3\CMS\Core\SingletonInterface;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use Bithost\Pdfviewhelpers\Service\OutputService;
+use TYPO3\CMS\Frontend\Event\AfterCacheableContentIsGeneratedEvent;
 
 /**
- * TypoScriptFrontendController
+ * AfterCacheableContentIsGeneratedEventListener
  *
  * @author Markus Mächler <markus.maechler@bithost.ch>, Esteban Gehring <esteban.gehring@bithost.ch>
  */
-class TypoScriptFrontendControllerHook implements SingletonInterface
+class AfterCacheableContentIsGeneratedEventListener
 {
-    /**
-     * Prevent any output when a pdf is rendered, especially any headers being set!
-     */
-    public function isOutputting(array &$params, TypoScriptFrontendController $ref): void
+    public function __construct(
+        protected OutputService $outputService,
+    ) {
+    }
+
+    public function __invoke(AfterCacheableContentIsGeneratedEvent $event): void
     {
-        if (
-            isset($params['pObj']->applicationData['tx_pdfviewhelpers']['pdfOutput'])
-            && $params['pObj']->applicationData['tx_pdfviewhelpers']['pdfOutput'] === true
-        ) {
-            $params['enableOutput'] = false;
+        if ($this->outputService->shouldDisablePageCache()) {
+            $event->disableCaching();
         }
     }
 }

Classes/Middleware/Frontend/StopOutputMiddleware.php

@@ -4,24 +4,52 @@
 
 namespace Bithost\Pdfviewhelpers\Middleware\Frontend;
 
+/* * *
+ *
+ * This file is part of the "PDF ViewHelpers" Extension for TYPO3 CMS.
+ *
+ *  (c) 2016 Markus Mächler <markus.maechler@bithost.ch>, Bithost GmbH
+ *           Esteban Gehring <esteban.gehring@bithost.ch>, Bithost GmbH
+ *
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ * * */
+
+use Bithost\Pdfviewhelpers\Service\OutputService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use TYPO3\CMS\Core\Http\NullResponse;
-use TYPO3\CMS\Core\Information\Typo3Version;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class StopOutputMiddleware implements MiddlewareInterface
 {
+    public function __construct(
+        protected OutputService $outputService,
+    ) {
+    }
+
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $response = $handler->handle($request);
 
-        if (
-            GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() >= 11
-            && ($GLOBALS['TSFE']->applicationData['tx_pdfviewhelpers']['pdfOutput'] ?? false)
-        ) {
+        if ($this->outputService->isOutputDestinationOut()) {
+            // Avoid sending additional request header or body data if TCPDF has already sent a response
             return new NullResponse();
         }
 

Classes/Service/OutputService.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bithost\Pdfviewhelpers\Service;
+
+/* * *
+ *
+ * This file is part of the "PDF ViewHelpers" Extension for TYPO3 CMS.
+ *
+ *  (c) 2016 Markus Mächler <markus.maechler@bithost.ch>, Bithost GmbH
+ *           Esteban Gehring <esteban.gehring@bithost.ch>, Bithost GmbH
+ *
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ * * */
+
+use TYPO3\CMS\Core\SingletonInterface;
+
+/**
+ * OutputService
+ *
+ * @author Markus Mächler <markus.maechler@bithost.ch>, Esteban Gehring <esteban.gehring@bithost.ch>
+ */
+class OutputService implements SingletonInterface
+{
+    protected bool $isOutputDestinationOut = false;
+
+    protected bool $disableCache = true;
+
+    public function shouldDisablePageCache(): bool
+    {
+        return $this->isOutputDestinationOut() && $this->getDisableCache();
+    }
+
+    public function isOutputDestinationOut(): bool
+    {
+        return $this->isOutputDestinationOut;
+    }
+
+    public function setIsOutputDestinationOut(bool $isOutputDestinationOut): void
+    {
+        $this->isOutputDestinationOut = $isOutputDestinationOut;
+    }
+
+    public function getDisableCache(): bool
+    {
+        return $this->disableCache;
+    }
+
+    public function setDisableCache(bool $disableCache): void
+    {
+        $this->disableCache = $disableCache;
+    }
+}

Classes/ViewHelpers/DocumentViewHelper.php

@@ -33,10 +33,9 @@
 use Bithost\Pdfviewhelpers\Exception\Exception;
 use Bithost\Pdfviewhelpers\Exception\ValidationException;
 use Bithost\Pdfviewhelpers\Model\BasePDF;
+use Bithost\Pdfviewhelpers\Service\OutputService;
 use setasign\Fpdi\PdfParser\PdfParserException;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 /**
  * DocumentViewHelper
@@ -60,6 +59,13 @@ class DocumentViewHelper extends AbstractPDFViewHelper
      */
     protected array $tcpdfReturnContentDestinations = ['S', 'E'];
 
+    protected OutputService $outputService;
+
+    public function injectOutputService(OutputService $outputService): void
+    {
+        $this->outputService = $outputService;
+    }
+
     /**
      * @inheritDoc
      */
@@ -95,8 +101,8 @@ public function initialize()
 
         $this->arguments['outputDestination'] = $this->conversionService->convertSpeakingOutputDestinationToTcpdfOutputDestination($this->arguments['outputDestination']);
 
-        if (isset($GLOBALS['TSFE']->applicationData) && in_array($this->arguments['outputDestination'], $this->tcpdfOutputContentDestinations)) {
-            $GLOBALS['TSFE']->applicationData['tx_pdfviewhelpers']['pdfOutput'] = true;
+        if (in_array($this->arguments['outputDestination'], $this->tcpdfOutputContentDestinations)) {
+            $this->outputService->setIsOutputDestinationOut(true);
         }
 
         if (!empty($this->settings['config']['class'])) {
@@ -129,10 +135,7 @@ public function initialize()
         $this->getPDF()->setCreator($this->arguments['creator']);
         $this->getPDF()->disableTcpdfLink(); // Part for increasing accessibility (ua-1)
 
-        //Disables cache if set so and in frontend mode
-        if (isset($GLOBALS['TSFE']) && $GLOBALS['TSFE'] instanceof TypoScriptFrontendController && $this->settings['config']['disableCache']) {
-            $GLOBALS['TSFE']->set_no_cache('EXT:pdfviewhelpers force disabled caching, see plugin.tx_pdfviewhelpers.settings.config.disableCache', true);
-        }
+        $this->outputService->setDisableCache($this->settings['config']['disableCache'] === '1');
 
         $this->viewHelperVariableContainer->add('DocumentViewHelper', 'hyphenFile', $this->arguments['hyphenFile']);
         $this->viewHelperVariableContainer->addOrUpdate('DocumentViewHelper', 'defaultHeaderFooterScope', BasePDF::SCOPE_DOCUMENT);

Configuration/Services.yaml

@@ -6,3 +6,8 @@ services:
 
   Bithost\Pdfviewhelpers\:
     resource: '../Classes/*'
+
+  Bithost\Pdfviewhelpers\EventListener\AfterCacheableContentIsGeneratedEventListener:
+    tags:
+      - name: event.listener
+        identifier: 'bithost/pdfviewhelpers/disable-page-cache'

Configuration/TypoScript/Extensions/News/setup.typoscript

@@ -1,4 +1,4 @@
-[getTSFE() && getTSFE().type == 28032013]
+[request && traverse(request.getQueryParams(), 'type') == 28032013]
 	pageNewsPDF = PAGE
 	pageNewsPDF {
 		typeNum = 28032013

Documentation/ConfigurationReference/ExtNews/Index.rst

@@ -31,7 +31,7 @@ Please make sure that all your configuration is limited to the page type ``28032
 
 ::
 
-	[getTSFE() && getTSFE().type == 28032013]
+	[request && traverse(request.getQueryParams(), 'type') == 28032013]
 		plugin.tx_pdfviewhelpers.settings {
 			text {
 				types {
@@ -61,7 +61,7 @@ that is located in ``EXT:yourext/Resources/Private/Templates/Extensions/News/Tem
 
 ::
 
-	[getTSFE() && getTSFE().type == 28032013]
+	[request && traverse(request.getQueryParams(), 'type') == 28032013]
 		plugin.tx_news {
 			view {
 				templateRootPaths {

Tests/Functional/AbstractFunctionalTestCase.php

@@ -30,11 +30,19 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  * * */
 
+use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Core\View\ViewFactoryData;
+use TYPO3\CMS\Core\View\ViewFactoryInterface;
+use TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager;
+use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 use Smalot\PdfParser\Document;
 use Smalot\PdfParser\Parser;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
+use TYPO3\CMS\Core\TypoScript\AST\Node\RootNode;
+use TYPO3\CMS\Core\TypoScript\FrontendTypoScript;
 
 /**
  * BaseFunctionalTest
@@ -69,20 +77,43 @@ public function setUp(): void
         $this->importCSVDataSet($this->getFixtureAbsolutePath('pages.csv'));
         $this->setUpFrontendRootPage(
             1,
-            array_merge($baseTypoScripts, $this->typoScriptFiles),
+            [ 'setup' => array_merge($baseTypoScripts, $this->typoScriptFiles)],
         );
+
+        /** @var BackendConfigurationManager $backendConfManager */
+        $backendConfigurationManager  = $this->get(BackendConfigurationManager::class);
+        $backendTypoScriptSetup = $backendConfigurationManager->getTypoScriptSetup(new InternalRequest());
+
+        $frontendTypoScript = new FrontendTypoScript(new RootNode(), [], [], []);
+        $frontendTypoScript->setSetupArray($backendTypoScriptSetup);
+
+        $GLOBALS['TYPO3_REQUEST'] = (new InternalRequest())
+            ->withPageId(1)
+            ->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_FE)
+            ->withAttribute('frontend.typoscript', $frontendTypoScript);
     }
 
     protected function renderFluidTemplate(string $templatePath, array $variables = []): string
     {
-        /** @var StandaloneView $standaloneView */
-        $standaloneView = GeneralUtility::makeInstance(StandaloneView::class);
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+            /** @var StandaloneView $view */
+            $view = GeneralUtility::makeInstance(StandaloneView::class);
+
+            $view->setFormat('html');
+            $view->setTemplatePathAndFilename($templatePath);
+        } else {
+            /** @var ViewFactoryInterface $viewFactory */
+            $viewFactory = GeneralUtility::makeInstance(ViewFactoryInterface::class);
+            $viewFactoryData = new ViewFactoryData(
+                templateRootPaths: [$this->getFixtureExtPath('')],
+                templatePathAndFilename: $templatePath,
+            );
+            $view = $viewFactory->create($viewFactoryData);
+        }
 
-        $standaloneView->setFormat('html');
-        $standaloneView->setTemplatePathAndFilename($templatePath);
-        $standaloneView->assignMultiple($variables);
+        $view->assignMultiple($variables);
 
-        return (string) $standaloneView->render();
+        return $view->render();
     }
 
     protected function getFixtureExtPath(string $path): string