From 81aa7c3deb1e612e3a8ce074da174afa0f88ff7f Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Mon, 28 Nov 2022 09:41:47 +0100
Subject: [PATCH 1/6] #38 Prepare code for PHP 8

---
 .github/workflows/php.yml                | 19 ++++++++++++++-----
 Vagrantfile                              |  4 ++--
 composer.json                            | 10 +++++-----
 phpcs.xml                                | 23 +----------------------
 src/AbstractPackageReader.php            |  3 ++-
 src/CsvImporter.php                      |  5 +++++
 src/ImportStatusDocument.php             |  3 ++-
 src/Importer.php                         | 18 ++++++++++++++++++
 src/Sword/ImportCollection.php           |  3 +++
 test/ImporterTest.php                    |  5 +++--
 test/PackageReaderTest.php               |  6 ++++--
 test/TarPackageReaderTest.php            |  7 ++-----
 test/TestAsset/SimpleTestCase.php        |  9 +++++----
 test/TestAsset/TestCase.php              |  6 +++---
 test/Worker/MetadataImportWorkerTest.php |  9 +++++++--
 test/Xml/MetadataImportTest.php          | 11 +++++++++--
 test/ZipPackageReaderTest.php            |  9 +++------
 17 files changed, 88 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 0087ac9..edf156e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -9,15 +9,24 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        php-versions: ['7.1', '7.4', '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: curl -s http://getcomposer.org/installer | php && php composer.phar self-update && php composer.phar install
@@ -26,7 +35,7 @@ jobs:
         run: sudo systemctl start mysql.service
 
       - 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
diff --git a/Vagrantfile b/Vagrantfile
index b96466b..cc0f3c2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,7 +30,7 @@ bin/composer update
 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
@@ -59,7 +59,7 @@ echo "'composer cs-fix' to automatically fix basic style problems"
 SCRIPT
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "bento/ubuntu-20.04"
+  config.vm.box = "bento/ubuntu-22.04"
 
   config.vm.provision "Install required software...", type: "shell", inline: $software
   config.vm.provision "Install Composer dependencies...", type: "shell", privileged: false, inline: $composer
diff --git a/composer.json b/composer.json
index c3cd14c..2139a54 100644
--- a/composer.json
+++ b/composer.json
@@ -13,14 +13,14 @@
     "ext-fileinfo": "*",
     "ext-libxml": "*",
     "ext-zip": "*",
-    "opus4-repo/opus4-common": "4.7.2.x-dev",
-    "opus4-repo/opus4-job": "dev-main"
+    "opus4-repo/opus4-common": "dev-4.7.2-zf1f",
+    "opus4-repo/opus4-job": "dev-4.7.2-zf1f"
   },
   "require-dev": {
-    "phpunit/phpunit": "6.*",
-    "laminas/laminas-coding-standard": "<2.3",
+    "phpunit/phpunit": "<9",
+    "opus4-repo/codesniffer": "dev-laminas",
     "phpmetrics/phpmetrics": "2.7.4",
-    "opus4-repo/framework": "4.7.2.x-dev"
+    "opus4-repo/framework": "dev-4.7.2-zf1f"
   },
   "config": {
     "allow-plugins": {
diff --git a/phpcs.xml b/phpcs.xml
index 2ce565d..d2ffbb8 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,27 +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>
-
-    <!-- Loosening the Laminas coding style to allow our customary annotations. -->
-    <rule ref="SlevomatCodingStandard.Commenting.ForbiddenAnnotations">
-        <properties>
-            <property name="forbiddenAnnotations" type="array">
-                <element value="@api"/>
-                <element value="@created"/>
-                <element value="@subpackage"/>
-                <element value="@version"/>
-                <element value="@expectedException"/>
-                <element value="@expectedExceptionCode"/>
-                <element value="@expectedExceptionMessage"/>
-                <element value="@expectedExceptionMessageRegExp"/>
-            </property>
-        </properties>
-    </rule>
-
-    <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue">
-        <type>warning</type>
-    </rule>
-
 </ruleset>
\ No newline at end of file
diff --git a/src/AbstractPackageReader.php b/src/AbstractPackageReader.php
index 268327e..7a57fc0 100644
--- a/src/AbstractPackageReader.php
+++ b/src/AbstractPackageReader.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) 2016
+ * @copyright   Copyright (c) 2016, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  *
  * Reads an OPUS import package containing one or more documents and imports
@@ -59,6 +59,7 @@ abstract class AbstractPackageReader
 
     const EXTRACTION_DIR_NAME = 'extracted';
 
+    /** @var array */
     private $additionalEnrichments;
 
     /**
diff --git a/src/CsvImporter.php b/src/CsvImporter.php
index 79a5640..86bd398 100755
--- a/src/CsvImporter.php
+++ b/src/CsvImporter.php
@@ -111,8 +111,13 @@ class CsvImporter
     const ENRICHMENT_RELEVANCE         = 31;
     const FILENAME                     = 32;
 
+    /** @var array */
     private $seriesIdsMap = [];
+
+    /** @var string */
     private $fulltextDir;
+
+    /** @var string */
     private $guestRole;
 
     /**
diff --git a/src/ImportStatusDocument.php b/src/ImportStatusDocument.php
index 2a8de03..88e9bfd 100644
--- a/src/ImportStatusDocument.php
+++ b/src/ImportStatusDocument.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) 2016-2022
+ * @copyright   Copyright (c) 2016, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -38,6 +38,7 @@
  */
 class ImportStatusDocument
 {
+    /** @var array */
     private $docs = [];
 
     /**
diff --git a/src/Importer.php b/src/Importer.php
index 8605247..eada5da 100644
--- a/src/Importer.php
+++ b/src/Importer.php
@@ -38,6 +38,7 @@
 use Exception;
 use finfo;
 use Opus\Common\Collection;
+use Opus\Common\CollectionInterface;
 use Opus\Common\Config\FileTypes;
 use Opus\Common\DnbInstitute;
 use Opus\Common\Document;
@@ -87,15 +88,29 @@
  */
 class Importer
 {
+    /** @var string|null */
     private $logfile;
+
+    /** @var Zend_Log|null */
     private $logger;
+
+    /** @var string */
     private $xml;
+
+    /** @var string */
     private $xmlFile;
+
+    /** @var string */
     private $xmlString;
+
+    /** @var array */
     private $fieldsToKeepOnUpdate = [];
 
     // variables used in SWORD context
+    /** @var bool */
     private $swordContext = false;
+
+    /** @var string */
     private $importDir;
 
     /** @var mixed */
@@ -110,7 +125,10 @@ class Importer
      */
     private $additionalEnrichments;
 
+    /** @var CollectionInterface */
     private $importCollection;
+
+    /** @var bool */
     private $singleDocImport = false;
 
     /**
diff --git a/src/Sword/ImportCollection.php b/src/Sword/ImportCollection.php
index 60bf487..6e67d6c 100644
--- a/src/Sword/ImportCollection.php
+++ b/src/Sword/ImportCollection.php
@@ -32,6 +32,7 @@
 namespace Opus\Import\Sword;
 
 use Opus\Common\Collection;
+use Opus\Common\CollectionInterface;
 use Opus\Common\CollectionRole;
 use Opus\Common\Config;
 use Opus\Common\Log;
@@ -41,8 +42,10 @@
 
 class ImportCollection
 {
+    /** @var CollectionInterface */
     private $importCollection;
 
+    /** @var string */
     private $roleName;
 
     public function __construct()
diff --git a/test/ImporterTest.php b/test/ImporterTest.php
index 35ab6e6..dff2644 100644
--- a/test/ImporterTest.php
+++ b/test/ImporterTest.php
@@ -43,9 +43,10 @@
 
 class ImporterTest extends TestCase
 {
+    /** @var string */
     protected $additionalResources = 'database';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -58,7 +59,7 @@ public function setUp()
         $enrichmentKey->store();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $enrichmentKey = EnrichmentKey::fetchByName('City');
         if ($enrichmentKey !== null) {
diff --git a/test/PackageReaderTest.php b/test/PackageReaderTest.php
index 627f084..f124403 100644
--- a/test/PackageReaderTest.php
+++ b/test/PackageReaderTest.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) 2018-2022, OPUS 4 development team
+ * @copyright   Copyright (c) 2018, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -50,11 +50,13 @@
 
 class PackageReaderTest extends TestCase
 {
+    /** @var AbstractPackageReader */
     private $mockReader;
 
+    /** @var string */
     protected $additionalResources = 'database';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/test/TarPackageReaderTest.php b/test/TarPackageReaderTest.php
index e2a4ac1..6748894 100644
--- a/test/TarPackageReaderTest.php
+++ b/test/TarPackageReaderTest.php
@@ -27,10 +27,6 @@
  *
  * @copyright   Copyright (c) 2019, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- *
- * @category    Application Unit Tests
- * @package     Application
- * @author      Sascha Szott <opus-development@saschaszott.de>
  */
 
 namespace OpusTest\Import;
@@ -45,9 +41,10 @@
 
 class TarPackageReaderTest extends TestCase
 {
+    /** @var string */
     protected $additionalResources = 'database';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->makeConfigurationModifiable();
diff --git a/test/TestAsset/SimpleTestCase.php b/test/TestAsset/SimpleTestCase.php
index 92a7b55..9563e26 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-2022, OPUS 4 development team
+ * @copyright   Copyright (c) 2008, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -56,6 +56,7 @@
  */
 class SimpleTestCase extends TestCase
 {
+    /** @var Zend_Config */
     private $configBackup;
 
     const CONFIG_VALUE_FALSE = ''; // Zend_Config übersetzt false in den Wert ''
@@ -94,7 +95,7 @@ protected function adjustConfiguration($overlay, $callback = null)
     /**
      * @beforeClass
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         defined('APPLICATION_PATH') || define('APPLICATION_PATH', realpath(dirname(dirname(dirname(__FILE__)))));
 
@@ -130,7 +131,7 @@ public static function createFolder($path)
     /**
      * Standard setUp method for clearing database.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -140,7 +141,7 @@ protected function setUp()
         }
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->configBackup !== null) {
             Config::set($this->configBackup);
diff --git a/test/TestAsset/TestCase.php b/test/TestAsset/TestCase.php
index 3cd0eae..43d0ac4 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-2022, OPUS 4 development team
+ * @copyright   Copyright (c) 2008, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -95,7 +95,7 @@ protected function clearFiles($directory = null)
     /**
      * Standard setUp method for clearing database.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -103,7 +103,7 @@ protected function setUp()
         $this->clearFiles();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/test/Worker/MetadataImportWorkerTest.php b/test/Worker/MetadataImportWorkerTest.php
index dd25908..e665bd0 100644
--- a/test/Worker/MetadataImportWorkerTest.php
+++ b/test/Worker/MetadataImportWorkerTest.php
@@ -29,7 +29,7 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
-namespace OpusTest\Job\Worker;
+namespace OpusTest\Import\Worker;
 
 use DOMDocument;
 use Exception;
@@ -45,17 +45,22 @@
 
 class MetadataImportWorkerTest extends TestCase
 {
+    /** @var string */
     private $filename;
 
+    /** @var Job */
     private $job;
 
+    /** @var MetadataImportWorker */
     private $worker;
 
+    /** @var string|null */
     private $xml;
 
+    /** @var string */
     private $xmlDir;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->job    = Job::new();
diff --git a/test/Xml/MetadataImportTest.php b/test/Xml/MetadataImportTest.php
index bf9f0fb..796848a 100644
--- a/test/Xml/MetadataImportTest.php
+++ b/test/Xml/MetadataImportTest.php
@@ -52,12 +52,19 @@
  */
 class MetadataImportTest extends TestCase
 {
+    /** @var bool */
     private $documentImported;
+
+    /** @var string */
     private $filename;
+
+    /** @var string */
     private $xml;
+
+    /** @var string */
     private $xmlDir;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -65,7 +72,7 @@ public function setUp()
         $this->xmlDir           = dirname(dirname(__FILE__)) . '/_files/xml/';
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $finder = Repository::getInstance()->getDocumentFinder();
 
diff --git a/test/ZipPackageReaderTest.php b/test/ZipPackageReaderTest.php
index 98852fe..eb29113 100644
--- a/test/ZipPackageReaderTest.php
+++ b/test/ZipPackageReaderTest.php
@@ -25,12 +25,8 @@
  * 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) 2018-2019, OPUS 4 development team
+ * @copyright   Copyright (c) 2018, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- *
- * @category    Application Unit Tests
- * @package     Application
- * @author      Jens Schwidder <schwidder@zib.de>
  */
 
 namespace OpusTest\Import;
@@ -45,9 +41,10 @@
 
 class ZipPackageReaderTest extends TestCase
 {
+    /** @var string */
     protected $additionalResources = 'database';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->makeConfigurationModifiable();

From 602b8bfb067f4a8fd7ae6d1249e5223f25d5a844 Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Mon, 28 Nov 2022 09:50:51 +0100
Subject: [PATCH 2/6] #38 Don't use get_class with NULL

---
 test/Worker/MetadataImportWorkerTest.php | 3 ++-
 test/Xml/MetadataImportTest.php          | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/Worker/MetadataImportWorkerTest.php b/test/Worker/MetadataImportWorkerTest.php
index e665bd0..1dc8e75 100644
--- a/test/Worker/MetadataImportWorkerTest.php
+++ b/test/Worker/MetadataImportWorkerTest.php
@@ -130,7 +130,8 @@ public function testImportValidXml()
         } catch (Exception $ex) {
             $e = $ex;
         }
-        $this->assertNull($e, 'unexpected exception was thrown: ' . get_class($e));
+        $exceptionClass = $e !== null ? get_class($e) : '';
+        $this->assertNull($e, 'unexpected exception was thrown: ' . $exceptionClass);
     }
 
     private function loadInputFile()
diff --git a/test/Xml/MetadataImportTest.php b/test/Xml/MetadataImportTest.php
index 796848a..ec53958 100644
--- a/test/Xml/MetadataImportTest.php
+++ b/test/Xml/MetadataImportTest.php
@@ -123,7 +123,14 @@ public function testNoMetadataImportException()
         } catch (MetadataImportSkippedDocumentsException $ex) {
             $e = $ex;
         }
-        $this->assertNull($e, 'unexpected exception was thrown: ' . get_class($e));
+
+        if ($e !== null) {
+            $exceptionClass = get_class($e);
+        } else {
+            $exceptionClass = '';
+        }
+
+        $this->assertNull($e, 'unexpected exception was thrown: ' . $exceptionClass);
 
         $this->documentImported = true;
     }

From 1ef86616de0ca94f393a2579eba06ec316b8c218 Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Thu, 8 Dec 2022 20:11:31 +0100
Subject: [PATCH 3/6] #38 Fixing variable types

---
 .gitignore                               |   1 +
 src/AbstractPackageReader.php            |  16 ++--
 src/Importer.php                         | 108 +++++++++++------------
 test/Worker/MetadataImportWorkerTest.php |   1 +
 4 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2cb9974..af852d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ test/config.ini
 
 # Other
 **/.DS_Store
+/.phpunit.result.cache
diff --git a/src/AbstractPackageReader.php b/src/AbstractPackageReader.php
index 7a57fc0..98ddd30 100644
--- a/src/AbstractPackageReader.php
+++ b/src/AbstractPackageReader.php
@@ -27,11 +27,6 @@
  *
  * @copyright   Copyright (c) 2016, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
- *
- * Reads an OPUS import package containing one or more documents and imports
- * the documents.
- *
- * Currently ZIP and TAR files are supported by extending classes.
  */
 
 namespace Opus\Import;
@@ -43,6 +38,7 @@
 use Opus\Import\Sword\ImportCollection;
 use Opus\Import\Xml\MetadataImportInvalidXmlException;
 use Opus\Import\Xml\MetadataImportSkippedDocumentsException;
+use Zend_Exception;
 
 use function file_get_contents;
 use function is_dir;
@@ -53,19 +49,25 @@
 
 use const DIRECTORY_SEPARATOR;
 
+/**
+ * Reads an OPUS import package containing one or more documents and imports
+ * the documents.
+ *
+ * Currently ZIP and TAR files are supported by extending classes.
+ */
 abstract class AbstractPackageReader
 {
     const METADATA_FILENAME = 'opus.xml';
 
     const EXTRACTION_DIR_NAME = 'extracted';
 
-    /** @var array */
+    /** @var AdditionalEnrichments */
     private $additionalEnrichments;
 
     /**
      * Sets additional enrichments that will be added to every imported document.
      *
-     * @param array $additionalEnrichments
+     * @param AdditionalEnrichments $additionalEnrichments
      */
     public function setAdditionalEnrichments($additionalEnrichments)
     {
diff --git a/src/Importer.php b/src/Importer.php
index eada5da..385f2e8 100644
--- a/src/Importer.php
+++ b/src/Importer.php
@@ -31,6 +31,7 @@
 
 namespace Opus\Import;
 
+use DOMDocument;
 use DOMElement;
 use DOMNamedNodeMap;
 use DOMNode;
@@ -49,6 +50,7 @@
 use Opus\Common\Model\ModelException;
 use Opus\Common\Model\NotFoundException;
 use Opus\Common\Person;
+use Opus\Common\PersonInterface;
 use Opus\Common\Security\SecurityException;
 use Opus\Common\Series;
 use Opus\Common\Subject;
@@ -76,8 +78,6 @@
 use const PATHINFO_EXTENSION;
 
 /**
- * @package Opus\Import
- *
  * TODO behavior of this importer changes depending swordContext - It means special handling code in various places.
  *      With every new context, every new use case this code will get more complicated. It would be better if the
  *      different context would be implemented in separate classes that extend a base class providing common
@@ -88,13 +88,13 @@
  */
 class Importer
 {
-    /** @var string|null */
+    /** @var Zend_Log|null */
     private $logfile;
 
     /** @var Zend_Log|null */
     private $logger;
 
-    /** @var string */
+    /** @var DOMDocument */
     private $xml;
 
     /** @var string */
@@ -136,7 +136,7 @@ class Importer
      *
      * Contains the document object if the import was successful.
      *
-     * @var Document
+     * @var DocumentInterface
      */
     private $document;
 
@@ -189,7 +189,7 @@ public function setImportDir($imporDir)
     }
 
     /**
-     * @param array|null $additionalEnrichments
+     * @param AdditionalEnrichments $additionalEnrichments
      */
     public function setAdditionalEnrichments($additionalEnrichments)
     {
@@ -406,7 +406,7 @@ public function keepFieldsOnUpdate($fields)
     }
 
     /**
-     * @param Document $doc
+     * @param DocumentInterface $doc
      */
     private function resetDocument($doc)
     {
@@ -481,8 +481,8 @@ private function processAttributes($attributes, $doc)
     }
 
     /**
-     * @param DOMNodeList $elements
-     * @param Document    $doc
+     * @param DOMNodeList       $elements
+     * @param DocumentInterface $doc
      * @return bool returns true if the import XML definition of the
      *                 currently processed document contains the first level
      *                 element files
@@ -549,8 +549,8 @@ private function processElements($elements, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleTitleMain($node, $doc)
     {
@@ -564,8 +564,8 @@ private function handleTitleMain($node, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleTitles($node, $doc)
     {
@@ -580,8 +580,8 @@ private function handleTitles($node, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleAbstracts($node, $doc)
     {
@@ -595,8 +595,8 @@ private function handleAbstracts($node, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handlePersons($node, $doc)
     {
@@ -639,8 +639,8 @@ private function handlePersons($node, $doc)
     }
 
     /**
-     * @param DOMNodeList $identifiers
-     * @param Person      $person
+     * @param DOMNode         $identifiers
+     * @param PersonInterface $person
      */
     private function handlePersonIdentifiers($identifiers, $person)
     {
@@ -665,8 +665,8 @@ private function handlePersonIdentifiers($identifiers, $person)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleKeywords($node, $doc)
     {
@@ -682,8 +682,8 @@ private function handleKeywords($node, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleDnbInstitutions($node, $doc)
     {
@@ -716,23 +716,23 @@ private function handleDnbInstitutions($node, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleIdentifiers($node, $doc)
     {
         foreach ($node->childNodes as $childNode) {
             if ($childNode instanceof DOMElement) {
-                $i = $doc->addIdentifier();
-                $i->setValue(trim($childNode->textContent));
-                $i->setType($childNode->getAttribute('type'));
+                $identifier = $doc->addIdentifier();
+                $identifier->setValue(trim($childNode->textContent));
+                $identifier->setType($childNode->getAttribute('type'));
             }
         }
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleNotes($node, $doc)
     {
@@ -746,8 +746,8 @@ private function handleNotes($node, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleCollections($node, $doc)
     {
@@ -771,8 +771,8 @@ private function handleCollections($node, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleSeries($node, $doc)
     {
@@ -799,8 +799,8 @@ private function handleSeries($node, $doc)
     /**
      * Processes the enrichments in the document xml.
      *
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      *
      * TODO add unit test - a bug that prevented the NotFoundException was not automatically detected
      */
@@ -846,8 +846,8 @@ private function addEnrichment($doc, $key, $value)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleLicences($node, $doc)
     {
@@ -870,8 +870,8 @@ private function handleLicences($node, $doc)
     }
 
     /**
-     * @param DOMNode  $node
-     * @param Document $doc
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
      */
     private function handleDates($node, $doc)
     {
@@ -904,9 +904,9 @@ private function handleDates($node, $doc)
     /**
      * Handling of files was introduced with OPUS 4.6.
      *
-     * @param DOMNode  $node
-     * @param Document $doc
-     * @param string   $baseDir
+     * @param DOMNode           $node
+     * @param DocumentInterface $doc
+     * @param string            $baseDir
      */
     private function handleFiles($node, $doc, $baseDir)
     {
@@ -927,11 +927,11 @@ private function handleFiles($node, $doc, $baseDir)
     /**
      * Add a single file to the given Document.
      *
-     * @param Document         $doc the given document
-     * @param string           $name Name of the file that should be imported (relative to baseDir)
-     * @param string           $baseDir (optional) path of the file that should be imported (relative to the import directory)
-     * @param string           $path (optional) path (and name) of the file that should be imported (relative to baseDir)
-     * @param null|DOMNodeList $childNode (optional) additional metadata of the file (taken from import XML)
+     * @param DocumentInterface $doc the given document
+     * @param string            $name Name of the file that should be imported (relative to baseDir)
+     * @param string            $baseDir (optional) path of the file that should be imported (relative to the import directory)
+     * @param string            $path (optional) path (and name) of the file that should be imported (relative to baseDir)
+     * @param null|DOMNode      $childNode (optional) additional metadata of the file (taken from import XML)
      */
     private function addSingleFile($doc, $name, $baseDir = '', $path = '', $childNode = null)
     {
@@ -1011,8 +1011,8 @@ private function validMimeType($fullPath)
      * Wurde im Import-XML keine Prüfsumme für die Datei angegeben, so liefert
      * die Methode ebenfalls true zurück.
      *
-     * @param DOMElement $childNode
-     * @param string     $fullPath
+     * @param DOMNode $childNode
+     * @param string  $fullPath
      * @return bool
      */
     private function checksumValidation($childNode, $fullPath)
@@ -1030,8 +1030,8 @@ private function checksumValidation($childNode, $fullPath)
     }
 
     /**
-     * @param DOMElement $node
-     * @param File       $file
+     * @param DOMNode $node
+     * @param File    $file
      */
     private function handleFileAttributes($node, $file)
     {
@@ -1069,7 +1069,7 @@ private function handleFileAttributes($node, $file)
      * Add all files in the root level of the import package to the given
      * document.
      *
-     * @param Document $doc document
+     * @param DocumentInterface $doc document
      */
     private function importFilesDirectly($doc)
     {
@@ -1082,7 +1082,7 @@ private function importFilesDirectly($doc)
     /**
      * Returns the imported document.
      *
-     * @return Document
+     * @return DocumentInterface
      */
     public function getDocument()
     {
diff --git a/test/Worker/MetadataImportWorkerTest.php b/test/Worker/MetadataImportWorkerTest.php
index 1dc8e75..d4f0c81 100644
--- a/test/Worker/MetadataImportWorkerTest.php
+++ b/test/Worker/MetadataImportWorkerTest.php
@@ -85,6 +85,7 @@ public function testWrongLabelException()
     public function testMissingDataException()
     {
         $this->job->setLabel('opus-metadata-import');
+        $this->job->setData([]);
         $this->expectException(InvalidJobException::class);
         $this->worker->work($this->job);
     }

From a8f17eed1fd22cd3e2c5cbe023f4b26a86092841 Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Fri, 3 Feb 2023 17:54:53 +0100
Subject: [PATCH 4/6] #38 Fixing if condition

---
 src/Importer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Importer.php b/src/Importer.php
index 385f2e8..6fafe3d 100644
--- a/src/Importer.php
+++ b/src/Importer.php
@@ -697,7 +697,7 @@ private function handleDnbInstitutions($node, $doc)
 
                     // check if dnbInstitute supports given role
                     $method = 'getIs' . ucfirst($instRole);
-                    if ($inst->$method() === '1') {
+                    if ($inst->$method()) {
                         $method = 'addThesis' . ucfirst($instRole);
                         $doc->$method($inst);
                     } else {

From 71b8e0edf3529013c22c4b9e0e7cfc0e249c742f Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Fri, 3 Feb 2023 17:55:15 +0100
Subject: [PATCH 5/6] #38 Update dependencies for PHP 8.1

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 2139a54..05704c5 100644
--- a/composer.json
+++ b/composer.json
@@ -13,14 +13,14 @@
     "ext-fileinfo": "*",
     "ext-libxml": "*",
     "ext-zip": "*",
-    "opus4-repo/opus4-common": "dev-4.7.2-zf1f",
-    "opus4-repo/opus4-job": "dev-4.7.2-zf1f"
+    "opus4-repo/opus4-common": "4.7.2.x-dev",
+    "opus4-repo/opus4-job": "4.7.2.x-dev"
   },
   "require-dev": {
     "phpunit/phpunit": "<9",
     "opus4-repo/codesniffer": "dev-laminas",
     "phpmetrics/phpmetrics": "2.7.4",
-    "opus4-repo/framework": "dev-4.7.2-zf1f"
+    "opus4-repo/framework": "4.7.2.x-dev"
   },
   "config": {
     "allow-plugins": {

From a620a21ff24a75b76bd5088f38a04a656c5c1e12 Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Fri, 3 Feb 2023 17:57:25 +0100
Subject: [PATCH 6/6] #38 Fixing opus4-job dependency

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 05704c5..21313ec 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "ext-libxml": "*",
     "ext-zip": "*",
     "opus4-repo/opus4-common": "4.7.2.x-dev",
-    "opus4-repo/opus4-job": "4.7.2.x-dev"
+    "opus4-repo/opus4-job": "dev-main"
   },
   "require-dev": {
     "phpunit/phpunit": "<9",