Merge branch 'master' into midi-player-navigation

# Conflicts:
#	Classes/Common/AbstractDocument.php
#	Classes/Common/IiifManifest.php
#	Classes/Common/MetsDocument.php
#	Classes/Controller/AbstractController.php
#	Classes/Controller/PageViewController.php
#	Classes/Controller/ToolboxController.php
#	Resources/Private/Language/Labels.xml
#	Resources/Private/Templates/Navigation/Main.html
#	ext_conf_template.txt
#	ext_localconf.php

.github/ISSUE_TEMPLATE/task-for-the-development-fund.md

@@ -2,7 +2,7 @@
 name: Task for the development fund
 about: A working package which may be sponsored by the Kitodo e.V. development fund.
 title: "[FUND] "
-labels: ⭐ development fund 2023
+labels: ⭐ development fund 2025
 assignees: ''
 
 ---

.github/codeql.yml

@@ -1,16 +1,16 @@
- name: "CodeQL Configuration"
+name: CodeQL Configuration
 
- queries:
-  - uses: security-and-quality
+queries:
+ - uses: security-and-quality
 
- query-filters:
-  - exclude:
-  problem.severity:
-  - note
+query-filters:
+ - exclude:
+ problem.severity:
+ - note
 
- paths-ignore:
-  - Resources/Public/JavaScript/OpenLayers
-  - Resources/Public/JavaScript/Toastify
-  - Resources/Public/JavaScript/jPlayer
-  - Resources/Public/JavaScript/jQuery
-  - Resources/Public/JavaScript/jQueryUI
+paths-ignore:
+ - Resources/Public/JavaScript/jPlayer
+ - Resources/Public/JavaScript/jQuery
+ - Resources/Public/JavaScript/jQueryUI
+ - Resources/Public/JavaScript/OpenLayers
+ - Resources/Public/JavaScript/Toastify

.github/phpstan.neon

@@ -0,0 +1,31 @@
+parameters:
+ ignoreErrors:
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::countByPid\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findByIsListed\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findByIsSortable\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByFeUserId\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByIndexName\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByLocation\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByPid\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByRecordId\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneBySessionId\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByType\(\)\.#'
+ - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByUid\(\)\.#'
+ - '#Call to an undefined method Psr\\Http\\Message\\RequestFactoryInterface::request\(\)\.#'
+ - '#Call to an undefined method Solarium\\Core\\Query\\DocumentInterface::setField\(\)\.#'
+ - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getHeight\(\)\.#'
+ - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getWidth\(\)\.#'
+ - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getPossibleTextAnnotationContainers\(\)\.#'
+ - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getTextAnnotations\(\)\.#'
+ - '#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\(\)\.#'
+ - '#Constant LOG_SEVERITY_ERROR not found\.#'
+ - '#Constant LOG_SEVERITY_NOTICE not found\.#'
+ - '#Constant LOG_SEVERITY_WARNING not found\.#'
+ - '#Constant TYPO3_MODE not found\.#'
+ level: 5
+ paths:
+ - ../Classes/
+ excludePaths:
+ - ../Classes/Controller/OaiPmhController.php
+ treatPhpDocTypesAsCertain: false

.github/pull.yml

@@ -18,3 +18,6 @@ rules:
  - base: 4.x
  upstream: kitodo:4.x
  mergeMethod: hardreset
+ - base: 5.x
+ upstream: kitodo:5.x
+ mergeMethod: hardreset

.github/workflows/codeql.yml

@@ -1,14 +1,14 @@
-name: "CodeQL"
+name: CodeQL
 
 on:
  push:
- branches: [ "master", "1.x", "2.x", "3.2.x", "3.3.x", "4.x" ]
+ branches: [ "master", "1.x", "2.x", "3.2.x", "3.3.x", "4.x", "5.x" ]
  pull_request:
  branches: [ "master" ]
 
 jobs:
  analyze:
- name: Analyze
+ name: Static Code Analysis
  runs-on: ubuntu-latest
  permissions:
  actions: read
@@ -22,18 +22,18 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
  with:
  languages: ${{ matrix.language }}
  config-file: ./.github/codeql.yml
 
  - name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ uses: github/codeql-action/autobuild@v3
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3
  with:
  category: "/language:${{ matrix.language }}"

.github/workflows/documentation.yml

