diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 13cb51d..53597a1 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -12,15 +12,24 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        php-versions: ['8.1']
+
+    name: PHP ${{ matrix.php-versions }} Test
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup PHP 7.1
+      - name: Setup PHP ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.1'
+          php-version: ${{ matrix.php-versions }}
+
+      - name: Check PHP Version
+        run: php -v
 
       - name: Install Composer and Dependencies
         run: sudo apt-get update && curl -s http://getcomposer.org/installer | php && php composer.phar self-update && php composer.phar install
@@ -31,22 +40,20 @@ jobs:
       - name: Start MySQL
         run: sudo systemctl start mysql.service
 
+      - name: Prepare workspace
+        run: ant prepare-workspace
+
+      - name: Prepare search config
+        run: ant prepare-config
+
       - name: Prepare database
-        run: bash vendor/opus4-repo/framework/bin/prepare-database.sh --admin_pwd root --user_pwd root
+        run: bash vendor/bin/opus4db --adminpwd root --userpwd root --sqlpwd root
 
-      - name: Prepare
-        run: |
-          ant prepare-workspace prepare-config lint -DdbUserPassword=root -DdbAdminPassword=root
-          export APPLICATION_PATH=. && php vendor/opus4-repo/framework/db/createdb.php
+      - name: Basic PHP file check
+        run: ant lint
 
-      - name: Test
+      - name: Tests
         run: php composer.phar test
 
-      - name: Coding-Style
+      - name: Coding Style
         run: php composer.phar cs-check
-
-      - name: PHP-LOC
-        run: php composer.phar phploc
-
-      - name: PHP CPD
-        run: php composer.phar phpcpd
diff --git a/.gitignore b/.gitignore
index 295893b..c6e0ff2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 build
 test/config.ini
 cache.properties
+/database.ini
 
 # IDE files
 .idea
@@ -16,3 +17,4 @@ vendor
 
 # Vagrant files
 .vagrant
+.phpunit.result.cache
diff --git a/Vagrantfile b/Vagrantfile
index 7515858..02a13f5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,10 +2,10 @@
 # vi: set ft=ruby :
 
 $software = <<SCRIPT
-# Downgrade to PHP 7.1
+# Downgrade to PHP 8.1
 apt-add-repository -y ppa:ondrej/php
 apt-get -yq update
-apt-get -yq install php7.1
+apt-get -yq install php8.1
 
 # Install MYSQL
 debconf-set-selections <<< "mysql-server mysql-server/root_password password root"
@@ -13,14 +13,14 @@ debconf-set-selections <<< "mysql-server mysql-server/root_password_again passwo
 apt-get -yq install mysql-server
 
 # Install required PHP packages
-apt-get -yq install php7.1-dom
-apt-get -yq install php7.1-mbstring
-apt-get -yq install php7.1-intl
-apt-get -yq install php7.1-gd
-apt-get -yq install php7.1-mcrypt
-apt-get -yq install php7.1-curl
-apt-get -yq install php7.1-zip
-apt-get -yq install php7.1-mysql
+apt-get -yq install php8.1-dom
+apt-get -yq install php8.1-mbstring
+apt-get -yq install php8.1-intl
+apt-get -yq install php8.1-gd
+apt-get -yq install php8.1-mcrypt
+apt-get -yq install php8.1-curl
+apt-get -yq install php8.1-zip
+apt-get -yq install php8.1-mysql
 
 # Install Java
 apt-get -yq install openjdk-11-jdk
@@ -58,14 +58,12 @@ fi
 SCRIPT
 
 $database = <<SCRIPT
-/vagrant/vendor/opus4-repo/framework/bin/prepare-database.sh --admin_pwd root --user_pwd root
+/vagrant/vendor/bin/opus4db --adminpwd root --userpwd root --sqlpwd root
 SCRIPT
 
-$opus = <<SCRIPT
+$workspace = <<SCRIPT
 cd /vagrant
-ant prepare-workspace prepare-config -DdbUserPassword=root -DdbAdminPassword=root
-export APPLICATION_PATH=/vagrant
-php vendor/opus4-repo/framework/db/createdb.php
+ant prepare-workspace prepare-config
 SCRIPT
 
 $environment = <<SCRIPT
@@ -101,7 +99,7 @@ echo "  http://localhost:9983"
 SCRIPT
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "bento/ubuntu-20.04"
+  config.vm.box = "bento/ubuntu-22.04"
 
   config.vm.network "forwarded_port", guest: 8983, host: 9983, host_ip: "127.0.0.1"
 
@@ -109,8 +107,8 @@ Vagrant.configure("2") do |config|
   config.vm.provision "Install Apache Solr...", type: "shell", privileged: false, inline: $solr
   config.vm.provision "Setup environment...", type: "shell", inline: $environment
   config.vm.provision "Install Composer dependencies...", type: "shell", privileged: false, inline: $composer
+  config.vm.provision "Prepare workspace...", type: "shell", privileged: false, inline: $workspace
   config.vm.provision "Create database...", type: "shell", inline: $database
-  config.vm.provision "Configure OPUS 4...", type: "shell", privileged: false, inline: $opus
   config.vm.provision "Start services...", type: "shell", privileged: false, run: "always", inline: $start
   config.vm.provision "Information", type: "shell", privileged: false, run: "always", inline: $help
 end
diff --git a/build.xml b/build.xml
index c76b28d..7f489c2 100644
--- a/build.xml
+++ b/build.xml
@@ -2,25 +2,14 @@
 <project name="opus4search">
 
     <property environment="env" />
-    <property name="bindir" value="${basedir}/vendor/bin" />
     <property name="solrVersion" value="7.7.1" />
     <property name="downloadDir" value="${basedir}/downloads" />
 
     <!-- Properties for configuration files (tests/config.ini) used for testing. -->
-    <property name="dbName" value="opusdb" />
-    <property name="dbUserName" value="opus4" />
-    <property name="dbUserPassword" value="" />
-    <property name="dbAdminName" value="opus4admin" />
-    <property name="dbAdminPassword" value="" />
-    <property name="solrDefaultHost" value="localhost" />
-    <property name="solrDefaultPort" value="8983" />
-    <property name="solrDefaultPath" value="/solr/opus4" />
     <property name="solrIndexHost" value="localhost" />
     <property name="solrIndexPort" value="8983" />
-    <property name="solrIndexPath" value="/solr/opus4" />
-    <property name="solrExtractHost" value="localhost" />
-    <property name="solrExtractPort" value="8983" />
-    <property name="solrExtractPath" value="/solr/opus4" />
+    <property name="solrIndexPath" value="/" />
+    <property name="solrIndexCore" value="opus4" />
 
     <target name="clean">
         <delete dir="${basedir}/build/logs" />
@@ -50,20 +39,10 @@
         <copy file="${basedir}/test/config.ini.template" toFile="${basedir}/test/config.ini" filtering="true"
                 overwrite="true">
             <filterset>
-                <filter token="db.user.name" value="${dbUserName}" />
-                <filter token="db.user.password" value="${dbUserPassword}" />
-                <filter token="db.admin.name" value="${dbAdminName}" />
-                <filter token="db.admin.password" value="${dbAdminPassword}" />
-                <filter token="db.name" value="${dbName}" />
-                <filter token="searchengine.default.host" value="${solrDefaultHost}" />
-                <filter token="searchengine.default.port" value="${solrDefaultPort}" />
-                <filter token="searchengine.default.path" value="${solrDefaultPath}" />
                 <filter token="searchengine.index.host" value="${solrIndexHost}" />
                 <filter token="searchengine.index.port" value="${solrIndexPort}" />
-                <filter token="searchengine.index.app" value="${solrIndexPath}" />
-                <filter token="searchengine.extract.host" value="${solrExtractHost}" />
-                <filter token="searchengine.extract.port" value="${solrExtractPort}" />
-                <filter token="searchengine.extract.app" value="${solrExtractPath}" />
+                <filter token="searchengine.index.path" value="${solrIndexPath}" />
+                <filter token="searchengine.index.core" value="${solrIndexCore}" />
             </filterset>
         </copy>
     </target>
diff --git a/composer.json b/composer.json
index a1a7028..a732e8c 100644
--- a/composer.json
+++ b/composer.json
@@ -9,21 +9,23 @@
   ],
   "homepage": "http://www.opus-repository.org",
   "require": {
-    "php": ">=7.1",
+    "php": ">=8",
     "ext-xsl": "*",
     "ext-dom": "*",
     "ext-iconv": "*",
     "ext-simplexml": "*",
     "ext-mbstring": "*",
-    "solarium/solarium": "3.8.*",
-    "opus4-repo/framework": "dev-master",
-    "opus4-repo/opus4-common": "dev-master",
-    "zendframework/zendframework1": "1.12.*",
+    "solarium/solarium": "6.*",
+    "symfony/event-dispatcher": "*",
+    "opus4-repo/framework": "^4.8",
+    "opus4-repo/opus4-common": "^4.8",
+    "opus4-repo/opus4-job": "^4.8",
+    "opus4/zf1-future": "1.21.*",
     "symfony/console": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "6.*",
-    "laminas/laminas-coding-standard": "<2.3",
+    "phpunit/phpunit": "<9",
+    "opus4-repo/codesniffer": "dev-laminas",
     "phpmd/phpmd": "@stable",
     "phploc/phploc": "@stable",
     "sebastian/phpcpd": "*",
@@ -67,7 +69,7 @@
       "phpunit --colors=always --log-junit build/phpunit.xml"
     ],
     "test-coverage": "phpunit --log-junit build/phpunit.xml --colors=always --coverage-html build/ --coverage-clover build/clover.xml",
-    "cs-check": "phpcs -n",
+    "cs-check": "phpcs -n -p",
     "cs-check-report": "phpcs -n --report=checkstyle --report-file=build/checkstyle.xml",
     "cs-fix": "phpcbf -v",
     "phpmd": "phpmd src xml cleancode,unusedcode,design,naming --reportfile build/phpmd.xml --ignore-violations-on-exit",
diff --git a/phpcs.xml b/phpcs.xml
index 84a419f..11a1e65 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="OPUS 4 coding standard">
-    <rule ref="./vendor/laminas/laminas-coding-standard/src/LaminasCodingStandard/ruleset.xml" />
+    <rule ref="./vendor/opus4-repo/codesniffer/src/ruleset.xml" />
     <file>src</file>
     <file>test</file>
 </ruleset>
