Merge branch 'master' into Pres_01-2023_Solr-Verbesserungen_query_tim…

…e_boosting_rebase

.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 2024
 assignees: ''
 
 ---

.github/phpstan.neon

@@ -6,6 +6,7 @@ parameters:
  - '#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::findOneByRoot\(\)\.#'

.github/workflows/codeql.yml

@@ -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/phpstan.yml

@@ -11,7 +11,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Install dependencies
  uses: php-actions/composer@v6

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
  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 +24,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/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

Build/Test/docker-compose.yml

@@ -3,55 +3,55 @@
 version: "2.3"
 services:
  mysql:
- image: mysql:${MYSQL_VERSION}
+ image: docker.io/mysql:${MYSQL_VERSION}
  environment:
  MYSQL_ROOT_PASSWORD: funcp
  tmpfs:
  - /var/lib/mysql/:rw,noexec,nosuid
 
  mariadb:
- image: mariadb:${MARIADB_VERSION}
+ image: docker.io/mariadb:${MARIADB_VERSION}
  environment:
  MYSQL_ROOT_PASSWORD: funcp
  tmpfs:
  - /var/lib/mysql/:rw,noexec,nosuid
 
  web:
- image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
+ image: docker.io/typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
  user: "${HOST_UID}:${HOST_GID}"
  stop_grace_period: 1s
  volumes:
  - ${DLF_ROOT}:${DLF_ROOT}
  extra_hosts:
  - "host.docker.internal:host-gateway"
  ports:
- - "8000:8000"
+ - "${SERVER_PORT}:${SERVER_PORT}"
  # NOTE: For testing PageViewProxy, we need another web server web:8001 that
- # can be requested from TYPO3 running on web:8000.
+ # can be requested from TYPO3 running on web:${SERVER_PORT}.
  # Setting PHP_CLI_SERVER_WORKERS wouldn't seem to work consistently.
  command: >
  /bin/sh -c "
  if [ ${PHP_XDEBUG_ON} -eq 0 ]; then
  XDEBUG_MODE=\"off\" \
- php -S web:8000 -t ${DLF_ROOT} ${DLF_ROOT}/Tests/routeFunctionalInstance.php &
+ php -S web:${SERVER_PORT} -t ${DLF_ROOT} ${DLF_ROOT}/Tests/routeFunctionalInstance.php &
  php -S web:8001 -t ${DLF_ROOT}
  else
  XDEBUG_MODE=\"debug,develop\" \
  XDEBUG_TRIGGER=\"foo\" \
  XDEBUG_CONFIG=\"client_port=${PHP_XDEBUG_PORT} client_host=host.docker.internal\" \
- php -S web:8000 -t ${DLF_ROOT} ${DLF_ROOT}/Tests/routeFunctionalInstance.php &
+ php -S web:${SERVER_PORT} -t ${DLF_ROOT} ${DLF_ROOT}/Tests/routeFunctionalInstance.php &
  php -S web:8001 -t ${DLF_ROOT}
  fi
  "
 
  solr:
- image: solr:8
+ image: docker.io/solr:8
  volumes:
  - ${DLF_ROOT}/Configuration/ApacheSolr/configsets:/var/solr/data/configsets
  - ./solr/contrib/ocrsearch:/opt/solr/contrib/ocrsearch
 
  composer_install:
- image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
+ image: docker.io/typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
  user: "${HOST_UID}:${HOST_GID}"
  volumes:
  - ${DLF_ROOT}:${DLF_ROOT}
@@ -71,7 +71,7 @@ services:
  "
 
  functional:
- image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
+ image: docker.io/typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
  links:
  - ${DBMS}
  - web
@@ -85,7 +85,8 @@ services:
  typo3DatabaseUsername: root
  typo3DatabasePassword: funcp
  typo3DatabaseHost: ${DBMS}
- dlfTestingSolrHost: solr
+ env_file:
+ - ./test.env
  working_dir: ${DLF_ROOT}
  extra_hosts:
  - "host.docker.internal:host-gateway"
@@ -126,7 +127,7 @@ services:
  "
 
  unit:
- image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
+ image: docker.io/typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
  user: "${HOST_UID}:${HOST_GID}"
  volumes:
  - ${DLF_ROOT}:${DLF_ROOT}

Build/Test/runTests.sh

@@ -24,6 +24,7 @@ setUpDockerComposeDotEnv() {
  echo "TEST_FILE=${TEST_FILE}"
  echo "PHP_XDEBUG_ON=${PHP_XDEBUG_ON}"
  echo "PHP_XDEBUG_PORT=${PHP_XDEBUG_PORT}"
+ echo "SERVER_PORT=${SERVER_PORT}"
  echo "DOCKER_PHP_IMAGE=${DOCKER_PHP_IMAGE}"
  echo "EXTRA_TEST_OPTIONS=${EXTRA_TEST_OPTIONS}"
  echo "SCRIPT_VERBOSE=${SCRIPT_VERBOSE}"
@@ -188,6 +189,7 @@ DBMS="mariadb"
 PHP_VERSION="7.4"
 PHP_XDEBUG_ON=0
 PHP_XDEBUG_PORT=9003
+SERVER_PORT=8000
 EXTRA_TEST_OPTIONS=""
 SCRIPT_VERBOSE=0
 PHPUNIT_WATCH=0
@@ -217,19 +219,19 @@ while getopts ":a:s:t:d:i:j:p:e:xy:whuv" OPT; do
  ;;
  i)
  MARIADB_VERSION=${OPTARG}
- if ! [[ ${MARIADB_VERSION} =~ ^(10.1|10.2|10.3|10.4|10.5)$ ]]; then
+ if ! [[ ${MARIADB_VERSION} =~ ^(10.2|10.3|10.4|10.5|10.6|10.11)$ ]]; then
  INVALID_OPTIONS+=("${OPTARG}")
  fi
  ;;
  j)
  MYSQL_VERSION=${OPTARG}
- if ! [[ ${MYSQL_VERSION} =~ ^(5.5|5.6|5.7|8.0)$ ]]; then
+ if ! [[ ${MYSQL_VERSION} =~ ^(5.7|8.0)$ ]]; then
  INVALID_OPTIONS+=("${OPTARG}")
  fi
  ;;
  p)
  PHP_VERSION=${OPTARG}
- if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1)$ ]]; then
+ if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3)$ ]]; then
  INVALID_OPTIONS+=("${OPTARG}")
  fi
  ;;

Build/Test/test.env

@@ -0,0 +1 @@
+dlfTestingSolrHost=solr