[MAINTENANCE] Typo3 v13 support

.github/phpstan_12.4.neon

@@ -0,0 +1,27 @@
+parameters:
+  ignoreErrors:
+    - '#Call to an undefined method Psr\\Http\\Message\\RequestFactoryInterface::request\(\)\.#'
+    - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\ManifestInterface::getOriginalJsonArray\(\)\.#'
+    - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\RangeInterface::getMemberRangesAndRanges\(\)\.#'
+    - 
+      message: '#Class TYPO3\\CMS\\Core\\TypoScript\\FrontendTypoScriptFactory not found\.#'
+      path: ../Classes/Common/TypoScriptHelper.php
+    - 
+      message: '#Call to method createSettingsAndSetupConditions\(\) on an unknown class TYPO3\\CMS\\Core\\TypoScript\\FrontendTypoScriptFactory\.#'
+      path: ../Classes/Common/TypoScriptHelper.php
+    - 
+      message: '#Call to method createSetupConfigOrFullSetup\(\) on an unknown class TYPO3\\CMS\\Core\\TypoScript\\FrontendTypoScriptFactory\.#'
+      path: ../Classes/Common/TypoScriptHelper.php
+    - 
+      message: '#PHPDoc tag @var for variable \$action contains unknown class TYPO3\\CMS\\Scheduler\\SchedulerManagementAction\.#'
+      path: ../Classes/Task/BaseAdditionalFieldProvider.php
+    - 
+      message: '#Access to constant EDIT on an unknown class TYPO3\\CMS\\Scheduler\\SchedulerManagementAction\.#'
+      path: ../Classes/Task/BaseAdditionalFieldProvider.php
+  level: 5
+  paths:
+    - ../Classes/
+  excludePaths:
+    - ../Classes/Controller/OaiPmhController.php
+    - ../Classes/Command/DbDocs/Generator.php # dbdocs command is not supported in Typo3 v12
+  treatPhpDocTypesAsCertain: false

.github/phpstan_13.4.neon

@@ -0,0 +1,26 @@
+parameters:
+  ignoreErrors:
+    - '#Call to an undefined method Psr\\Http\\Message\\RequestFactoryInterface::request\(\)\.#'
+    - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\ManifestInterface::getOriginalJsonArray\(\)\.#'
+    - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\RangeInterface::getMemberRangesAndRanges\(\)\.#'
+    - 
+      message: '#Call to an undefined method TYPO3\\CMS\\Frontend\\Controller\\TypoScriptFrontendController::getFromCache\(\)\.#'
+      path: ../Classes/Common/TypoScriptHelper.php
+    - 
+      message: '#Call to an undefined method TYPO3\\CMS\\Frontend\\Controller\\TypoScriptFrontendController::releaseLocks\(\)\.#'
+      path: ../Classes/Common/TypoScriptHelper.php
+    - 
+      message: '#PHPDoc tag @var for variable \$action contains unknown class TYPO3\\CMS\\Scheduler\\Task\\Enumeration\\Action\.#'
+      path: ../Classes/Task/BaseAdditionalFieldProvider.php
+    - 
+      message: '#Access to constant EDIT on an unknown class TYPO3\\CMS\\Scheduler\\Task\\Enumeration\\Action\.#'
+      path: ../Classes/Task/BaseAdditionalFieldProvider.php
+    - 
+      message: '#Call to method equals\(\) on an unknown class TYPO3\\CMS\\Scheduler\\Task\\Enumeration\\Action\.#'
+      path: ../Classes/Task/BaseAdditionalFieldProvider.php
+  level: 5
+  paths:
+    - ../Classes/
+  excludePaths:
+    - ../Classes/Controller/OaiPmhController.php
+  treatPhpDocTypesAsCertain: false

.github/workflows/phpstan.yml