diff --git a/src/Config.php b/src/Config.php
index c0c2375..2c9220a 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2022, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -75,6 +75,7 @@
  */
 class Config
 {
+    /** @var array */
     protected static $configurationsPool = [];
 
     /**
@@ -215,7 +216,7 @@ public static function getServiceConfiguration($serviceType, $serviceName = null
 
         // finally adopt all basically deprecated service-related configuration
         // (old-style options are thus always preferred over any new-style ones)
-        $result = static::mergeWithDeprecatedServiceConfiguration($result, $serviceType);
+        // TODO Solarium $result = static::mergeWithDeprecatedServiceConfiguration($result, $serviceType);
 
         $result->setReadOnly();
 
@@ -364,7 +365,7 @@ public static function getFacetNames($facetSetName = null, $serviceDomain = null
         }
 
         if ($config && is_scalar($config)) {
-            $set = preg_split('/[\s,]+/', trim($config), null, PREG_SPLIT_NO_EMPTY);
+            $set = preg_split('/[\s,]+/', trim($config), 0, PREG_SPLIT_NO_EMPTY);
         } else {
             $set = [];
         }
diff --git a/src/Console/ExtractCommand.php b/src/Console/ExtractCommand.php
index a537323..6193fbe 100644
--- a/src/Console/ExtractCommand.php
+++ b/src/Console/ExtractCommand.php
@@ -31,7 +31,7 @@
 
 namespace Opus\Search\Console;
 
-use Opus\Common\Console\AbstractBaseDocumentCommand;
+use Opus\Common\Console\AbstractDocumentCommand;
 use Opus\Search\Console\Helper\IndexHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -42,14 +42,17 @@
  * TODO use some kind of helper instead of base class?
  * TODO need to have a way to access/check cache (perhaps another command)
  */
-class ExtractCommand extends AbstractBaseDocumentCommand
+class ExtractCommand extends AbstractDocumentCommand
 {
     const OPTION_TIMEOUT = 'timeout';
 
+    /** @var string */
     protected static $defaultName = 'index:extract';
 
+    /** @var string */
     protected $startIdDescription = 'ID of document where extraction should start (or \'-\')';
 
+    /** @var string */
     protected $endIdDescription = 'ID of document where extraction should stop (or \'-\')';
 
     protected function configure()
diff --git a/src/Console/ExtractFileCommand.php b/src/Console/ExtractFileCommand.php
index 9b81817..9f34aea 100644
--- a/src/Console/ExtractFileCommand.php
+++ b/src/Console/ExtractFileCommand.php
@@ -60,6 +60,7 @@ class ExtractFileCommand extends Command
 
     const OPTION_TIMEOUT = 'timeout';
 
+    /** @var string */
     protected static $defaultName = 'tools:extract-file';
 
     protected function configure()
@@ -95,6 +96,10 @@ protected function configure()
             );
     }
 
+    /**
+     * @return int
+     * @throws SearchException
+     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $file    = $input->getArgument(self::ARGUMENT_FILE);
@@ -133,5 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln($text);
         }
+
+        return 0;
     }
 }
diff --git a/src/Console/Helper/DocumentHelper.php b/src/Console/Helper/DocumentHelper.php
index a25c41b..1df2ac5 100644
--- a/src/Console/Helper/DocumentHelper.php
+++ b/src/Console/Helper/DocumentHelper.php
@@ -40,16 +40,21 @@ class DocumentHelper
      *
      * @param int $start Start of ID range
      * @param int $end End of ID range
+     * @param int $colId
      * @return array Array of document IDs
      *
      * TODO move somewhere else, not Index specific functionality
      */
-    public function getDocumentIds($start, $end)
+    public function getDocumentIds($start, $end, $colId = 0)
     {
         $finder = Repository::getInstance()->getDocumentFinder();
 
         $finder->setDocumentIdRange($start, $end);
 
+        if ($colId > 0) {
+            $finder->setCollectionId($colId);
+        }
+
         return $finder->getIds();
     }
 }
diff --git a/src/Console/Helper/IndexHelper.php b/src/Console/Helper/IndexHelper.php
index 5f28533..c72c749 100644
--- a/src/Console/Helper/IndexHelper.php
+++ b/src/Console/Helper/IndexHelper.php
@@ -31,6 +31,7 @@
 
 namespace Opus\Search\Console\Helper;
 
+use Opus\Common\Collection;
 use Opus\Common\Config;
 use Opus\Common\Console\Helper\ProgressBar;
 use Opus\Common\Console\Helper\ProgressMatrix;
@@ -99,6 +100,7 @@ class IndexHelper
     /**
      * @param int $startId
      * @param int $endId
+     * @param int $colId
      * @return float|string
      * @throws SearchException
      * @throws ModelException
@@ -106,7 +108,7 @@ class IndexHelper
      *
      * TODO Is the timestamp in the console output useful?
      */
