feat: Update for TYPO3 v13

Author: tweis

Classes/Command/GenerateErrorPagesCommand.php

@@ -5,10 +5,10 @@
 namespace Netlogix\Nxerrorhandler\Command;
 
 use InvalidArgumentException;
-use Netlogix\Nxerrorhandler\ErrorHandler\GeneralExceptionHandler;
-use Netlogix\Nxerrorhandler\Exception\Exception;
 use Netlogix\Nxerrorhandler\Service\ConfigurationService;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -22,11 +22,11 @@
 use TYPO3\CMS\Core\Site\SiteFinder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class GenerateErrorPagesCommand extends Command
+class GenerateErrorPagesCommand extends Command implements LoggerAwareInterface
 {
-    private int|bool|null $deploymentDate = null;
+    use LoggerAwareTrait;
 
-    private ?GeneralExceptionHandler $exceptionHandler = null;
+    private int|bool|null $deploymentDate = null;
 
     protected function configure()
     {
@@ -74,6 +74,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             GeneralUtility::setIndpEnv('TYPO3_REQUEST_URL', (string) $site->getBase());
             foreach ($errorHandlingConfiguration as $errorCode => $configuration) {
                 foreach ($site->getLanguages() as $language) {
+                    if ($language->isEnabled() === false) {
+                        continue;
+                    }
+
                     if (!$forceGeneration && !$this->checkIfErrorPageNeedsRegeneration($errorCode, $site, $language)) {
                         continue;
                     }
@@ -87,15 +91,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     $resolvedUrl = $this->resolveUrl($request, $configuration['errorContentSource']);
                     $content = GeneralUtility::getUrl($resolvedUrl);
                     if ($content === false || $content === '') {
-                        $message = sprintf(
+                        $this->logger->error(sprintf(
                             'Could not retrieve [%1$s] error page on rootPageId [%2$d] with language [%3$d]. Requested url was "%4$s".',
                             $errorCode,
                             $site->getRootPageId(),
                             $language->getLanguageId(),
                             $resolvedUrl
-                        );
-                        $this->getExceptionHandler()
-                            ->logError(new \Exception($message, 1395152041), GeneralExceptionHandler::CONTEXT_CLI);
+                        ));
 
                         continue;
                     }
@@ -113,7 +115,7 @@ private function initializeTargetDirectory(): void
         if (!file_exists(ConfigurationService::getErrorDocumentDirectory())) {
             GeneralUtility::mkdir(ConfigurationService::getErrorDocumentDirectory());
         } elseif (!is_dir(ConfigurationService::getErrorDocumentDirectory())) {
-            throw new Exception('Target directory is not a directory', 1394124945);
+            throw new \RuntimeException('Target directory is not a directory', 1394124945);
         }
     }
 
@@ -127,15 +129,6 @@ protected function saveErrorPage(int $errorCode, Site $site, SiteLanguage $langu
         GeneralUtility::writeFile($file, $content);
     }
 
-    private function getExceptionHandler(): GeneralExceptionHandler
-    {
-        if (!$this->exceptionHandler instanceof GeneralExceptionHandler) {
-            $this->exceptionHandler = GeneralUtility::makeInstance(GeneralExceptionHandler::class);
-        }
-
-        return $this->exceptionHandler;
-    }
-
     private function checkIfErrorPageNeedsRegeneration(int $errorCode, Site $site, SiteLanguage $language): bool
     {
         $file = $this->getErrorDocumentFilePath($errorCode, $site, $language);

Classes/Controller/ErrorPageController.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netlogix\Nxerrorhandler\Controller;
+
+use Netlogix\Nxerrorhandler\ErrorHandler\Component\StaticDocumentComponent;
+use Psr\Http\Message\ServerRequestInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+#[Autoconfigure(public: true)]
+readonly class ErrorPageController extends \TYPO3\CMS\Core\Controller\ErrorPageController
+{
+    public function errorAction(string $title, string $message, int $errorCode = 0, ?int $httpStatusCode = null): string
+    {
+        $output = GeneralUtility::makeInstance(StaticDocumentComponent::class)
+            ->getOutput($httpStatusCode ?? 500, $this->getRequest(), $message);
+
+        if ($output === '') {
+            return parent::errorAction($title, $message, $errorCode, $httpStatusCode);
+        }
+
+        return $output;
+    }
+
+    private function getRequest(): ServerRequestInterface
+    {
+        return $GLOBALS['TYPO3_REQUEST'];
+    }
+}

Classes/Error/PageContentErrorHandler.php

@@ -24,7 +24,7 @@ public function handlePageError(
         }
 
         $staticDocumentComponent = GeneralUtility::makeInstance(StaticDocumentComponent::class);
-        $content = $staticDocumentComponent->getOutput(404, $request, $message);
+        $content = $staticDocumentComponent->getOutput($this->statusCode, $request, $message);
         if ($content === '') {
             return parent::handlePageError($request, $message, $reasons);
         }

Classes/ErrorHandler/Component/AbstractComponent.php

@@ -13,7 +13,7 @@
 /**
  * Manage static error pages
  */
-class StaticDocumentComponent extends AbstractComponent
+class StaticDocumentComponent
 {
     public function getOutput(int $errorCode, ServerRequestInterface $request, string $reason = ''): string
     {