@@ -10,6 +10,9 @@ jobs:
   phpstan:
     name: Static Code Analysis
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        variants: [ {typo3: 12.4, php: 8.1}, {typo3: 13.4, php: 8.4}  ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -18,9 +21,11 @@ jobs:
         uses: php-actions/composer@v6
         with:
           command: update
+          php_version: ${{ matrix.variants.php }}
+          args: --ignore-platform-reqs --with=typo3/cms-core:^${{ matrix.variants.typo3 }}
 
       - name: PHPStan Static Analysis
         uses: php-actions/phpstan@v3
         with:
-          configuration: ./.github/phpstan.neon
+          configuration: ./.github/phpstan_${{ matrix.variants.typo3 }}.neon
           path: ''

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        variants: [ {typo3: 11.5, php: 8.1}, {typo3: 12.4, php: 8.1}, {typo3: 11.5, php: 8.3}, {typo3: 12.4, php: 8.4}  ]
+        variants: [ {typo3: 12.4, php: 8.1}, {typo3: 12.4, php: 8.4}, {typo3: 13.4, php: 8.2}, {typo3: 13.4, php: 8.4}  ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

Build/Test/FunctionalTests.xml

@@ -1,23 +1,20 @@
+<?xml version="1.0"?>
 <!-- adopted from https://github.com/TYPO3/styleguide/blob/2a51dc3db6c2916c07595dd96e8b817a73216002/Build/FunctionalTests.xml -->
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
     backupGlobals="true"
     bootstrap="../../vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
     cacheResult="false"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertWarningsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertDeprecationsToExceptions="true"
-    forceCoversAnnotation="false"
     stopOnError="false"
     stopOnFailure="false"
     stopOnIncomplete="false"
     stopOnSkipped="false"
-    verbose="false"
     beStrictAboutTestsThatDoNotTestAnything="false"
     failOnWarning="true"
+    cacheDirectory=".phpunit.cache"
+    requireCoverageMetadata="false"
 >
     <testsuites>
         <testsuite name="Functional tests">

Build/Test/UnitTests.xml

@@ -1,23 +1,21 @@
+<?xml version="1.0"?>
 <!-- adopted from https://github.com/TYPO3/styleguide/blob/2a51dc3db6c2916c07595dd96e8b817a73216002/Build/UnitTests.xml -->
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
     backupGlobals="true"
     bootstrap="../../vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
     cacheResult="false"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertWarningsToExceptions="true"
-    convertNoticesToExceptions="true"
-    forceCoversAnnotation="false"
     processIsolation="false"
     stopOnError="false"
     stopOnFailure="false"
     stopOnIncomplete="false"
     stopOnSkipped="false"
-    verbose="false"
     beStrictAboutTestsThatDoNotTestAnything="false"
     failOnWarning="true"
+    cacheDirectory=".phpunit.cache"
+    requireCoverageMetadata="false"
 >
     <testsuites>
         <testsuite name="Unit tests">

Classes/Command/BaseCommand.php

@@ -25,6 +25,8 @@
 use Kitodo\Dlf\Validation\DocumentValidator;
 use Symfony\Component\Console\Command\Command;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
+use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
+use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
@@ -128,6 +130,8 @@ public function __construct(
      */
     protected function initializeRepositories(int $storagePid): void
     {
+        $request = (new ServerRequest())->withAttribute("applicationType", SystemEnvironmentBuilder::REQUESTTYPE_BE);
+        $this->configurationManager->setRequest($request);
         $frameworkConfiguration = $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
         $frameworkConfiguration['persistence']['storagePid'] = MathUtility::forceIntegerInRange($storagePid, 0);
         $this->configurationManager->setConfiguration($frameworkConfiguration);
@@ -180,7 +184,7 @@ protected function getSolrCores(int $pageId): array
                     $queryBuilder->createNamedParameter($pageId, Connection::PARAM_INT)
                 )
             )
-            ->execute();
+            ->executeQuery();
 
         while ($record = $result->fetchAssociative()) {
             $solrCores[$record['index_name']] = $record['uid'];
@@ -222,7 +226,7 @@ protected function saveToDatabase(Document $document, bool $softCommit = false):
             $document->setMetsLabel($metadata['mets_label'][0] ?? '');
             $document->setMetsOrderlabel($metadata['mets_orderlabel'][0] ?? '');
 
-            $structure = $this->structureRepository->findOneByIndexName($metadata['type'][0]);
+            $structure = $this->structureRepository->findOneBy(['indexName' => $metadata['type'][0]]);
             if ($structure !== null) {
                 $document->setStructure($structure);
             }
@@ -297,7 +301,7 @@ protected function getParentDocumentUidForSaving(Document $document, bool $softC
             $parent = AbstractDocument::getInstance($doc->parentHref, ['storagePid' => $this->storagePid], true);
 
             if ($parent->recordId) {
-                $parentDocument = $this->documentRepository->findOneByRecordId($parent->recordId);
+                $parentDocument = $this->documentRepository->findOneBy(['recordId' => $parent->recordId]);
 
                 if ($parentDocument === null) {
                     // create new Document object
@@ -335,7 +339,7 @@ protected function getParentDocumentUidForSaving(Document $document, bool $softC
     private function addCollections(Document &$document, array $collections): void
     {
         foreach ($collections as $collection) {
-            $documentCollection = $this->collectionRepository->findOneByIndexName($collection);
+            $documentCollection = $this->collectionRepository->findOneBy(['indexName' => $collection]);
             if (!$documentCollection) {
                 // create new Collection object
                 $documentCollection = GeneralUtility::makeInstance(Collection::class);
@@ -428,7 +432,7 @@ private function setOwner($owner): void
         if (empty($this->owner)) {
             // owner is not set set but found by metadata --> take it or take default library
             $owner = $owner ? : 'default';
-            $this->owner = $this->libraryRepository->findOneByIndexName($owner);
+            $this->owner = $this->libraryRepository->findOneBy(['indexName' => $owner]);
             if (empty($this->owner)) {
                 // create library
                 $this->owner = GeneralUtility::makeInstance(Library::class);

Classes/Command/DbDocs/Generator.php

@@ -13,18 +13,18 @@
 namespace Kitodo\Dlf\Command\DbDocs;
 
 use Doctrine\DBAL\Schema\Table;
-use Kitodo\Dlf\Common\Helper;
 use ReflectionClass;
 use ReflectionProperty;
+use RuntimeException;
+use TYPO3\CMS\Core\Database\Schema\Parser\Lexer;
 use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 use TYPO3\CMS\Core\Database\Schema\SqlReader;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
-use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\ClassesConfiguration;
-use TYPO3\CMS\Extbase\Persistence\ClassesConfigurationFactory;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper;
 
@@ -101,8 +101,8 @@ public function collectTables(): array
         $result = [];
 
         foreach ($createTableStatements as $statement) {
-            $parser = new Parser($statement);
-            list($table) = $parser->parse();
+            $parser = new Parser(new Lexer());
+            list($table) = $parser->parse($statement);
 
             $tableName = $table->getName();
             if (!str_starts_with($tableName, 'tx_dlf_')) {

Classes/Command/DbDocsCommand.php

@@ -12,18 +12,15 @@
 
 namespace Kitodo\Dlf\Command;
 
-use Kitodo\Dlf\Common\AbstractDocument;
-use Kitodo\Dlf\Common\Indexer;
 use Kitodo\Dlf\Command\DbDocs\Generator;
-use Kitodo\Dlf\Domain\Model\Document;
+use RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\MathUtility;
 
 /**
  * CLI Command for generating the reStructuredText file containing documentation
@@ -81,6 +78,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $outputPath = $input->getArgument('outputPath');
         }
 
+        $typo3Version = (new Typo3Version())->getMajorVersion();
+        if ($typo3Version != 13) {
+            throw new RuntimeException(("dbdocs command can only be run with TYPO3 v13"));
+        }
+
         $tables = $this->generator->collectTables();
         $page = $this->generator->generatePage($tables);
 

Classes/Command/DeleteCommand.php

@@ -220,9 +220,9 @@ private function getDocument($input): ?Document
             $doc = AbstractDocument::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], true);
 
             if ($doc->recordId) {
-                $document = $this->documentRepository->findOneByRecordId($doc->recordId);
+                $document = $this->documentRepository->findOneBy(['recordId' => $doc->recordId]);
             } else {
-                $document = $this->documentRepository->findOneByLocation($input->getOption('doc'));
+                $document = $this->documentRepository->findOneBy(['location' => $input->getOption('doc')]);
             }
         }
 

Classes/Command/HarvestCommand.php

@@ -240,7 +240,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
 
             if ($doc->recordId) {
-                $document = $this->documentRepository->findOneByRecordId($doc->recordId);
+                $document = $this->documentRepository->findOneBy(['recordId' => $doc->recordId]);
             }
 
             if ($document === null) {

Classes/Command/IndexCommand.php

@@ -150,7 +150,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             if (MathUtility::canBeInterpretedAsInteger($input->getOption('owner'))) {
                 $this->owner = $this->libraryRepository->findByUid(MathUtility::forceIntegerInRange((int) $input->getOption('owner'), 1));
             } else {
-                $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner'));
+                $this->owner = $this->libraryRepository->findOneBy(['indexName' => (string) $input->getOption('owner')]);
             }
         } else {
             $this->owner = null;
@@ -232,9 +232,9 @@ private function getDocumentFromUrl($doc, string $url): Document
         $document = null;
 
         if ($doc->recordId ?? false) {
-            $document = $this->documentRepository->findOneByRecordId($doc->recordId);
+            $document = $this->documentRepository->findOneBy(['recordId' => $doc->recordId]);
         } else {
-            $document = $this->documentRepository->findOneByLocation($url);
+            $document = $this->documentRepository->findOneBy(['location' => $url]);
         }
 
         if ($document === null) {

Classes/Command/ReindexCommand.php

@@ -155,7 +155,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             if (MathUtility::canBeInterpretedAsInteger($input->getOption('owner'))) {
                 $this->owner = $this->libraryRepository->findByUid(MathUtility::forceIntegerInRange((int) $input->getOption('owner'), 1));
             } else {
-                $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner'));
+                $this->owner = $this->libraryRepository->findOneBy(['indexName' => (string) $input->getOption('owner')]);
             }
         } else {
             $this->owner = null;

Classes/Common/AbstractDocument.php

@@ -644,7 +644,7 @@ public static function getTitle(int $uid, bool $recursive = false): string
                     Helper::whereExpression('tx_dlf_documents')
                 )
                 ->setMaxResults(1)
-                ->execute();
+                ->executeQuery();
 
             $resArray = $result->fetchAssociative();
             if ($resArray) {
@@ -761,7 +761,7 @@ protected function loadFormats(): void
                 ->where(
                     $queryBuilder->expr()->eq('pid', $this->configPid)
                 )
-                ->execute();
+                ->executeQuery();
 
             while ($resArray = $result->fetchAssociative()) {
                 // Update format registry.