diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 76cd015..25a142f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -12,18 +12,30 @@ 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@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
 
-      - name: Full Analysis with Coverage
-        run: php composer.phar check
\ No newline at end of file
+      - name: Tests
+        run: php composer.phar test
+
+      - name: Coding Standard Check
+        run: php composer.phar cs-check
diff --git a/.gitignore b/.gitignore
index 68bbad2..ec044e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ build
 
 # Other
 **/.DS_Store
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
index 5435488..ca66793 100644
--- a/composer.json
+++ b/composer.json
@@ -9,12 +9,14 @@
   ],
   "homepage": "http://www.opus-repository.org",
   "require": {
-    "zendframework/zendframework1": "1.12.*"
+    "opus4/zf1-future": "1.21.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "6.*",
-    "laminas/laminas-coding-standard": "<2.3"
+    "phpunit/phpunit": "<9",
+    "opus4-repo/codesniffer": "dev-laminas"
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "autoload": {
     "psr-4": {
       "Opus\\Doi\\": "src/"
@@ -40,4 +42,4 @@
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
   }
-}
\ No newline at end of file
+}
diff --git a/phpcs.xml b/phpcs.xml
index 12eccb8..62cf58e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<ruleset name="Zend Framework coding standard">
-    <rule ref="./vendor/laminas/laminas-coding-standard/src/LaminasCodingStandard/ruleset.xml"/>
+<ruleset name="OPUS 4 Coding Standard">
+    <rule ref="./vendor/opus4-repo/codesniffer/src/ruleset.xml"/>
     <file>src</file>
     <file>test</file>
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/src/Client.php b/src/Client.php
index 87c0c2f..2296d0b 100644
--- a/src/Client.php
+++ b/src/Client.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) 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
  */
 
@@ -39,12 +39,16 @@
 
 class Client
 {
+    /** @var string */
     private $username;
 
+    /** @var string */
     private $password;
 
+    /** @var string */
     private $serviceUrl;
 
+    /** @var Zend_Log */
     private $log;
 
     /**
diff --git a/src/ClientException.php b/src/ClientException.php
index 54a202e..24399a1 100644
--- a/src/ClientException.php
+++ b/src/ClientException.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) 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
  */
 
diff --git a/test/ClientTest.php b/test/ClientTest.php
index 5f677c1..2e173e7 100644
--- a/test/ClientTest.php
+++ b/test/ClientTest.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) 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
  */