-    public function index($startId, $endId = -1)
+    public function index($startId, $endId = -1, $colId = 0)
     {
         $output    = $this->getOutput();
         $blockSize = $this->getBlockSize();
@@ -130,7 +132,7 @@ public function index($startId, $endId = -1)
         if ($singleDocument) {
             $docIds = [$startId];
         } else {
-            $docIds = $documentHelper->getDocumentIds($startId, $endId);
+            $docIds = $documentHelper->getDocumentIds($startId, $endId, $colId);
         }
 
         $docCount = count($docIds);
@@ -159,7 +161,7 @@ public function index($startId, $endId = -1)
             if ($singleDocument) {
                 $output->writeln("Removing document <fg=yellow>$startId</> from index ... ");
                 $indexer->removeDocumentsFromIndexById($docIds);
-            } elseif ($removeAll) {
+            } elseif ($removeAll && $colId === 0) {
                 $output->writeln('Removing <fg=yellow>all</> documents from index ... ');
                 $indexer->removeAllDocumentsFromIndex();
             } else {
@@ -170,6 +172,10 @@ public function index($startId, $endId = -1)
 
         if ($singleDocument) {
             $output->writeln("Indexing document <fg=yellow>$startId</> ...");
+        } elseif ($colId > 0) {
+            $col      = Collection::get($colId);
+            $colTitle = $col->getDisplayName();
+            $output->writeln("Indexing documents in collection: \"${colTitle}\" (ID=$colId)");
         } elseif ($endId !== null) {
             $output->writeln("Indexing document from <fg=yellow>$startId</> to <fg=yellow>$endId</> ...");
         } elseif ($startId !== null) {
diff --git a/src/Console/IndexCommand.php b/src/Console/IndexCommand.php
index 668933b..9b8f46f 100644
--- a/src/Console/IndexCommand.php
+++ b/src/Console/IndexCommand.php
@@ -26,25 +26,31 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2020-2022, OPUS 4 development team
+ * @copyright   Copyright (c) 2020, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
 namespace Opus\Search\Console;
 
-use Opus\Common\Console\AbstractBaseDocumentCommand;
+use Opus\Common\Collection;
+use Opus\Common\CollectionRole;
+use Opus\Common\Console\AbstractDocumentCommand;
+use Opus\Common\Model\ModelException;
 use Opus\Search\Console\Helper\IndexHelper;
 use Opus\Search\SearchException;
+use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Zend_Config_Exception;
 
+use function count;
 use function ctype_digit;
 use function ltrim;
 use function sprintf;
 
-class IndexCommand extends AbstractBaseDocumentCommand
+class IndexCommand extends AbstractDocumentCommand
 {
     const OPTION_BLOCKSIZE = 'blocksize';
 
@@ -54,10 +60,21 @@ class IndexCommand extends AbstractBaseDocumentCommand
 
     const OPTION_TIMEOUT = 'timeout';
 
+    const OPTION_COLLECTION = 'col';
+
+    const OPTION_ROLE_NAME = 'role';
+
+    const OPTION_COLLECTION_NUMBER = 'number';
+
+    /** @var string */
     protected static $defaultName = 'index:index';
 
+    /** @var int */
     protected $blockSize = 10;
 
+    /** @var int */
+    protected $collectionId = 0;
+
     protected function configure()
     {
         parent::configure();
@@ -79,6 +96,12 @@ protected function configure()
   <fg=yellow>20 -</>    will index all documents starting from 20
   <fg=yellow>- 50</>    will index all documents up to 50
   
+You can also index just the documents in a collection. 
+
+Examples:  
+  <fg=yellow>--col=15</>                 index all documents in collection ID=15
+  <fg=yellow>--role=ddc --number=02</>   index all documents in matching collection 
+  
 You can use the <fg=green>blocksize</> option to specify how many documents should be indexed 
 in a single request to the Solr server. Indexing multiple documents per request 
 improves performance. However sometimes this can cause problems if the indexing 
@@ -116,6 +139,26 @@ protected function configure()
                 't',
                 InputOption::VALUE_REQUIRED,
                 'Timeout for extraction in seconds'
+            )->addOption(
+                self::OPTION_COLLECTION,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Collection-ID to index contained documents'
+            )->addOption(
+                self::OPTION_ROLE_NAME,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Name of collection role',
+                null,
+                function (CompletionInput $input) {
+                    return ['insitutes', 'ddc', 'msc', 'authors'];
+                }
+            )->addOption(
+                self::OPTION_COLLECTION_NUMBER,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Number of collection in role',
+                null
             )
             ->setAliases(['index']);
     }
@@ -125,7 +168,6 @@ protected function processArguments(InputInterface $input)
         parent::processArguments($input);
 
         $blockSize = $input->getOption(self::OPTION_BLOCKSIZE);
-
         $blockSize = ltrim($blockSize, '=');
 
         if ($blockSize !== null && (! ctype_digit($blockSize) || ! $blockSize > 0)) {
@@ -133,8 +175,38 @@ protected function processArguments(InputInterface $input)
         } else {
             $this->blockSize = $blockSize;
         }
+
+        $colId = $input->getOption(self::OPTION_COLLECTION);
+
+        if ($colId !== null && ! ctype_digit($colId)) {
+            throw new InvalidOptionException('Col must be an integer >= 1');
+        } else {
+            $this->collectionId = (int) $colId;
+        }
+
+        if ($this->collectionId === 0) {
+            $roleName  = $input->getOption(self::OPTION_ROLE_NAME);
+            $colNumber = $input->getOption(self::OPTION_COLLECTION_NUMBER);
+
+            if ($roleName !== null && $colNumber !== null) {
+                $role = CollectionRole::fetchByName($roleName);
+                if ($role !== null) {
+                    $roleId = $role->getId();
+                    $col    = Collection::fetchCollectionsByRoleNumber($roleId, $colNumber);
+                    if (count($col) === 1) {
+                        $this->collectionId = $col[0]->getId();
+                    }
+                    // TODO DOCTRINE handle multiple matching collections found (Is that possible?)
+                }
+            }
+        }
     }
 
+    /**
+     * @return int
+     * @throws ModelException
+     * @throws Zend_Config_Exception
+     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         parent::execute($input, $output);
@@ -145,6 +217,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $startId = $this->startId;
         $endId   = $this->endId;
+        $colId   = $this->collectionId;
 
         $builder = new IndexHelper();
         $builder->setOutput($output);
@@ -157,7 +230,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if ($this->isSingleDocument()) {
                 $runtime = $builder->index($startId);
             } else {
-                $runtime = $builder->index($startId, $endId);
+                $runtime = $builder->index($startId, $endId, $colId);
             }
             $message = sprintf('Operation completed successfully in <fg=yellow>%.2f</> seconds.', $runtime);
             $output->writeln($message);
@@ -169,7 +242,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             $output->writeln('Stack Trace:');
             $output->writeln($e->getTraceAsString());
-            $output->writeln();
+            $output->writeln('');
         }
+
+        return 0;
     }
 }
diff --git a/src/Console/RemoveCommand.php b/src/Console/RemoveCommand.php
index a9c3427..c40a240 100644
--- a/src/Console/RemoveCommand.php
+++ b/src/Console/RemoveCommand.php
@@ -32,7 +32,7 @@
 
 namespace Opus\Search\Console;
 
-use Opus\Common\Console\AbstractBaseDocumentCommand;
+use Opus\Common\Console\AbstractDocumentCommand;
 use Opus\Common\Document;
 use Opus\Search\Console\Helper\DocumentHelper;
 use Opus\Search\Service;
@@ -41,12 +41,15 @@
 
 use function count;
 
-class RemoveCommand extends AbstractBaseDocumentCommand
+class RemoveCommand extends AbstractDocumentCommand
 {
+    /** @var string */
     protected static $defaultName = 'index:remove';
 
+    /** @var string */
     protected $startIdDescription = 'ID of document where removing should start (or \'-\')';
 
+    /** @var string */
     protected $endIdDescription = 'ID of document where removing should stop (or \'-\')';
 
     protected function configure()
diff --git a/src/Facet/Set.php b/src/Facet/Set.php
index 9efe794..677d15f 100644
--- a/src/Facet/Set.php
+++ b/src/Facet/Set.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -72,6 +72,7 @@ class Set
 
     const SORT_KEY = 'sort';
 
+    /** @var string */
     protected $name = 'default';
 
     /**
@@ -81,8 +82,10 @@ class Set
      */
     protected $config = [];
 
+    /** @var array */
     protected $fields = [];
 
+    /** @var bool */
     protected $facetOnly = false;
 
     /**
@@ -224,7 +227,7 @@ protected function normalizeFields($input)
                 throw new InvalidArgumentException('invalid type of field selector');
             }
 
-            $fieldNames = preg_split('/[\s,]+/', $field, null, PREG_SPLIT_NO_EMPTY);
+            $fieldNames = preg_split('/[\s,]+/', $field, 0, PREG_SPLIT_NO_EMPTY);
             foreach ($fieldNames as $name) {
                 if (! preg_match('/^[a-z_][a-z0-9_\.]*$/i', $name)) {
                     throw new InvalidArgumentException('malformed field selector: ' . $name);
diff --git a/src/Filter/AbstractFilterBase.php b/src/Filter/AbstractFilterBase.php
index adab4e5..f31cdc4 100644
--- a/src/Filter/AbstractFilterBase.php
+++ b/src/Filter/AbstractFilterBase.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
diff --git a/src/Filter/AbstractFilterComplex.php b/src/Filter/AbstractFilterComplex.php
index 5676eea..fc7eca3 100644
--- a/src/Filter/AbstractFilterComplex.php
+++ b/src/Filter/AbstractFilterComplex.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -44,8 +44,10 @@
 
 abstract class AbstractFilterComplex extends AbstractFilterBase
 {
+    /** @var bool */
     protected $negated = false;
 
+    /** @var bool */
     protected $union = false;
 
     /**
diff --git a/src/Filter/Simple.php b/src/Filter/Simple.php
index 72bee66..7977b7b 100644
--- a/src/Filter/Simple.php
+++ b/src/Filter/Simple.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -59,10 +59,13 @@ class Simple implements FilteringInterface
     const COMPARE_GREATER          = '>';
     const COMPARE_GREATER_OR_EQUAL = '>=';
 
+    /** @var string */
     protected $fieldName;
 
+    /** @var string */
     protected $comparator;
 
+    /** @var array */
     protected $fieldValues = [];
 
     /**
diff --git a/src/FulltextFileCache.php b/src/FulltextFileCache.php
index b3af0cd..6420fa0 100644
--- a/src/FulltextFileCache.php
+++ b/src/FulltextFileCache.php
@@ -33,7 +33,7 @@
 namespace Opus\Search;
 
 use Exception as PhpException;
-use Opus\Common\Config as OpusConfig;
+use Opus\Common\Config;
 use Opus\Common\FileInterface;
 
 use function file_get_contents;
@@ -73,7 +73,7 @@ public static function getCacheFileName(FileInterface $file)
 
         try {
             $hash = $file->getRealHash('md5') . '-' . $file->getRealHash('sha256');
-            $name = OpusConfig::get()->workspacePath . "/cache/solr_cache---$hash.txt";
+            $name = Config::getInstance()->getWorkspacePath() . "cache/solr_cache---$hash.txt";
         } catch (PhpException $e) {
             Log::get()->err(
                 self::class . '::' . __METHOD__ . ' : could not compute hash values for ' . $file->getPath() . " : $e"
@@ -127,7 +127,7 @@ public static function writeOnFile(FileInterface $file, $fulltext)
             if ($cacheFile) {
                 // use intermediate temporary file with random name for writing
                 // to prevent race conditions on writing cache file
-                $tmpPath = realpath(OpusConfig::get()->workspacePath . '/tmp/');
+                $tmpPath = realpath(Config::getInstance()->getWorkspacePath() . 'tmp/');
                 $tmpFile = tempnam($tmpPath, 'solr_tmp---');
 
                 if (! file_put_contents($tmpFile, trim($fulltext))) {
diff --git a/src/Plugin/Index.php b/src/Plugin/Index.php
index c891e6f..7ed6d98 100644
--- a/src/Plugin/Index.php
+++ b/src/Plugin/Index.php
@@ -42,6 +42,7 @@
 use Opus\Search\SearchException;
 use Opus\Search\Service;
 use Opus\Search\Task\IndexOpusDocument;
+use Zend_Config;
 
 use function filter_var;
 
@@ -52,6 +53,7 @@
  */
 class Index extends AbstractPlugin
 {
+    /** @var Zend_Config */
     private $config;
 
     /**
diff --git a/src/Query.php b/src/Query.php
index 78994a3..d796122 100644
--- a/src/Query.php
+++ b/src/Query.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -89,6 +89,7 @@
  */
 class Query
 {
+    /** @var array */
     protected $data;
 
     public function reset()
@@ -147,7 +148,7 @@ protected function normalizeFields($input)
                 throw new InvalidArgumentException('invalid type of field selector');
             }
 
-            $fieldNames = preg_split('/[\s,]+/', $field, null, PREG_SPLIT_NO_EMPTY);
+            $fieldNames = preg_split('/[\s,]+/', $field, 0, PREG_SPLIT_NO_EMPTY);
             foreach ($fieldNames as $name) {
                 if (! preg_match('/^(?:\*|[a-z_][a-z0-9_.]*)$/i', $name)) {
                     throw new InvalidArgumentException('malformed field selector: ' . $name);
@@ -511,7 +512,7 @@ public static function getDefaultSorting()
     {
         $sorting = static::getParameterDefault('sortField', 'score desc');
 
-        $parts = preg_split('/[\s,]+/', trim($sorting), null, PREG_SPLIT_NO_EMPTY);
+        $parts = preg_split('/[\s,]+/', trim($sorting), 0, PREG_SPLIT_NO_EMPTY);
 
         $sorting = [array_shift($parts)];
 
diff --git a/src/Result/Base.php b/src/Result/Base.php
index 285b209..2d9849f 100644
--- a/src/Result/Base.php
+++ b/src/Result/Base.php
@@ -26,14 +26,13 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2022, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
 namespace Opus\Search\Result;
 
 use InvalidArgumentException;
-use Opus\Common\DocumentInterface;
 use Opus\Common\Repository;
 use Opus\Document\DocumentException;
 use Opus\Search\Log;
@@ -55,6 +54,7 @@
  */
 class Base
 {
+    /** @var array */
     protected $data = [
         'matches'   => null,
         'count'     => null,
@@ -62,6 +62,7 @@ class Base
         'facets'    => null,
     ];
 
+    /** @var bool */
     protected $validated = false;
 
     public function __construct()
@@ -79,8 +80,8 @@ public static function create()
     /**
      * Assigns matches returned in response to search query.
      *
-     * @param mixed $documentId ID of document considered match of related search query
-     * @return Match
+     * @param int $documentId ID of document considered match of related search query
+     * @return ResultMatch
      */
     public function addMatch($documentId)
     {
@@ -88,7 +89,7 @@ public function addMatch($documentId)
             $this->data['matches'] = [];
         }
 
-        $match = Match::create($documentId);
+        $match = ResultMatch::create($documentId);
 
         $this->data['matches'][] = $match;
 
@@ -191,7 +192,7 @@ public function getFacet($fieldName)
      * Retrieves set of matching and locally existing documents returned in
      * response to some search query.
      *
-     * @return Match[]
+     * @return ResultMatch[]
      */
     public function getReturnedMatches()
     {
@@ -203,7 +204,7 @@ public function getReturnedMatches()
         // documents existing locally, only
         $matches = [];
 
-        /** @var Match $match */
+        /** @var ResultMatch $match */
         foreach ($this->data['matches'] as $match) {
             try {
                 $match->getDocument();
@@ -231,7 +232,7 @@ public function getReturnedMatchingIds()
         }
 
         return array_map(function ($match) {
-            /** @var Match $match */
+            /** @var ResultMatch $match */
             return $match->getId();
         }, $this->data['matches']);
     }
@@ -241,13 +242,13 @@ public function getReturnedMatchingIds()
      *
      * @deprecated
      *
+     * @return ResultMatch[]
      * @note This is provided for downward compatibility, though it's signature
      *       has changed in that it's returning set of Opus_Document instances
      *       rather than set of Opus_Search_Util_Result instances.
      * @note The wording is less specific in that all information in response to
      *       search query may considered results of search. Thus this new API
      *       prefers "matches" over "results".
-     * @return DocumentInterface[]
      */
     public function getResults()
     {
diff --git a/src/Result/Facet.php b/src/Result/Facet.php
index b12d857..2dadd92 100644
--- a/src/Result/Facet.php
+++ b/src/Result/Facet.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2008-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2008, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -37,7 +37,10 @@
 
 class Facet
 {
+    /** @var string */
     private $text;
+
+    /** @var int */
     private $count;
 
     /**
diff --git a/src/Result/Match.php b/src/Result/ResultMatch.php
similarity index 99%
rename from src/Result/Match.php
rename to src/Result/ResultMatch.php
index f9cfbfc..52f5fce 100644
--- a/src/Result/Match.php
+++ b/src/Result/ResultMatch.php
@@ -50,7 +50,7 @@
  * Describes local document as a match in context of a related search query.
  */
 
-class Match
+class ResultMatch
 {
     /** @var mixed */
     protected $id;
diff --git a/src/SearchException.php b/src/SearchException.php
index 30da690..084f612 100644
--- a/src/SearchException.php
+++ b/src/SearchException.php
@@ -48,10 +48,10 @@ class SearchException extends PhpException
 
     /**
      * @param string      $message
-     * @param int|null    $code
+     * @param int         $code
      * @param parent|null $previous
      */
-    public function __construct($message, $code = null, $previous = null)
+    public function __construct($message, $code = 0, $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
diff --git a/src/Service.php b/src/Service.php
index f76bae5..dffc168 100755
--- a/src/Service.php
+++ b/src/Service.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -43,6 +43,7 @@
 
 class Service
 {
+    /** @var array */
     protected static $adaptersPool = [];
 
     /**
diff --git a/src/Solr/Document/AbstractSolrDocumentBase.php b/src/Solr/Document/AbstractSolrDocumentBase.php
index 851af41..7654c52 100644
--- a/src/Solr/Document/AbstractSolrDocumentBase.php
+++ b/src/Solr/Document/AbstractSolrDocumentBase.php
@@ -113,7 +113,7 @@ private function attachFulltextToXml($modelXml, $files, $docId)
         // only consider files which are visible in frontdoor
         /** @var FileInterface $file */
         $files = array_filter($files, function ($file) {
-            return $file->getVisibleInFrontdoor() === '1';
+            return $file->getVisibleInFrontdoor() === 1;
         });
 
         if (! count($files)) {
diff --git a/src/Solr/Document/Xslt.php b/src/Solr/Document/Xslt.php
index b9a7738..e4af25b 100644
--- a/src/Solr/Document/Xslt.php
+++ b/src/Solr/Document/Xslt.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2019, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -45,8 +45,10 @@
 use function ctype_digit;
 use function dirname;
 use function filter_var;
+use function is_int;
 use function preg_split;
 use function strlen;
+use function strval;
 use function trim;
 
 use const DIRECTORY_SEPARATOR;
@@ -58,6 +60,7 @@ class Xslt extends AbstractSolrDocumentBase
     /** @var XSLTProcessor */
     protected $processor;
 
+    /** @var Zend_Config */
     private $options;
 
     public function __construct(Zend_Config $options)
@@ -92,7 +95,7 @@ public function __construct(Zend_Config $options)
      */
     public function toSolrDocument(DocumentInterface $opusDoc, $solrDoc)
     {
-        if (! $solrDoc instanceof DomDocument) {
+        if (! $solrDoc instanceof DOMDocument) {
             throw new InvalidArgumentException('provided Solr document must be instance of DOMDocument');
         }
 
@@ -118,7 +121,7 @@ public function getXsltFile()
     {
         $path = $this->options->xsltfile;
 
-        if (strlen(trim($path)) === 0) {
+        if ($path === null || strlen(trim($path)) === 0) {
             $path = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'solr.xslt';
         }
 
@@ -151,7 +154,10 @@ public static function indexYear($publishedDateYear, $publishedYear, $completedD
         foreach ($order as $fieldName) {
             if (array_key_exists($fieldName, $fields)) {
                 $year = $fields[$fieldName];
-                if (ctype_digit($year)) {
+                if (is_int($year)) {
+                    $year = strval($year);
+                }
+                if ($year !== null && ctype_digit($year)) {
                     // use the first value found
                     break;
                 }
@@ -161,6 +167,7 @@ public static function indexYear($publishedDateYear, $publishedYear, $completedD
         return $year;
     }
 
+    /** @var string */
     private static $yearOrder;
 
     /**
@@ -177,7 +184,7 @@ public static function getYearOrder()
                 $orderConfig = 'PublishedDate,PublishedYear'; // old default
             }
 
-            $order = preg_split('/[\s,]+/', trim($orderConfig), null, PREG_SPLIT_NO_EMPTY);
+            $order = preg_split('/[\s,]+/', trim($orderConfig), 0, PREG_SPLIT_NO_EMPTY);
 
             self::$yearOrder = $order;
         }
diff --git a/src/Solr/Filter/Helper.php b/src/Solr/Filter/Helper.php
index f2696c3..f5e49e9 100644
--- a/src/Solr/Filter/Helper.php
+++ b/src/Solr/Filter/Helper.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
diff --git a/src/Solr/Filter/Raw.php b/src/Solr/Filter/Raw.php
index fefe67d..f715238 100644
--- a/src/Solr/Filter/Raw.php
+++ b/src/Solr/Filter/Raw.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -43,6 +43,7 @@
  */
 class Raw extends AbstractFilterBase
 {
+    /** @var string */
     protected $rawTerm;
 
     /**
diff --git a/src/Solr/Solarium/Adapter.php b/src/Solr/Solarium/Adapter.php
index e2e41b2..bfc2096 100755
--- a/src/Solr/Solarium/Adapter.php
+++ b/src/Solr/Solarium/Adapter.php
@@ -56,6 +56,8 @@
 use Opus\Search\Solr\Filter\Raw;
 use Opus\Search\Solr\Solarium\Filter\Complex;
 use Solarium\Client as SolariumClient;
+use Solarium\Component\Facet\FieldValueParametersInterface;
+use Solarium\Core\Client\Adapter\Curl;
 use Solarium\Core\Query\Query as SolariumCoreQuery;
 use Solarium\Core\Query\Result\ResultInterface;
 use Solarium\Exception\HttpException;
@@ -63,6 +65,7 @@
 use Solarium\QueryType\Select\Query\Query as SolariumQuery;
 use Solarium\QueryType\Select\Result\Document as SolariumDocument;
 use Solarium\QueryType\Select\Result\Result;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Zend_Config;
 use Zend_Exception;
 
@@ -91,6 +94,9 @@
 
 class Adapter extends AbstractAdapter implements IndexingInterface, SearchingInterface, ExtractingInterface
 {
+    /** @var string */
+    protected $serviceName;
+
     /** @var Zend_Config */
     protected $options;
 
@@ -106,12 +112,21 @@ class Adapter extends AbstractAdapter implements IndexingInterface, SearchingInt
      */
     public function __construct($serviceName, $options)
     {
-        $this->options = $options;
-        $this->client  = new SolariumClient($options);
+        $this->serviceName = $serviceName;
+        $this->options     = $options;
+        $adapter           = new Curl();
+        $eventDispatcher   = new EventDispatcher();
+
+        $this->client = new SolariumClient($adapter, $eventDispatcher, $options->toArray());
 
         // ensure service is basically available
+        $this->ping();
+    }
+
+    public function ping()
+    {
         $ping = $this->client->createPing();
-        $this->execute($ping, 'failed pinging service ' . $serviceName);
+        $this->execute($ping, 'failed pinging service ' . $this->serviceName);
     }
 
     /**
@@ -142,9 +157,11 @@ protected function execute($query, $actionText)
             throw new SearchException($msg, $code, $e);
         }
 
+        /* TODO Solarium
         if ($result->getStatus()) {
             throw new SearchException($actionText, $result->getStatus());
         }
+        */
 
         return $result;
     }
@@ -440,7 +457,7 @@ public function namedSearch($name, ?Query $customization = null)
             throw new InvalidQueryException('selected query is not pre-defined: ' . $name);
         }
 
-        $search = $this->client->createSelect($definition);
+        $search = $this->client->createSelect($definition->toArray());
 
         return $this->processQuery($this->applyParametersOnQuery($search, $customization, true));
     }
@@ -477,8 +494,8 @@ protected function processQuery($query)
 
         // create result descriptor
         $result = Base::create()
-            ->setAllMatchesCount($request->getNumFound())
-            ->setQueryTime($request->getQueryTime());
+            ->setAllMatchesCount($request->getNumFound());
+            // TODO Solarium ->setQueryTime($request->getQueryTime());
 
         // add description on every returned match
         $excluded = 0;
@@ -605,8 +622,11 @@ protected function applyParametersOnQuery(
                     $facetSet->createFacetField($field->getName())
                         ->setField($field->getName())
                         ->setMinCount($field->getMinCount())
-                        ->setLimit($field->getLimit())
-                        ->setSort($field->getSort() ? 'index' : null);
+                        ->setLimit($field->getLimit());
+
+                    if ($field->getSort()) {
+                        $facetSet->setSort(FieldValueParametersInterface::SORT_INDEX);
+                    }
                 }
 
                 if ($facet->isFacetOnly()) {
@@ -826,7 +846,7 @@ protected function isMimeTypeSupported(FileInterface $file)
     {
         $mimeType = $file->getMimeType();
 
-        $mimeType = preg_split('/[;\s]+/', trim($mimeType), null, PREG_SPLIT_NO_EMPTY)[0];
+        $mimeType = preg_split('/[;\s]+/', trim($mimeType), 0, PREG_SPLIT_NO_EMPTY)[0];
 
         if ($mimeType) {
             $supported = $this->options->get("supportedMimeType", [
diff --git a/src/Solr/Solarium/Document.php b/src/Solr/Solarium/Document.php
index 961f63b..ab0d9d7 100644
--- a/src/Solr/Solarium/Document.php
+++ b/src/Solr/Solarium/Document.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2015, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -36,7 +36,7 @@
 use InvalidArgumentException;
 use Opus\Common\DocumentInterface;
 use Opus\Search\Solr\Document\Xslt;
-use Solarium\QueryType\Update\Query\Document\Document as SolariumDocument;
+use Solarium\QueryType\Update\Query\Document as SolariumDocument;
 use Zend_Config;
 
 use function simplexml_import_dom;
diff --git a/src/Task/ConsistencyCheck.php b/src/Task/ConsistencyCheck.php
index ecef441..e406d3e 100644
--- a/src/Task/ConsistencyCheck.php
+++ b/src/Task/ConsistencyCheck.php
@@ -34,8 +34,8 @@
 use Opus\Common\Config;
 use Opus\Common\JobInterface;
 use Opus\Common\Log;
-use Opus\Job\Worker\AbstractWorker;
-use Opus\Job\Worker\InvalidJobException;
+use Opus\Job\AbstractWorker;
+use Opus\Job\InvalidJobException;
 use Opus\Search\Util\ConsistencyCheck as SearchConsistencyCheck;
 use Zend_Log;
 use Zend_Log_Exception;
@@ -58,6 +58,7 @@ class ConsistencyCheck extends AbstractWorker
 {
     const LABEL = 'opus-consistency-check';
 
+    /** @var string */
     private $logfilePath;
 
     public function __construct()
diff --git a/src/Task/IndexOpusDocument.php b/src/Task/IndexOpusDocument.php
index aa4217c..f82c518 100644
--- a/src/Task/IndexOpusDocument.php
+++ b/src/Task/IndexOpusDocument.php
@@ -35,8 +35,8 @@
 use InvalidArgumentException;
 use Opus\Common\Document;
 use Opus\Common\JobInterface;
-use Opus\Job\Worker\InvalidJobException;
-use Opus\Job\Worker\WorkerInterface;
+use Opus\Job\InvalidJobException;
+use Opus\Job\WorkerInterface;
 use Opus\Search\Service;
 use RuntimeException;
 use Zend_Log;
diff --git a/src/Util/ConsistencyCheck.php b/src/Util/ConsistencyCheck.php
index b24bfc2..1183f32 100644
--- a/src/Util/ConsistencyCheck.php
+++ b/src/Util/ConsistencyCheck.php
@@ -36,8 +36,10 @@
 use Opus\Common\Log;
 use Opus\Common\Model\NotFoundException;
 use Opus\Common\Repository;
+use Opus\Search\IndexingInterface;
 use Opus\Search\QueryFactory;
 use Opus\Search\SearchException;
+use Opus\Search\SearchingInterface;
 use Opus\Search\Service;
 use Zend_Config_Exception;
 use Zend_Exception;
@@ -47,16 +49,22 @@
 
 class ConsistencyCheck
 {
+    /** @var Log */
     private $logger;
 
+    /** @var SearchingInterface */
     private $searcher;
 
+    /** @var IndexingInterface */
     private $indexer;
 
+    /** @var int */
     private $numOfInconsistencies = 0;
 
+    /** @var int */
     private $numOfUpdates = 0;
 
+    /** @var int */
     private $numOfDeletions = 0;
 
     /**
diff --git a/src/Util/Query.php b/src/Util/Query.php
index 4c68822..d424037 100644
--- a/src/Util/Query.php
+++ b/src/Util/Query.php
@@ -75,19 +75,46 @@ class Query
     const SEARCH_MODIFIER_CONTAINS_ANY  = "contains_any";
     const SEARCH_MODIFIER_CONTAINS_NONE = "contains_none";
 
-    private $start         = self::DEFAULT_START;
-    private $rows          = self::DEFAULT_ROWS;
-    private $sortField     = self::DEFAULT_SORTFIELD;
-    private $sortOrder     = self::DEFAULT_SORTORDER;
+    /** @var int */
+    private $start = self::DEFAULT_START;
+
+    /** @var int */
+    private $rows = self::DEFAULT_ROWS;
+
+    /** @var string */
+    private $sortField = self::DEFAULT_SORTFIELD;
+
+    /** @var string */
+    private $sortOrder = self::DEFAULT_SORTORDER;
+
+    /** @var array */
     private $filterQueries = [];
+
+    /** @var string */
     private $catchAll;
+
+    /** @var string */
     private $searchType;
+
+    /** @var array */
     private $modifier;
-    private $fieldValues     = [];
+
+    /** @var array */
+    private $fieldValues = [];
+
+    /** @var bool */
     private $escapingEnabled = true;
+
+    /** @var string */
     private $q;
+
+    /** @var string */
     private $facetField;
+
+    /** @var bool */
     private $returnIdsOnly = false;
+
+    /** @var int */
     private $seriesId;
 
     /**
@@ -415,7 +442,7 @@ private function combineSearchTerms($fieldname, $fieldvalue, $conjunction = null
     {
         $result     = $fieldname . ':(';
         $firstTerm  = true;
-        $queryTerms = preg_split("/[\s]+/", $this->escape($fieldvalue), null, PREG_SPLIT_NO_EMPTY);
+        $queryTerms = preg_split("/[\s]+/", $this->escape($fieldvalue), 0, PREG_SPLIT_NO_EMPTY);
         foreach ($queryTerms as $queryTerm) {
             if ($firstTerm) {
                 $firstTerm = false;
diff --git a/src/Util/Searcher.php b/src/Util/Searcher.php
index 005d9be..b6d3e90 100755
--- a/src/Util/Searcher.php
+++ b/src/Util/Searcher.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2008-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2008, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -46,9 +46,7 @@
 
 class Searcher
 {
-    /*
-     * Holds numbers of facets
-     */
+    /** @var array Holds numbers of facets */
     private $facetArray;
 
     /** @var Zend_Acl Access control list */
diff --git a/test/ConfigTest.php b/test/ConfigTest.php
index e95e731..44de22d 100644
--- a/test/ConfigTest.php
+++ b/test/ConfigTest.php
@@ -26,13 +26,12 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2022, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
 namespace OpusTest\Search;
 
-use Opus\Common\Config as OpusConfig;
 use Opus\Common\EnrichmentKey;
 use Opus\Search\Config;
 use OpusTest\Search\TestAsset\TestCase;
@@ -45,8 +44,6 @@ class ConfigTest extends TestCase
 {
     public function testProvidesSearchConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('search', null, 'solr');
 
         $this->assertInstanceOf(Zend_Config::class, $config);
@@ -64,8 +61,6 @@ public function testProvidesSearchConfiguration()
 
     public function testProvidesIndexConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('index', null, 'solr');
 
         $this->assertInstanceOf(Zend_Config::class, $config);
@@ -80,8 +75,6 @@ public function testProvidesIndexConfiguration()
 
     public function testProvidesExtractConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('extract', null, 'solr');
 
         $this->assertInstanceOf(Zend_Config::class, $config);
@@ -96,8 +89,6 @@ public function testProvidesExtractConfiguration()
 
     public function testProvidesDefaultConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('default', null, 'solr');
 
         $this->assertInstanceOf(Zend_Config::class, $config);
@@ -112,8 +103,6 @@ public function testProvidesDefaultConfiguration()
 
     public function testProvidesSpecialSearchConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('search', 'special', 'solr');
 
         $this->assertInstanceOf('Zend_Config', $config);
@@ -128,8 +117,6 @@ public function testProvidesSpecialSearchConfiguration()
 
     public function testProvidesSpecialExtractConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('extract', 'special', 'solr');
 
         $this->assertInstanceOf('Zend_Config', $config);
@@ -144,8 +131,6 @@ public function testProvidesSpecialExtractConfiguration()
 
     public function testProvidesDefaultConfigurationAsFallback()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('missing', null, 'solr');
 
         $this->assertInstanceOf('Zend_Config', $config);
@@ -160,8 +145,6 @@ public function testProvidesDefaultConfigurationAsFallback()
 
     public function testProvidesAllSolrConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getDomainConfiguration('solr');
 
         $this->assertInstanceOf('Zend_Config', $config);
@@ -183,159 +166,8 @@ public function testProvidesCachedConfiguration()
         $this->assertTrue($configA !== $configC);
     }
 
-    public function testAdoptsDeprecatedSearchConfiguration()
-    {
-        $this->dropDeprecatedConfiguration();
-
-        // test new style configuration as provided in ini-file
-        $config = Config::getServiceConfiguration('search', null, 'solr');
-
-        $this->assertInstanceOf('Zend_Config', $config);
-        $this->assertInstanceOf('Zend_Config', $config->query);
-        $this->assertInstanceOf('Zend_Config', $config->query->alldocs);
-
-        $this->assertEquals('search', $config->marker);
-        $this->assertNotNull($config->endpoint->primary->host);
-        $this->assertNotNull($config->endpoint->primary->port);
-        $this->assertNotNull($config->endpoint->primary->path);
-
-        $this->assertNotEquals('10.1.2.3', $config->endpoint->primary->host);
-        $this->assertNotEquals('12345', $config->endpoint->primary->port);
-        $this->assertNotEquals('/some/fallback', $config->endpoint->primary->path);
-
-        // provide some deprecated-style configuration to overlay
-        $this->adjustConfiguration([
-            'searchengine' => [
-                'index' => [
-                    'host' => '10.1.2.3',
-                    'port' => 12345,
-                    'app'  => 'some/fallback',
-                ],
-            ],
-        ]);
-
-        $this->assertEquals('10.1.2.3', OpusConfig::get()->searchengine->index->host);
-        $this->assertEquals('12345', OpusConfig::get()->searchengine->index->port);
-        $this->assertEquals('some/fallback', OpusConfig::get()->searchengine->index->app);
-
-        // repeat test above now expecting to get overlaid configuration
-        $config = Config::getServiceConfiguration('search', null, 'solr');
-
-        $this->assertInstanceOf(Zend_Config::class, $config);
-        $this->assertInstanceOf(Zend_Config::class, $config->query);
-        $this->assertInstanceOf(Zend_Config::class, $config->query->alldocs);
-
-        $this->assertEquals('search', $config->marker);
-
-        $this->assertEquals('10.1.2.3', $config->endpoint->primary->host);
-        $this->assertEquals('12345', $config->endpoint->primary->port);
-        $this->assertEquals('/some/fallback', $config->endpoint->primary->path);
-    }
-
-    public function testAdoptsDeprecatedIndexConfiguration()
-    {
-        $this->dropDeprecatedConfiguration();
-
-        // test new style configuration as provided in ini-file
-        $config = Config::getServiceConfiguration('index', null, 'solr');
-
-        $this->assertInstanceOf('Zend_Config', $config);
-        $this->assertInstanceOf('Zend_Config', $config->query);
-        $this->assertInstanceOf('Zend_Config', $config->query->alldocs);
-
-        $this->assertEquals('index', $config->marker);
-        $this->assertNotNull($config->endpoint->primary->host);
-        $this->assertNotNull($config->endpoint->primary->port);
-        $this->assertNotNull($config->endpoint->primary->path);
-
-        $this->assertNotEquals('10.1.2.3', $config->endpoint->primary->host);
-        $this->assertNotEquals('12345', $config->endpoint->primary->port);
-        $this->assertNotEquals('/some/fallback', $config->endpoint->primary->path);
-
-        // provide some deprecated-style configuration to overlay
-        $this->adjustConfiguration([
-            'searchengine' => [
-                'index' => [
-                    'host'    => '10.1.2.3',
-                    'port'    => 12345,
-                    'app'     => 'some/fallback',
-                    'timeout' => 20,
-                ],
-            ],
-        ]);
-
-        $this->assertEquals('10.1.2.3', OpusConfig::get()->searchengine->index->host);
-        $this->assertEquals('12345', OpusConfig::get()->searchengine->index->port);
-        $this->assertEquals('some/fallback', OpusConfig::get()->searchengine->index->app);
-        $this->assertEquals('20', OpusConfig::get()->searchengine->index->timeout);
-
-        // repeat test above now expecting to get overlaid configuration
-        $config = Config::getServiceConfiguration('index', null, 'solr');
-
-        $this->assertInstanceOf('Zend_Config', $config);
-        $this->assertInstanceOf('Zend_Config', $config->query);
-        $this->assertInstanceOf('Zend_Config', $config->query->alldocs);
-
-        $this->assertEquals('index', $config->marker);
-
-        $this->assertEquals('10.1.2.3', $config->endpoint->primary->host);
-        $this->assertEquals('12345', $config->endpoint->primary->port);
-        $this->assertEquals('/some/fallback', $config->endpoint->primary->path);
-    }
-
-    public function testAdoptsDeprecatedExtractConfiguration()
-    {
-        $this->dropDeprecatedConfiguration();
-
-        // test new style configuration as provided in ini-file
-        $config = Config::getServiceConfiguration('extract', null, 'solr');
-
-        $this->assertInstanceOf('Zend_Config', $config);
-        $this->assertInstanceOf('Zend_Config', $config->query);
-        $this->assertInstanceOf('Zend_Config', $config->query->alldocs);
-
-        $this->assertEquals('extract', $config->marker);
-        $this->assertNotNull($config->endpoint->primary->host);
-        $this->assertNotNull($config->endpoint->primary->port);
-        $this->assertNotNull($config->endpoint->primary->path);
-
-        $this->assertNotEquals('10.1.2.3', $config->endpoint->primary->host);
-        $this->assertNotEquals('12345', $config->endpoint->primary->port);
-        $this->assertNotEquals('/some/fallback', $config->endpoint->primary->path);
-
-        // provide some deprecated-style configuration to overlay
-        $this->adjustConfiguration([
-            'searchengine' => [
-                'extract' => [
-                    'host' => '10.1.2.3',
-                    'port' => 12345,
-                    'app'  => 'some/fallback',
-                ],
-            ],
-        ]);
-
-        $this->assertEquals('10.1.2.3', OpusConfig::get()->searchengine->extract->host);
-        $this->assertEquals('12345', OpusConfig::get()->searchengine->extract->port);
-        $this->assertEquals('some/fallback', OpusConfig::get()->searchengine->extract->app);
-
-        // repeat test above now expecting to get overlaid configuration
-        $config = Config::getServiceConfiguration('extract', null, 'solr');
-
-        $this->assertInstanceOf('Zend_Config', $config);
-        $this->assertInstanceOf('Zend_Config', $config->query);
-        $this->assertInstanceOf('Zend_Config', $config->query->alldocs);
-
-        $this->assertEquals('extract', $config->marker);
-
-        $this->assertEquals('10.1.2.3', $config->endpoint->primary->host);
-        $this->assertEquals('12345', $config->endpoint->primary->port);
-        $this->assertEquals('/some/fallback', $config->endpoint->primary->path);
-    }
-
     public function testAccessingDisfunctSearchConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('search', 'disfunct');
 
         $this->assertInstanceOf('Zend_Config', $config);
@@ -350,8 +182,6 @@ public function testAccessingDisfunctSearchConfiguration()
 
     public function testAccessingDisfunctIndexConfiguration()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config = Config::getServiceConfiguration('index', 'disfunct');
 
         $this->assertInstanceOf('Zend_Config', $config);
@@ -364,41 +194,13 @@ public function testAccessingDisfunctIndexConfiguration()
         $this->assertEquals('/solr-disfunct/', $config->endpoint->primary->path);
     }
 
-    public function testAccessingDisfunctSearchConfigurationFailsDueToDeprecated()
-    {
-        $config = Config::getServiceConfiguration('search', 'disfunct');
-
-        $this->assertInstanceOf('Zend_Config', $config);
-        $this->assertInstanceOf('Zend_Config', $config->query);
-        $this->assertInstanceOf('Zend_Config', $config->query->alldocs);
-
-        // deprecated configuration is overlaying newer configuration
-        $this->assertNotEquals('1.2.3.4', $config->endpoint->primary->host);
-        $this->assertNotEquals('12345', $config->endpoint->primary->port);
-        $this->assertNotEquals('/solr-disfunct/', $config->endpoint->primary->path);
-    }
-
-    public function testAccessingDisfunctIndexConfigurationFailsDueToDeprecated()
-    {
-        $config = Config::getServiceConfiguration('search', 'disfunct');
-
-        $this->assertInstanceOf('Zend_Config', $config);
-        $this->assertInstanceOf('Zend_Config', $config->query);
-        $this->assertInstanceOf('Zend_Config', $config->query->alldocs);
-
-        // deprecated configuration is overlaying newer configuration
-        $this->assertNotEquals('1.2.3.4', $config->endpoint->primary->host);
-        $this->assertNotEquals('12345', $config->endpoint->primary->port);
-        $this->assertNotEquals('/solr-disfunct/', $config->endpoint->primary->path);
-    }
-
     public function testGetFacetFieldsServerStateAdded()
     {
         $config = Config::getDomainConfiguration();
 
         $facetList = $config->facets;
 
-        $this->assertNotContains(
+        $this->assertStringNotContainsString(
             'server_state',
             $facetList,
             'Facet configuration for testing should not contain server_state'
@@ -435,7 +237,7 @@ public function testGetFacetLimits()
     {
         $limits = Config::getFacetLimits();
 
-        $this->assertInternalType('array', $limits);
+        $this->assertIsArray($limits);
         $this->assertCount(11, $limits);
         $this->assertArrayHasKey('__global__', $limits);
         $this->assertEquals(10, $limits['__global__']);
@@ -493,7 +295,7 @@ public function testGetFacetSorting()
     {
         $sorting = Config::getFacetSorting();
 
-        $this->assertInternalType('array', $sorting);
+        $this->assertIsArray($sorting);
         $this->assertCount(0, $sorting);
 
         Config::dropCached();
diff --git a/test/FulltextFileCacheTest.php b/test/FulltextFileCacheTest.php
index 54b5765..a68ced7 100644
--- a/test/FulltextFileCacheTest.php
+++ b/test/FulltextFileCacheTest.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2017, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -43,7 +43,7 @@
 
 class FulltextFileCacheTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->clearFiles();
 
@@ -69,7 +69,7 @@ public function testGetCacheFileName()
 
         $name = FulltextFileCache::getCacheFileName($file);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             'solr_cache---1ba50dc8abc619cea3ba39f77c75c0fe'
             . '-f87dffb1d8f33844154e214711674407e2493e6188b1411481e6a38fe071064e.txt',
             $name
@@ -81,6 +81,6 @@ public function testGetCacheFileName()
 
         $this->assertEquals($name, $name2);
 
-        $this->assertTrue(file_exists($name2));
+        $this->assertTrue(file_exists($name2), $name2);
     }
 }
diff --git a/test/Plugin/IndexTest.php b/test/Plugin/IndexTest.php
index 0914ea0..f9fd827 100644
--- a/test/Plugin/IndexTest.php
+++ b/test/Plugin/IndexTest.php
@@ -39,7 +39,7 @@
 
 class IndexTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -53,7 +53,7 @@ public function testCreateIndexJob()
 
         $document = Document::new();
         $document->setServerState('published');
-        $documentId = $document->store();
+        $documentId = (int) $document->store();
 
         $indexJobs = Job::getByLabels(['opus-index-document']);
 
@@ -100,7 +100,7 @@ public function testCreateRemoveIndexJob()
 
         $document = Document::new();
         $document->setServerState('published');
-        $documentId = $document->store();
+        $documentId = (int) $document->store();
 
         $indexJobs   = Job::getByLabels(['opus-index-document']);
         $newIndexJob = $this->getCreatedJob($documentId, $indexJobs);
diff --git a/test/Solr/Solarium/AdapterIndexingTest.php b/test/Solr/Solarium/AdapterIndexingTest.php
index 8dc3ddf..7ff67b7 100644
--- a/test/Solr/Solarium/AdapterIndexingTest.php
+++ b/test/Solr/Solarium/AdapterIndexingTest.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -48,15 +48,8 @@ public function testService()
         $this->assertInstanceOf(Adapter::class, $service);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testDisfunctServiceFails()
     {
-    // need to drop deprecated configuration options for interfering with
-    // intention of this test regarding revised configuration structure, only
-        $this->dropDeprecatedConfiguration();
-
         $this->expectException(Exception::class);
         Service::selectIndexingService('disfunct');
     }
@@ -346,15 +339,8 @@ public function testMultiplyRemovingMultipleIndexedDocumentsFailsAgain()
         $service->removeDocumentsFromIndex([$docA]);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testIndexingArticleOnDisfunctServiceFails()
     {
-        // need to drop deprecated configuration options for interfering with
-        // intention of this test regarding revised configuration structure, only
-        $this->dropDeprecatedConfiguration();
-
         $this->expectException(Exception::class);
         $service = Service::selectIndexingService('disfunct', 'solr');
 
diff --git a/test/Solr/Solarium/AdapterSearchingTest.php b/test/Solr/Solarium/AdapterSearchingTest.php
index 860af57..f64d17c 100644
--- a/test/Solr/Solarium/AdapterSearchingTest.php
+++ b/test/Solr/Solarium/AdapterSearchingTest.php
@@ -54,10 +54,6 @@ public function testService()
 
     public function testDisfunctServiceFails()
     {
-        // need to drop deprecated configuration options for interfering with
-        // intention of this test regarding revised configuration structure, only
-        $this->dropDeprecatedConfiguration();
-
         $this->expectException(Exception::class);
         Service::selectSearchingService('disfunct', 'solr');
     }
diff --git a/test/Solr/Solarium/AdapterTest.php b/test/Solr/Solarium/AdapterTest.php
new file mode 100644
index 0000000..2e9dfe1
--- /dev/null
+++ b/test/Solr/Solarium/AdapterTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of OPUS. The software OPUS has been originally developed
+ * at the University of Stuttgart with funding from the German Research Net,
+ * the Federal Department of Higher Education and Research and the Ministry
+ * of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+ *
+ * OPUS 4 is a complete rewrite of the original OPUS software and was developed
+ * by the Stuttgart University Library, the Library Service Center
+ * Baden-Wuerttemberg, the North Rhine-Westphalian Library Service Center,
+ * the Cooperative Library Network Berlin-Brandenburg, the Saarland University
+ * and State Library, the Saxon State Library - Dresden State and University
+ * Library, the Bielefeld University Library and the University Library of
+ * Hamburg University of Technology with funding from the German Research
+ * Foundation and the European Regional Development Fund.
+ *
+ * LICENCE
+ * OPUS is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or any later version.
+ * OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License
+ * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * @copyright   Copyright (c) 2023, OPUS 4 development team
+ * @license     http://www.gnu.org/licenses/gpl.html General Public License
+ */
+
+namespace OpusTest\Search\Solr\Solarium;
+
+use Opus\Search\Service;
+use OpusTest\Search\TestAsset\DocumentBasedTestCase;
+
+class AdapterTest extends DocumentBasedTestCase
+{
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testPing()
+    {
+        $service = Service::selectIndexingService(null, 'solr');
+
+        $service->ping();
+    }
+}
diff --git a/test/Solr/Solarium/DocumentTest.php b/test/Solr/Solarium/DocumentTest.php
index c39c3f1..365aba8 100644
--- a/test/Solr/Solarium/DocumentTest.php
+++ b/test/Solr/Solarium/DocumentTest.php
@@ -26,7 +26,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -36,14 +36,18 @@
 use Opus\Search\Solr\Solarium\Document;
 use OpusTest\Search\TestAsset\DocumentBasedTestCase;
 use Solarium\Client;
-use Solarium\QueryType\Update\Query\Document\Document as SolariumDocument;
+use Solarium\Core\Client\Adapter\Curl;
+use Solarium\QueryType\Update\Query\Document as SolariumDocument;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class DocumentTest extends DocumentBasedTestCase
 {
     public function testConvertingArticle()
     {
-        $service = new Client();
-        $update  = $service->createUpdate();
+        $adapter         = new Curl();
+        $eventDispatcher = new EventDispatcher();
+        $service         = new Client($adapter, $eventDispatcher);
+        $update          = $service->createUpdate();
 
         $article = $this->createDocument('article');
 
diff --git a/test/Task/ConsistencyCheckTest.php b/test/Task/ConsistencyCheckTest.php
index 42db14f..58ca936 100644
--- a/test/Task/ConsistencyCheckTest.php
+++ b/test/Task/ConsistencyCheckTest.php
@@ -34,7 +34,7 @@
 use Opus\Common\Config;
 use Opus\Common\Document;
 use Opus\Common\Job;
-use Opus\Job\Worker\InvalidJobException;
+use Opus\Job\InvalidJobException;
 use Opus\Search\Task\ConsistencyCheck;
 use OpusTest\Search\TestAsset\TestCase;
 
@@ -44,7 +44,7 @@
 
 class ConsistencyCheckTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->job    = Job::new();
@@ -80,8 +80,8 @@ public function testValidJobExecution()
         $this->assertFileExists($logfilePath);
 
         $content = file_get_contents($logfilePath);
-        $this->assertContains('checking 1 published documents for consistency.', $content);
-        $this->assertContains('No inconsistency was detected.', $content);
-        $this->assertContains('Completed operation after ', $content);
+        $this->assertStringContainsString('checking 1 published documents for consistency.', $content);
+        $this->assertStringContainsString('No inconsistency was detected.', $content);
+        $this->assertStringContainsString('Completed operation after ', $content);
     }
 }
diff --git a/test/TestAsset/DocumentBasedTestCase.php b/test/TestAsset/DocumentBasedTestCase.php
index 8f888b7..561a48e 100644
--- a/test/TestAsset/DocumentBasedTestCase.php
+++ b/test/TestAsset/DocumentBasedTestCase.php
@@ -56,8 +56,10 @@
 
 class DocumentBasedTestCase extends TestCase
 {
+    /** @var array */
     private $created = [];
 
+    /** @var array[] */
     protected static $documentPropertySets = [
         'article'   => [
             'Type'                    => 'article',
@@ -308,7 +310,7 @@ public function addFileToDocument($document, $filename, $label, $visibleInFrontd
     /**
      * Manages to delete all documents created in a test run.
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/test/TestAsset/SimpleTestCase.php b/test/TestAsset/SimpleTestCase.php
index f2a72a8..7f4ef95 100644
--- a/test/TestAsset/SimpleTestCase.php
+++ b/test/TestAsset/SimpleTestCase.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2008-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2008, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -52,6 +52,7 @@
  */
 class SimpleTestCase extends TestCase
 {
+    /** @var Zend_Config */
     private $configBackup;
 
     const CONFIG_VALUE_FALSE = ''; // Zend_Config übersetzt false in den Wert ''
@@ -89,31 +90,10 @@ protected function adjustConfiguration($overlay, $callback = null)
         return $previous;
     }
 
-    /**
-     * Drops configuration options available in deprecated format supported as
-     * part of downward compatibility but breaking some tests regarding new
-     * setup due to using that deprecated configuration in preference.
-     */
-    protected function dropDeprecatedConfiguration()
-    {
-        $config = OpusConfig::get()->searchengine;
-
-        unset(
-            $config->index->host,
-            $config->index->port,
-            $config->index->app,
-            $config->extract->host,
-            $config->extract->port,
-            $config->extract->app
-        );
-
-        Config::dropCached();
-    }
-
     /**
      * @beforeClass
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         defined('APPLICATION_PATH') || define('APPLICATION_PATH', realpath(dirname(dirname(dirname(__FILE__)))));
 
@@ -149,7 +129,7 @@ public static function createFolder($path)
     /**
      * Standard setUp method for clearing database.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -159,7 +139,7 @@ protected function setUp()
         }
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->configBackup !== null) {
             OpusConfig::set($this->configBackup);
diff --git a/test/TestAsset/TestCase.php b/test/TestAsset/TestCase.php
index aa65d1d..da0bce6 100644
--- a/test/TestAsset/TestCase.php
+++ b/test/TestAsset/TestCase.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2008-2010, OPUS 4 development team
+ * @copyright   Copyright (c) 2008, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -101,7 +101,7 @@ protected function clearFiles($directory = null)
     /**
      * Standard setUp method for clearing database.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -112,7 +112,7 @@ protected function setUp()
         $this->clearSolrIndex();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->clearSolrIndex();
 
diff --git a/test/Util/ConsistencyCheckTest.php b/test/Util/ConsistencyCheckTest.php
index ceb4e39..9e17069 100644
--- a/test/Util/ConsistencyCheckTest.php
+++ b/test/Util/ConsistencyCheckTest.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2008-2022, OPUS 4 development team
+ * @copyright   Copyright (c) 2008, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -33,6 +33,7 @@
 
 use Opus\Common\Config as OpusConfig;
 use Opus\Common\Document;
+use Opus\Common\DocumentInterface;
 use Opus\Search\Config;
 use Opus\Search\QueryFactory;
 use Opus\Search\SearchException;
@@ -40,18 +41,22 @@
 use Opus\Search\Util\ConsistencyCheck;
 use OpusTest\Search\TestAsset\TestCase;
 use Zend_Config;
+use Zend_Config_Exception;
 
 use function sleep;
 
 class ConsistencyCheckTest extends TestCase
 {
+    /** @var DocumentInterface */
     private $doc;
 
+    /** @var int */
     private $docId;
 
+    /** @var string */
     private $indexHost;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -179,8 +184,6 @@ public function testWithInconsistentStateAfterIndexDeletion()
 
     private function manipulateSolrConfig()
     {
-        $this->dropDeprecatedConfiguration();
-
         $config          = OpusConfig::get();
         $this->indexHost = $config->searchengine->solr->default->service->endpoint;
 
diff --git a/test/Util/SearcherTest.php b/test/Util/SearcherTest.php
index 5fbc36a..d2e4c1f 100644
--- a/test/Util/SearcherTest.php
+++ b/test/Util/SearcherTest.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2008-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2008, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -35,11 +35,12 @@
 use Opus\Common\CollectionRole;
 use Opus\Common\Config;
 use Opus\Common\Document;
+use Opus\Common\DocumentInterface;
 use Opus\Common\Model\ModelException;
 use Opus\Model\Xml;
 use Opus\Model\Xml\Cache;
 use Opus\Model\Xml\Version1;
-use Opus\Search\Result\Match;
+use Opus\Search\Result\ResultMatch;
 use Opus\Search\SearchException;
 use Opus\Search\Util\Query;
 use Opus\Search\Util\Searcher;
@@ -55,7 +56,7 @@
 
 class SearcherTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->clearFiles();
 
@@ -102,8 +103,8 @@ public function testIndexFieldServerDateModifiedIsPresent()
         $searcher = new Searcher();
         $results  = $searcher->search($query);
 
-        $this->assertEquals(1, count($results));
-        $result = $results->getResults();
+        $this->assertEquals(1, $results->getAllMatchesCount());
+        $result = $results->getReturnedMatches();
         $this->assertEquals($serverDateModified, $result[0]->getServerDateModified()->getUnixTimestamp());
     }
 
@@ -119,8 +120,8 @@ public function testIndexFieldServerDateModifiedIsCorrectAfterModification()
         $query->setRows(1);
         $searcher = new Searcher();
         $results  = $searcher->search($query);
-        $this->assertEquals(1, count($results));
-        $result = $results->getResults();
+        $this->assertEquals(1, $results->getAllMatchesCount());
+        $result = $results->getReturnedMatches();
 
         sleep(1);
 
@@ -298,7 +299,7 @@ public function testServerDateModifiedIsUpdatedForDependentModelChanges()
 
     /**
      * @param int|null $collId
-     * @return Document[]|Match[]
+     * @return DocumentInterface[]|ResultMatch[]
      * @throws SearchException
      */
     private function searchDocumentsAssignedToCollection($collId = null)
@@ -317,21 +318,20 @@ public function testFulltextFieldsForValidPDFFulltext()
     {
         $fileName = 'test.pdf';
         $id       = $this->createDocWithFulltext($fileName);
-
-        $result = $this->getSearchResultForFulltextTests();
-
-        $success = $result->getFulltextIDsSuccess();
+        $result   = $this->getSearchResultForFulltextTests();
+        $success  = $result->getFulltextIDsSuccess();
 
         $doc   = Document::get($id);
         $file  = $doc->getFile();
         $value = $file[0]->getId() . ':' . $file[0]->getRealHash('md5');
         $this->removeFiles($id, $fileName);
 
-        $this->assertEquals(1, count($success));
+        $this->assertNotNull($success);
+        $this->assertCount(1, $success);
         $this->assertEquals($value, $success[0]);
 
         $failure = $result->getFulltextIDsFailure();
-        $this->assertEquals(0, count($failure));
+        $this->assertNull($failure);
     }
 
     public function testFulltextFieldsForInvalidPDFFulltext()
@@ -348,11 +348,12 @@ public function testFulltextFieldsForInvalidPDFFulltext()
         $value = $file[0]->getId() . ':' . $file[0]->getRealHash('md5');
         $this->removeFiles($id, $fileName);
 
-        $this->assertEquals(1, count($failure));
+        $this->assertNotNull($failure);
+        $this->assertCount(1, $failure);
         $this->assertEquals($value, $failure[0]);
 
         $success = $result->getFulltextIDsSuccess();
-        $this->assertEquals(0, count($success));
+        $this->assertNull($success);
     }
 
     /**
@@ -367,10 +368,12 @@ public function testFulltextFieldsForValidAndInvalidPDFFulltexts()
         $result = $this->getSearchResultForFulltextTests();
 
         $success = $result->getFulltextIDsSuccess();
-        $this->assertEquals(1, count($success));
+        $this->assertNotNull($success);
+        $this->assertCount(1, $success);
 
         $failure = $result->getFulltextIDsFailure();
-        $this->assertEquals(1, count($failure));
+        $this->assertNotNull($failure);
+        $this->assertCount(1, $failure);
 
         $doc   = Document::get($id);
         $file  = $doc->getFile();
@@ -400,8 +403,9 @@ public function testFulltextFieldsForTwoValidDFFulltexts()
         $valueFile2 = $file[1]->getId() . ':' . $file[1]->getRealHash('md5');
         $this->removeFiles($id, $fileName1, $fileName2);
 
-        $this->assertEquals(2, count($success));
-        $this->assertEquals(0, count($failure));
+        $this->assertNotNull($success);
+        $this->assertCount(2, $success);
+        $this->assertNull($failure);
         $this->assertEquals($valueFile1, $success[0]);
         $this->assertEquals($valueFile2, $success[1]);
     }
@@ -476,7 +480,7 @@ private function removeFiles($docId, $fulltext1, $fulltext2 = null)
     }
 
     /**
-     * @return Document|Match
+     * @return DocumentInterface|ResultMatch
      * @throws SearchException
      */
     private function getSearchResultForFulltextTests()
@@ -484,7 +488,7 @@ private function getSearchResultForFulltextTests()
         $query = new Query(Query::SIMPLE);
         $query->setCatchAll('*:*');
         $searcher = new Searcher();
-        $results  = $searcher->search($query)->getResults();
+        $results  = $searcher->search($query)->getReturnedMatches();
         $this->assertEquals(1, count($results));
         return $results[0];
     }
diff --git a/test/config.ini.template b/test/config.ini.template
index 6722f20..6d9f08d 100644
--- a/test/config.ini.template
+++ b/test/config.ini.template
@@ -29,104 +29,18 @@
 ; Have a look on Zend_Db::factory() method for information about adapter creation.
 
 [production]
-; The 'theme' setting can be used to select a different theme.
-; Need theme for unit tests.
-theme = foobar
-
-;DB SETTINGS
-; db.params.host = "127.0.0.1"
-; db.params.port = "3306"
-; Currently it is necessary to use the admin account here for testing
-db.params.username = @db.admin.name@
-db.params.password = @db.admin.password@
-db.params.dbname = @db.name@
-db.debug = 1
-
-opusdb.params.admin.name = @db.admin.name@
-opusdb.params.admin.password = @db.admin.password@
-
-;ZEND_APPLICATION SETTINGS
-bootstrap.path = APPLICATION_PATH "/test/Bootstrap.php"
-bootstrap.class = "OpusTest\Search\Bootstrap"
-opus.bootstrap.resources = Database,Temp,OpusLocale,IndexPlugin
-
-;SEARCH ENGINE SETTINGS
-searchengine.solr.default.adapterClass = Opus\Search\Solr\Solarium\Adapter
-
 searchengine.solr.default.service.default.endpoint.primary.host = @searchengine.index.host@
 searchengine.solr.default.service.default.endpoint.primary.port = @searchengine.index.port@
-searchengine.solr.default.service.default.endpoint.primary.path = @searchengine.index.app@
-searchengine.solr.default.service.default.endpoint.primary.timeout = 10
-searchengine.solr.default.service.default.marker = default
+searchengine.solr.default.service.default.endpoint.primary.path = @searchengine.index.path@
+searchengine.solr.default.service.default.endpoint.primary.core = @searchengine.index.core@
 
 searchengine.solr.default.service.index.endpoint.primary.port = @searchengine.index.port@
-searchengine.solr.default.service.index.endpoint.primary.path = @searchengine.index.app@
-searchengine.solr.default.service.index.marker = index
+searchengine.solr.default.service.index.endpoint.primary.path = @searchengine.index.path@
+searchengine.solr.default.service.index.endpoint.primary.core = @searchengine.index.core@
 
 searchengine.solr.default.service.search.endpoint.primary.host = @searchengine.index.host@
 searchengine.solr.default.service.search.endpoint.primary.port = @searchengine.index.port@
-searchengine.solr.default.service.search.endpoint.primary.path = @searchengine.index.app@
-searchengine.solr.default.service.search.marker = search
-
-searchengine.solr.default.service.extract.marker = extract
-
-; declare separate named service used by Opus_Search_ConfigTest accessing
-; different named services
-searchengine.solr.special.service.default.endpoint.primary.path = /solr-special/
-searchengine.solr.special.service.search.endpoint.primary.host = "127.0.0.2"
-searchengine.solr.special.service.search.marker = search2
-
-searchengine.solr.special.service.extract.marker = extract2
-
-; declare separate named service addressing unavailable host used by
-; Opus_Search_Solr_Solarium_AdapterIndexingTest
-searchengine.solr.disfunct.service.default.endpoint.primary.host = 1.2.3.4
-searchengine.solr.disfunct.service.default.endpoint.primary.port = 12345
-searchengine.solr.disfunct.service.default.endpoint.primary.path = /solr-disfunct/
-
-; declare queries in runtime configuration used by Opus_Search_QueryTest
-searchengine.solr.default.query.alldocs.query = "*:*"
-
-searchengine.solr.default.query.onedoc.query = "*:*"
-searchengine.solr.default.query.onedoc.rows = 1
-
-;SEARCH ENGINE SETTINGS (deprecated)
-searchengine.index.host = @searchengine.index.host@
-searchengine.index.port = @searchengine.index.port@
-searchengine.index.app = @searchengine.index.app@
-searchengine.index.timeout = 10
-searchengine.extract.host = @searchengine.index.host@
-searchengine.extract.port = @searchengine.index.port@
-searchengine.extract.app = @searchengine.index.app@
-searchengine.extract.timeout = 10
-searchengine.solr.facets = author_facet,year,doctype,language,has_fulltext,belongs_to_bibliography,subject,project,institute
-
-search.facet.year.indexField = 'published_year'
-
-search.index.field.year.order = 'PublishedDate,PublishedYear'
-
-modelFactory = 'Opus\ModelFactory'
-model.fieldDescriptorClass = "Opus\Db\Model\DbFieldDescriptor"
-
-;LOGGING RELATED SETTINGS
-; if set to true all xml that is generated while indexing is prepared for logging
-log.prepare.xml = false
-log.level = DEBUG
-
-; Plugins used by Opus_Document
-model.plugins.document[] = 'Opus\Search\Plugin\Index'
-model.plugins.document[] = 'Opus\Document\Plugin\XmlCache'
-model.plugins.document[] = 'Opus\Document\Plugin\IdentifierUrn'
-model.plugins.document[] = 'Opus\Document\Plugin\IdentifierDoi'
-
-documentFinderClass = 'Opus\DocumentFinder\DefaultDocumentFinder'
+searchengine.solr.default.service.search.endpoint.primary.path = @searchengine.index.path@
+searchengine.solr.default.service.search.endpoint.primary.core = @searchengine.index.core@
 
 [testing : production]
-sql.schema.path =
-
-; URN SETTINGS
-; If you do not want to set URNs automatically, set these values blank or
-; comment them out
-urn.nid = nbn
-urn.nss = de:kobv:test-opus
-urn.autoCreate = true
diff --git a/test/test.ini b/test/test.ini
new file mode 100644
index 0000000..4c444b2
--- /dev/null
+++ b/test/test.ini
@@ -0,0 +1,103 @@
+; This file is part of OPUS. The software OPUS has been originally developed
+; at the University of Stuttgart with funding from the German Research Net,
+; the Federal Department of Higher Education and Research and the Ministry
+; of Science, Research and the Arts of the State of Baden-Wuerttemberg.
+;
+; OPUS 4 is a complete rewrite of the original OPUS software and was developed
+; by the Stuttgart University Library, the Library Service Center
+; Baden-Wuerttemberg, the Cooperative Library Network Berlin-Brandenburg,
+; the Saarland University and State Library, the Saxon State Library -
+; Dresden State and University Library, the Bielefeld University Library and
+; the University Library of Hamburg University of Technology with funding from
+; the German Research Foundation and the European Regional Development Fund.
+;
+; LICENCE
+; OPUS is free software; you can redistribute it and/or modify it under the
+; terms of the GNU General Public License as published by the Free Software
+; Foundation; either version 2 of the Licence, or any later version.
+; OPUS is distributed in the hope that it will be useful, but WITHOUT ANY
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+; FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+; details. You should have received a copy of the GNU General Public License
+; along with OPUS; if not, write to the Free Software Foundation, Inc., 51
+; Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+;
+; @copyright   Copyright (c) 2023, OPUS 4 development team
+; @license     http://www.gnu.org/licenses/gpl.html General Public License
+
+; Database adapter configuration using standard Zend_db option names.
+; Have a look on Zend_Db::factory() method for information about adapter creation.
+
+[production]
+; The 'theme' setting can be used to select a different theme.
+; Need theme for unit tests.
+theme = foobar
+
+;ZEND_APPLICATION SETTINGS
+bootstrap.path = APPLICATION_PATH "/test/Bootstrap.php"
+bootstrap.class = "OpusTest\Search\Bootstrap"
+opus.bootstrap.resources = Database,Temp,OpusLocale,IndexPlugin
+
+;SEARCH ENGINE SETTINGS
+searchengine.solr.default.adapterClass = Opus\Search\Solr\Solarium\Adapter
+
+searchengine.solr.default.service.default.endpoint.primary.timeout = 10
+searchengine.solr.default.service.default.marker = default
+
+searchengine.solr.default.service.index.marker = index
+
+searchengine.solr.default.service.search.marker = search
+
+searchengine.solr.default.service.extract.marker = extract
+
+; declare separate named service used by Opus_Search_ConfigTest accessing
+; different named services
+searchengine.solr.special.service.default.endpoint.primary.path = /solr-special/
+searchengine.solr.special.service.search.endpoint.primary.host = "127.0.0.2"
+searchengine.solr.special.service.search.marker = search2
+
+searchengine.solr.special.service.extract.marker = extract2
+
+; declare separate named service addressing unavailable host used by
+; Opus_Search_Solr_Solarium_AdapterIndexingTest
+searchengine.solr.disfunct.service.default.endpoint.primary.host = 1.2.3.4
+searchengine.solr.disfunct.service.default.endpoint.primary.port = 12345
+searchengine.solr.disfunct.service.default.endpoint.primary.path = /solr-disfunct/
+
+; declare queries in runtime configuration used by Opus_Search_QueryTest
+searchengine.solr.default.query.alldocs.query = "*:*"
+
+searchengine.solr.default.query.onedoc.query = "*:*"
+searchengine.solr.default.query.onedoc.rows = 1
+
+searchengine.solr.facets = author_facet,year,doctype,language,has_fulltext,belongs_to_bibliography,subject,project,institute
+
+search.facet.year.indexField = 'published_year'
+
+search.index.field.year.order = 'PublishedDate,PublishedYear'
+
+modelFactory = 'Opus\ModelFactory'
+model.fieldDescriptorClass = "Opus\Db\Model\DbFieldDescriptor"
+
+;LOGGING RELATED SETTINGS
+; if set to true all xml that is generated while indexing is prepared for logging
+log.prepare.xml = false
+log.level = DEBUG
+
+; Plugins used by Opus_Document
+model.plugins.document[] = 'Opus\Search\Plugin\Index'
+model.plugins.document[] = 'Opus\Document\Plugin\XmlCache'
+model.plugins.document[] = 'Opus\Document\Plugin\IdentifierUrn'
+model.plugins.document[] = 'Opus\Document\Plugin\IdentifierDoi'
+
+documentFinderClass = 'Opus\DocumentFinder\DefaultDocumentFinder'
+
+[testing : production]
+sql.schema.path =
+
+; URN SETTINGS
+; If you do not want to set URNs automatically, set these values blank or
+; comment them out
+urn.nid = nbn
+urn.nss = de:kobv:test-opus
+urn.autoCreate = true