From 45230a91733078cf0fe2ac4eec4ad6ffdc10cccb Mon Sep 17 00:00:00 2001
From: Markus Weigelt <markus.weigelt@slub-dresden.de>
Date: Thu, 9 Jan 2025 16:38:40 +0100
Subject: [PATCH] Update testing pipeline

---
 .github/workflows/tests.yml   |  5 +----
 Build/Test/docker-compose.yml | 15 ---------------
 composer.json                 |  8 +-------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 153023ac..288ac405 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,15 +10,12 @@ jobs:
     test:
         name: TYPO3
         runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                typo3: [ 10.4, 11.5 ]
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
 
             - name: Install dependencies
-              run: Build/Test/runTests.sh -s composerInstall -t ${{ matrix.typo3 }}
+              run: Build/Test/runTests.sh -s composerInstall -t 11.5
 
             - name: Run unit tests
               run: Build/Test/runTests.sh -s unit
diff --git a/Build/Test/docker-compose.yml b/Build/Test/docker-compose.yml
index 706f471b..43b7a1fd 100644
--- a/Build/Test/docker-compose.yml
+++ b/Build/Test/docker-compose.yml
@@ -43,19 +43,6 @@ services:
                 php -S web:8001 -t ${DFGVIEWER_ROOT}
               fi
             "
-    solr:
-        image: docker.io/solr:9
-        volumes:
-            - ${DFGVIEWER_ROOT}/Configuration/ApacheSolr/configsets:/var/solr/data/configsets
-            - ./solr/modules/ocrsearch:/opt/solr/modules/ocrsearch
-        ports:
-            - 8983:8983
-        user: root # run as root to change the permissions of the solr folder
-        # Change permissions of the solr folder, create a default core and start solr as solr user
-        command: /bin/sh -c "
-            chown -R 8983:8983 /var/solr
-            && runuser -u solr -- solr-precreate default-core
-            "
     composer_install:
         image: docker.io/typo3/core-testing-${DOCKER_PHP_IMAGE}:latest
         user: "${HOST_UID}:${HOST_GID}"
@@ -70,7 +57,6 @@ services:
               if [ ${SCRIPT_VERBOSE} -eq 1 ]; then
                 set -x
               fi
-              composer require "kitodo/presentation:@dev"
               if [ -z ${TYPO3_VERSION} ]; then
                 composer install --no-progress --no-interaction;
               else
@@ -82,7 +68,6 @@ services:
         links:
             - ${DBMS}
             - web
-            - solr
         user: "${HOST_UID}:${HOST_GID}"
         volumes:
             - ${EXTENSIONS_ROOT}:/var/www/extensions/
diff --git a/composer.json b/composer.json
index c42fa3b2..d1094f82 100644
--- a/composer.json
+++ b/composer.json
@@ -50,9 +50,8 @@
     "require-dev": {
         "phpstan/phpstan": "^1.12",
         "phpunit/phpunit": "^9.6.22",
-        "solarium/solarium": "5.2 - 6.3",
         "spatie/phpunit-watcher": "^1.23.6",
-        "typo3/testing-framework": "^6.16.10"
+        "typo3/testing-framework": "^7.1.1"
     },
     "replace": {
         "typo3-ter/dfgviewer": "self.version"
@@ -62,11 +61,6 @@
             "Slub\\Dfgviewer\\": "Classes/"
         }
     },
-    "autoload-dev": {
-      "psr-4": {
-        "Kitodo\\Dlf\\Tests\\": "Tests/"
-      }
-    },
     "extra": {
         "typo3/cms": {
             "extension-key": "dfgviewer"