@@ -0,0 +1,17 @@
+name: Documentation
+
+on: [ push, pull_request ]
+
+jobs:
+ tests:
+ name: Build Test
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Test if the documentation will render without warning
+ run: |
+ mkdir -p Documentation-GENERATED-temp \
+ && docker run --rm --pull always -v $(pwd):/project \
+ ghcr.io/typo3-documentation/render-guides:latest --config=Documentation --no-progress --fail-on-log

.github/workflows/phpstan.yml

@@ -0,0 +1,26 @@
+name: PHPStan
+
+on:
+ push:
+ branches: [ "master" ]
+ pull_request:
+ branches: [ "master" ]
+
+jobs:
+ phpstan:
+ name: Static Code Analysis
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v4
+
+ - name: Install dependencies
+ uses: php-actions/composer@v6
+ with:
+ command: update
+ php_version: "7.4"
+
+ - name: PHPStan Static Analysis
+ uses: php-actions/phpstan@v3
+ with:
+ configuration: ./.github/phpstan.neon

.github/workflows/tests.yml

@@ -2,19 +2,20 @@ name: Unit and Functional Testing
 
 on:
  push:
- branches: [master]
+ branches: [ "master" ]
  pull_request:
- branches: [master]
+ branches: [ "master" ]
 
 jobs:
  test:
+ name: TYPO3
  runs-on: ubuntu-latest
  strategy:
  matrix:
- typo3: [9.5, 10.4]
+ typo3: [ 10.4, 11.5 ]
  steps:
  - name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Install dependencies
  run: Build/Test/runTests.sh -s composerInstall -t ${{ matrix.typo3 }}
@@ -24,3 +25,8 @@ jobs:
 
  - name: Run functional tests
  run: Build/Test/runTests.sh -s functional
+
+ - name: Upload coverage reports
+ uses: codecov/codecov-action@v4
+ env:
+ CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Build/Documentation/dbdocs/Generator.php

@@ -34,11 +34,6 @@
  */
 class Generator
 {
- /**
- * @var ObjectManager
- */
- protected $objectManager;
-
  /**
  * @var LanguageService
  */
@@ -49,11 +44,51 @@ class Generator
  */
  protected $dataMapper;
 
+ /**
+ * @var SqlReader
+ */
+ protected $sqlReader;
+
+ /**
+ * @var ConfigurationManager
+ */
+ protected $configurationManager;
+
+ /**
+ * @param LanguageService $languageService
+ */
+ public function injectLanguageService(LanguageService $languageService)
+ {
+ $this->languageService = $languageService;
+ }
+
+ /**
+ * @param DataMapper $dataMapper
+ */
+ public function injectDataMapper(DataMapper $dataMapper)
+ {
+ $this->dataMapper = $dataMapper;
+ }
+
+ /**
+ * @param SqlReader $sqlReader
+ */
+ public function injectSqlReader(DataMapper $sqlReader)
+ {
+ $this->sqlReader = $sqlReader;
+ }
+
+ /**
+ * @param ConfigurationManager $configurationManager
+ */
+ public function injectConfigurationManager(ConfigurationManager $configurationManager)
+ {
+ $this->configurationManager = $configurationManager;
+ }
+
  public function __construct()
  {
- $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class);
- $this->languageService = $this->objectManager->get(LanguageService::class);
- $this->dataMapper = $this->objectManager->get(DataMapper::class);
+
  }
 
  /**
@@ -62,9 +97,8 @@ public function __construct()
  */
  public function collectTables(): array
  {
- $sqlReader = $this->objectManager->get(SqlReader::class);
- $sqlCode = $sqlReader->getTablesDefinitionString(true);
- $createTableStatements = $sqlReader->getCreateTableStatementArray($sqlCode);
+ $sqlCode = $this->sqlReader->getTablesDefinitionString(true);
+ $createTableStatements = $this->sqlReader->getCreateTableStatementArray($sqlCode);
 
  $tableToClassName = $this->getTableClassMap();
 
@@ -92,10 +126,7 @@ public function collectTables(): array
  */
  public function getTableClassMap(): array
  {
- Helper::polyfillExtbaseClassesForTYPO3v9();
-
- $configurationManager = $this->objectManager->get(ConfigurationManager::class);
- $frameworkConfiguration = $configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
+ $frameworkConfiguration = $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
 
  $result = [];
 

Build/Documentation/docker-compose.t3docs.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
  t3docs:
- image: t3docs/render-documentation:latest
+ image: ghcr.io/t3docs/render-documentation:latest
  volumes:
  - ../../:/PROJECT:ro
  - ../../Documentation-GENERATED-temp:/RESULT