From a3e0b2ca6630abf8e90e6c0d307e97685f3a6a7d Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 11:30:54 +0200
Subject: [PATCH 01/18] feat: bump minimum PHP version, update phpunit

* update phpunit.xml schema
* fix deprecated/removed/changed stuff in PHPUnit 9

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 .gitignore                                    |  1 +
 .travis.yml                                   | 29 +------
 composer.json                                 |  8 +-
 phpunit.xml.dist                              | 18 ++--
 test/AbstractContainerTest.php                | 14 ++--
 test/Config/SessionConfigTest.php             | 20 ++---
 test/Config/StandardConfigTest.php            | 18 ++--
 test/ContainerTest.php                        | 18 ++--
 test/ReflectionUtil.php                       | 21 +++++
 test/SaveHandler/CacheTest.php                |  5 +-
 .../SaveHandler/DbTableGatewayOptionsTest.php | 60 ++++++-------
 test/SaveHandler/DbTableGatewayTest.php       | 20 +++--
 test/SaveHandler/MongoDBOptionsTest.php       | 84 +++++++++----------
 test/SaveHandler/MongoDBTest.php              | 20 ++---
 .../ContainerAbstractServiceFactoryTest.php   | 28 ++++---
 test/Service/SessionConfigFactoryTest.php     | 14 ++--
 test/Service/SessionManagerFactoryTest.php    | 40 +++++----
 test/Service/StorageFactoryTest.php           | 14 ++--
 test/SessionArrayStorageTest.php              |  6 +-
 test/SessionManagerTest.php                   | 31 +++++--
 test/SessionStorageTest.php                   |  6 +-
 test/StorageTest.php                          |  4 +-
 test/autoload.php                             | 11 ---
 23 files changed, 262 insertions(+), 228 deletions(-)
 create mode 100644 test/ReflectionUtil.php
 delete mode 100644 test/autoload.php

diff --git a/.gitignore b/.gitignore
index 87904ecb..0b92d9cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /laminas-mkdoc-theme/
 /phpunit.xml
 /vendor/
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
index d1f2636a..32db6971 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,39 +19,18 @@ services:
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
-      env:
-        - DEPS=lowest
-    - php: 5.6
-      env:
-        - DEPS=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
+    - php: 7.3
       env:
         - DEPS=latest
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPS=lowest
-    - php: 7.1
+    - php: 7.4
       env:
         - DEPS=latest
         - CS_CHECK=true
         - TEST_COVERAGE=true
-    - php: 7.2
-      env:
-        - DEPS=lowest
-    - php: 7.2
-      env:
-        - DEPS=latest
-    - php: 7.3
-      env:
-        - DEPS=lowest
-    - php: 7.3
-      env:
-        - DEPS=latest
-    - php: 7.4
+    - php: 8.0
       env:
         - DEPS=latest
 
diff --git a/composer.json b/composer.json
index 0798fb17..26efb4bc 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.3 ||^8.0",
         "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
         "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-zendframework-bridge": "^1.0"
@@ -40,7 +40,8 @@
         "laminas/laminas-validator": "^2.6",
         "mongodb/mongodb": "^1.0.1",
         "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.3"
     },
     "suggest": {
         "laminas/laminas-cache": "Laminas\\Cache component",
@@ -56,9 +57,6 @@
         }
     },
     "autoload-dev": {
-        "files": [
-            "test/autoload.php"
-        ],
         "psr-4": {
             "LaminasTest\\Session\\": "test/"
         }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7f93db01..7c0f0982 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,18 +15,18 @@
         </exclude>
     </groups>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage>
+        <include>
             <directory suffix=".php">./src</directory>
-            <exclude>
-                <file>src/compatibility/autoload.php</file>
-                <file>src/Validator/AbstractValidatorChainEM2.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
+        </include>
+        <exclude>
+            <file>src/compatibility/autoload.php</file>
+            <file>src/Validator/AbstractValidatorChainEM2.php</file>
+        </exclude>
+    </coverage>
 
     <php>
-        <ini name="date.timezone" value="UTC"/>
+        <ini name="date.timezone" value="UTC" />
 
         <!-- OB_ENABLED should be enabled for some tests to check if all
              functionality works as expected. Such tests include those for
diff --git a/test/AbstractContainerTest.php b/test/AbstractContainerTest.php
index 01f08205..2b739b4a 100644
--- a/test/AbstractContainerTest.php
+++ b/test/AbstractContainerTest.php
@@ -36,20 +36,22 @@ class AbstractContainerTest extends TestCase
      */
     protected $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $_SESSION = [];
         Container::setDefaultManager(null);
 
-        $config = new StandardConfig([
-            'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
-        ]);
+        $config = new StandardConfig(
+            [
+                'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
+            ]
+        );
 
-        $this->manager = $manager = new TestAsset\TestManager($config);
+        $this->manager   = $manager = new TestAsset\TestManager($config);
         $this->container = new TestContainer('Default', $manager);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $_SESSION = [];
         Container::setDefaultManager(null);
diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php
index 3dad0778..da920d2c 100644
--- a/test/Config/SessionConfigTest.php
+++ b/test/Config/SessionConfigTest.php
@@ -31,12 +31,12 @@ class SessionConfigTest extends TestCase
      */
     protected $config;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->config = new SessionConfig;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->config = null;
     }
@@ -544,7 +544,7 @@ public function testEntropyFileAltersIniSetting()
      */
     public function testSetEntropyFileError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->getEntropyFile();
     }
 
@@ -553,7 +553,7 @@ public function testSetEntropyFileError()
      */
     public function testGetEntropyFileError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->setEntropyFile(__FILE__);
     }
 
@@ -607,7 +607,7 @@ public function testSettingInvalidEntropyLengthRaisesException2()
      */
     public function testGetEntropyLengthError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->getEntropyLength();
     }
 
@@ -616,7 +616,7 @@ public function testGetEntropyLengthError()
      */
     public function testSetEntropyLengthError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->setEntropyLength(0);
     }
 
@@ -768,7 +768,7 @@ public function testSettingInvalidHashFunctionRaisesException()
      */
     public function testGetHashFunctionError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->getHashFunction();
     }
 
@@ -777,7 +777,7 @@ public function testGetHashFunctionError()
      */
     public function testSetHashFunctionError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->setHashFunction('foobar_bogus');
     }
 
@@ -834,7 +834,7 @@ public function testSettingInvalidHashBitsPerCharacterRaisesException()
      */
     public function testGetHashBitsPerCharacterError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->getHashBitsPerCharacter();
     }
 
@@ -843,7 +843,7 @@ public function testGetHashBitsPerCharacterError()
      */
     public function testSetHashBitsPerCharacterError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->setHashBitsPerCharacter(5);
     }
 
diff --git a/test/Config/StandardConfigTest.php b/test/Config/StandardConfigTest.php
index 6600b5e3..8e9f032a 100644
--- a/test/Config/StandardConfigTest.php
+++ b/test/Config/StandardConfigTest.php
@@ -21,7 +21,7 @@ class StandardConfigTest extends TestCase
      */
     protected $config;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->config = new StandardConfig;
     }
@@ -303,7 +303,7 @@ public function testEntropyFileIsMutable()
      */
     public function testSetEntropyFileError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->getEntropyFile();
     }
 
@@ -312,7 +312,7 @@ public function testSetEntropyFileError()
      */
     public function testGetEntropyFileError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->setEntropyFile(__FILE__);
     }
 
@@ -365,7 +365,7 @@ public function testSettingInvalidEntropyLengthRaisesException2()
      */
     public function testGetEntropyLengthError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->getEntropyLength();
     }
 
@@ -374,7 +374,7 @@ public function testGetEntropyLengthError()
      */
     public function testSetEntropyLengthError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->setEntropyLength(0);
     }
 
@@ -459,7 +459,7 @@ public function testHashFunctionIsMutable($hashFunction)
      */
     public function testGetHashFunctionError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->getHashFunction();
     }
 
@@ -468,7 +468,7 @@ public function testGetHashFunctionError()
      */
     public function testSetHashFunctionError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->setHashFunction('foobar_bogus');
     }
 
@@ -512,7 +512,7 @@ public function testSettingInvalidHashBitsPerCharacterRaisesException()
      */
     public function testGetHashBitsPerCharacterError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->getHashBitsPerCharacter();
     }
 
@@ -521,7 +521,7 @@ public function testGetHashBitsPerCharacterError()
      */
     public function testSetHashBitsPerCharacterError()
     {
-        $this->expectException('PHPUnit\Framework\Error\Deprecated');
+        $this->expectDeprecation();
         $this->config->setHashBitsPerCharacter(5);
     }
 
diff --git a/test/ContainerTest.php b/test/ContainerTest.php
index 78fab222..86a1b653 100644
--- a/test/ContainerTest.php
+++ b/test/ContainerTest.php
@@ -35,20 +35,22 @@ class ContainerTest extends TestCase
      */
     protected $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $_SESSION = [];
         Container::setDefaultManager(null);
 
-        $config = new StandardConfig([
-            'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
-        ]);
+        $config = new StandardConfig(
+            [
+                'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
+            ]
+        );
 
-        $this->manager = $manager = new TestAsset\TestManager($config);
+        $this->manager   = $manager = new TestAsset\TestManager($config);
         $this->container = new Container('Default', $manager);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $_SESSION = [];
         Container::setDefaultManager(null);
@@ -105,7 +107,7 @@ public function testPassingInvalidNameToConstructorRaisesException()
                 $container = new Container($try);
                 $this->fail('Invalid container name should raise exception');
             } catch (\Laminas\Session\Exception\InvalidArgumentException $e) {
-                $this->assertContains('invalid', $e->getMessage());
+                $this->assertStringContainsString('invalid', $e->getMessage());
             }
         }
     }
@@ -560,7 +562,7 @@ public function testGetArrayCopyAfterExchangeArray()
 
         $contents = $this->container->getArrayCopy();
 
-        $this->assertInternalType('array', $contents);
+        $this->assertIsArray($contents);
         $this->assertArrayHasKey('foo', $contents, "'getArrayCopy' doesn't return exchanged array");
     }
 }
diff --git a/test/ReflectionUtil.php b/test/ReflectionUtil.php
new file mode 100644
index 00000000..7fb704f6
--- /dev/null
+++ b/test/ReflectionUtil.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Session;
+
+final class ReflectionUtil
+{
+    /**
+     * @return mixed
+     */
+    public static function getProperty(object $object, string $property)
+    {
+        $reflectionObject   = new \ReflectionObject($object);
+        $reflectionProperty = $reflectionObject->getProperty($property);
+        $reflectionProperty->setAccessible(true);
+        $value = $reflectionProperty->getValue($object);
+        $reflectionProperty->setAccessible(false);
+        return $value;
+    }
+}
diff --git a/test/SaveHandler/CacheTest.php b/test/SaveHandler/CacheTest.php
index 7b4b30dc..1d9196c0 100644
--- a/test/SaveHandler/CacheTest.php
+++ b/test/SaveHandler/CacheTest.php
@@ -11,6 +11,7 @@
 use Laminas\Session\SaveHandler\Cache;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Unit testing for DbTable include all tests for
@@ -20,6 +21,8 @@
  */
 class CacheTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var CacheAdapter
      */
@@ -38,7 +41,7 @@ class CacheTest extends TestCase
      */
     protected $usedSaveHandlers = [];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->testArray = ['foo' => 'bar', 'bar' => ['foo' => 'bar']];
     }
diff --git a/test/SaveHandler/DbTableGatewayOptionsTest.php b/test/SaveHandler/DbTableGatewayOptionsTest.php
index 0ec9c3fc..5b00e044 100644
--- a/test/SaveHandler/DbTableGatewayOptionsTest.php
+++ b/test/SaveHandler/DbTableGatewayOptionsTest.php
@@ -61,53 +61,53 @@ public function testSetters()
         $this->assertEquals('testData', $options->getDataColumn());
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidIdColumn()
     {
-        $options = new DbTableGatewayOptions([
-            'idColumn' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new DbTableGatewayOptions(
+            [
+                'idColumn' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidNameColumn()
     {
-        $options = new DbTableGatewayOptions([
-            'nameColumn' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new DbTableGatewayOptions(
+            [
+                'nameColumn' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidModifiedColumn()
     {
-        $options = new DbTableGatewayOptions([
-            'modifiedColumn' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new DbTableGatewayOptions(
+            [
+                'modifiedColumn' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidLifetimeColumn()
     {
-        $options = new DbTableGatewayOptions([
-            'lifetimeColumn' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new DbTableGatewayOptions(
+            [
+                'lifetimeColumn' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidDataColumn()
     {
-        $options = new DbTableGatewayOptions([
-            'dataColumn' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new DbTableGatewayOptions(
+            [
+                'dataColumn' => null,
+            ]
+        );
     }
 }
diff --git a/test/SaveHandler/DbTableGatewayTest.php b/test/SaveHandler/DbTableGatewayTest.php
index 9c8ca70a..fa06058b 100644
--- a/test/SaveHandler/DbTableGatewayTest.php
+++ b/test/SaveHandler/DbTableGatewayTest.php
@@ -63,17 +63,19 @@ abstract protected function getAdapter();
      *
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->adapter = $this->getAdapter();
 
-        $this->options = new DbTableGatewayOptions([
-            'nameColumn' => 'name',
-            'idColumn'   => 'id',
-            'dataColumn' => 'data',
-            'modifiedColumn' => 'modified',
-            'lifetimeColumn' => 'lifetime',
-        ]);
+        $this->options = new DbTableGatewayOptions(
+            [
+                'nameColumn'     => 'name',
+                'idColumn'       => 'id',
+                'dataColumn'     => 'data',
+                'modifiedColumn' => 'modified',
+                'lifetimeColumn' => 'lifetime',
+            ]
+        );
 
         $this->setupDb($this->options);
         $this->testArray = ['foo' => 'bar', 'bar' => ['foo' => 'bar']];
@@ -84,7 +86,7 @@ protected function setUp()
      *
      * @return void
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->adapter) {
             $this->dropTable();
diff --git a/test/SaveHandler/MongoDBOptionsTest.php b/test/SaveHandler/MongoDBOptionsTest.php
index 5dc00086..186cce6b 100644
--- a/test/SaveHandler/MongoDBOptionsTest.php
+++ b/test/SaveHandler/MongoDBOptionsTest.php
@@ -71,73 +71,73 @@ public function testSetters()
         $this->assertEquals('testModified', $options->getModifiedField());
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidDatabase()
     {
-        $options = new MongoDBOptions([
-            'database' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new MongoDBOptions(
+            [
+                'database' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidCollection()
     {
-        $options = new MongoDBOptions([
-            'collection' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new MongoDBOptions(
+            [
+                'collection' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidSaveOptions()
     {
-        $options = new MongoDBOptions([
-            'saveOptions' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new MongoDBOptions(
+            [
+                'saveOptions' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidNameField()
     {
-        $options = new MongoDBOptions([
-            'nameField' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new MongoDBOptions(
+            [
+                'nameField' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidModifiedField()
     {
-        $options = new MongoDBOptions([
-            'modifiedField' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new MongoDBOptions(
+            [
+                'modifiedField' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidLifetimeField()
     {
-        $options = new MongoDBOptions([
-            'lifetimeField' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new MongoDBOptions(
+            [
+                'lifetimeField' => null,
+            ]
+        );
     }
 
-    /**
-     * @expectedException Laminas\Session\Exception\InvalidArgumentException
-     */
     public function testInvalidDataField()
     {
-        $options = new MongoDBOptions([
-            'dataField' => null,
-        ]);
+        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $options = new MongoDBOptions(
+            [
+                'dataField' => null,
+            ]
+        );
     }
 }
diff --git a/test/SaveHandler/MongoDBTest.php b/test/SaveHandler/MongoDBTest.php
index da1d7581..96396d68 100644
--- a/test/SaveHandler/MongoDBTest.php
+++ b/test/SaveHandler/MongoDBTest.php
@@ -42,14 +42,16 @@ class MongoDBTest extends TestCase
      *
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->options = new MongoDBOptions([
-            'database' => 'laminas_tests',
-            'collection' => 'sessions',
-        ]);
+        $this->options = new MongoDBOptions(
+            [
+                'database'   => 'laminas_tests',
+                'collection' => 'sessions',
+            ]
+        );
 
-        $this->mongoClient = new MongoClient();
+        $this->mongoClient     = new MongoClient();
         $this->mongoCollection = $this->mongoClient->selectCollection(
             $this->options->getDatabase(),
             $this->options->getCollection()
@@ -61,7 +63,7 @@ protected function setUp()
      *
      * @return void
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->mongoCollection) {
             $this->mongoCollection->drop();
@@ -154,11 +156,9 @@ public function testGarbageCollectionMaxlifetimeIsInSeconds()
         $this->assertNotEmpty($saveHandler->read(456));
     }
 
-    /**
-     * @expectedException \MongoDB\Driver\Exception\RuntimeException
-     */
     public function testWriteExceptionEdgeCaseForChangedSessionName()
     {
+        $this->expectException(\MongoDB\Driver\Exception\RuntimeException::class);
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
         $this->assertTrue($saveHandler->open('savepath', 'sessionname'));
 
diff --git a/test/Service/ContainerAbstractServiceFactoryTest.php b/test/Service/ContainerAbstractServiceFactoryTest.php
index 793a2b6b..87287b8d 100644
--- a/test/Service/ContainerAbstractServiceFactoryTest.php
+++ b/test/Service/ContainerAbstractServiceFactoryTest.php
@@ -33,20 +33,22 @@ class ContainerAbstractServiceFactoryTest extends TestCase
         ],
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $config = new Config([
-            'services' => [
-                'config' => $this->config,
-                StorageInterface::class => new ArrayStorage(),
-            ],
-            'factories' => [
-                ManagerInterface::class => SessionManagerFactory::class,
-            ],
-            'abstract_factories' => [
-                ContainerAbstractServiceFactory::class,
-            ],
-        ]);
+        $config         = new Config(
+            [
+                'services'           => [
+                    'config'                => $this->config,
+                    StorageInterface::class => new ArrayStorage(),
+                ],
+                'factories'          => [
+                    ManagerInterface::class => SessionManagerFactory::class,
+                ],
+                'abstract_factories' => [
+                    ContainerAbstractServiceFactory::class,
+                ],
+            ]
+        );
         $this->services = new ServiceManager();
         $config->configureServiceManager($this->services);
     }
diff --git a/test/Service/SessionConfigFactoryTest.php b/test/Service/SessionConfigFactoryTest.php
index 111f259a..91567543 100644
--- a/test/Service/SessionConfigFactoryTest.php
+++ b/test/Service/SessionConfigFactoryTest.php
@@ -21,13 +21,15 @@
  */
 class SessionConfigFactoryTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
-        $config = new Config([
-            'factories' => [
-                ConfigInterface::class => SessionConfigFactory::class,
-            ],
-        ]);
+        $config         = new Config(
+            [
+                'factories' => [
+                    ConfigInterface::class => SessionConfigFactory::class,
+                ],
+            ]
+        );
         $this->services = new ServiceManager();
         $config->configureServiceManager($this->services);
     }
diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php
index c9093fa7..79c01542 100644
--- a/test/Service/SessionManagerFactoryTest.php
+++ b/test/Service/SessionManagerFactoryTest.php
@@ -21,6 +21,7 @@
 use Laminas\Session\Storage\ArrayStorage;
 use Laminas\Session\Storage\StorageInterface;
 use Laminas\Session\Validator;
+use LaminasTest\Session\ReflectionUtil;
 use LaminasTest\Session\TestAsset\TestManager;
 use LaminasTest\Session\TestAsset\TestSaveHandler;
 use PHPUnit\Framework\TestCase;
@@ -32,15 +33,20 @@ class SessionManagerFactoryTest extends TestCase
 {
     use EventListenerIntrospectionTrait;
 
-    protected function setUp()
+    /** @var ServiceManager */
+    private $services;
+
+    protected function setUp(): void
     {
-        $config = new Config([
-            'factories' => [
-                ManagerInterface::class => SessionManagerFactory::class,
-                TestManager::class => SessionManagerFactory::class,
-                TestSaveHandler::class => SessionManagerFactory::class,
-            ],
-        ]);
+        $config         = new Config(
+            [
+                'factories' => [
+                    ManagerInterface::class => SessionManagerFactory::class,
+                    TestManager::class      => SessionManagerFactory::class,
+                    TestSaveHandler::class  => SessionManagerFactory::class,
+                ],
+            ]
+        );
         $this->services = new ServiceManager();
         $config->configureServiceManager($this->services);
     }
@@ -201,16 +207,20 @@ public function testFactoryAllowsOverridingOptions()
     {
         $storage = new ArrayStorage();
         $this->services->setService(StorageInterface::class, $storage);
-        $this->services->setService('config', [
-            'session_manager' => [
-                'options' => [
-                    'attach_default_validators' => false,
+        $this->services->setService(
+            'config', [
+                'session_manager' => [
+                    'options' => [
+                        'attach_default_validators' => false,
+                    ],
                 ],
-            ],
-        ]);
+            ]
+        );
 
         $manager = $this->services->get(ManagerInterface::class);
-        $this->assertAttributeSame([], 'validators', $manager);
+
+        $containedValidators = ReflectionUtil::getProperty($manager, 'validators');
+        $this->assertSame([], $containedValidators);
     }
 
     public function testFactoryWillUseRequestedNameAsSessionManagerIfItImplementsManagerInterface()
diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php
index 05d8fe6f..5f15383a 100644
--- a/test/Service/StorageFactoryTest.php
+++ b/test/Service/StorageFactoryTest.php
@@ -23,13 +23,15 @@
  */
 class StorageFactoryTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
-        $config = new Config([
-            'factories' => [
-                StorageInterface::class => StorageFactory::class,
-            ],
-        ]);
+        $config         = new Config(
+            [
+                'factories' => [
+                    StorageInterface::class => StorageFactory::class,
+                ],
+            ]
+        );
         $this->services = new ServiceManager();
         $config->configureServiceManager($this->services);
     }
diff --git a/test/SessionArrayStorageTest.php b/test/SessionArrayStorageTest.php
index 5182b11b..64f0ccf5 100644
--- a/test/SessionArrayStorageTest.php
+++ b/test/SessionArrayStorageTest.php
@@ -18,13 +18,13 @@
  */
 class SessionArrayStorageTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
-        $_SESSION = [];
+        $_SESSION      = [];
         $this->storage = new SessionArrayStorage;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $_SESSION = [];
     }
diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
index 9c4a80db..c5006ba1 100644
--- a/test/SessionManagerTest.php
+++ b/test/SessionManagerTest.php
@@ -22,6 +22,7 @@
 use Laminas\Session\Validator\Id;
 use Laminas\Session\Validator\RemoteAddr;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @preserveGlobalState disabled
@@ -29,6 +30,8 @@
  */
 class SessionManagerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public $error;
 
     public $cookieDateFormat = 'D, d-M-y H:i:s e';
@@ -38,7 +41,7 @@ class SessionManagerTest extends TestCase
      */
     protected $manager;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->error = false;
     }
@@ -265,7 +268,7 @@ public function testStartConvertsSessionDataFromStorageInterfaceToArrayBeforeMer
 
         $this->manager->start();
 
-        $this->assertInternalType('array', $_SESSION);
+        $this->assertIsArray($_SESSION);
         $this->assertArrayHasKey($key, $_SESSION);
         $this->assertSame($data[$key], $_SESSION[$key]);
     }
@@ -283,7 +286,7 @@ public function testStartConvertsSessionDataFromTraversableToArrayBeforeMerging(
 
         $this->manager->start();
 
-        $this->assertInternalType('array', $_SESSION);
+        $this->assertIsArray($_SESSION);
         $this->assertArrayHasKey($key, $_SESSION);
         $this->assertSame($data[$key], $_SESSION[$key]);
     }
@@ -302,7 +305,7 @@ public function testStartWillNotBlockHeaderSentNotices()
         $this->assertTrue(headers_sent());
         $this->manager->start();
         restore_error_handler();
-        $this->assertInternalType('string', $this->error);
+        $this->assertIsString($this->error);
         $this->assertContains('already sent', $this->error);
     }
 
@@ -758,7 +761,7 @@ public function testValidatorChainSessionMetadataIsPreserved()
 
         $this->manager->start();
 
-        $this->assertInternalType('array', $_SESSION['__Laminas']['_VALID']);
+        $this->assertIsArray($_SESSION['__Laminas']['_VALID']);
         $this->assertArrayHasKey(RemoteAddr::class, $_SESSION['__Laminas']['_VALID']);
         $this->assertEquals('', $_SESSION['__Laminas']['_VALID'][RemoteAddr::class]);
     }
@@ -828,4 +831,22 @@ public function testIdValidationWillFailOnInvalidData()
         $this->expectExceptionMessage('Session validation failed');
         $this->manager->start();
     }
+
+    /**
+     * @param mixed $expected
+     */
+    private function assertAttributeEquals($expected, string $property, object $object): void
+    {
+        $value = ReflectionUtil::getProperty($object, $property);
+        self::assertEquals($expected, $value);
+    }
+
+    /**
+     * @param mixed $expected
+     */
+    private function assertAttributeContains($expected, string $property, object $object): void
+    {
+        $value = ReflectionUtil::getProperty($object, $property);
+        self::assertContains($expected, $value);
+    }
 }
diff --git a/test/SessionStorageTest.php b/test/SessionStorageTest.php
index 0bf5e45f..2ed667df 100644
--- a/test/SessionStorageTest.php
+++ b/test/SessionStorageTest.php
@@ -16,13 +16,13 @@
  */
 class SessionStorageTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
-        $_SESSION = [];
+        $_SESSION      = [];
         $this->storage = new SessionStorage;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $_SESSION = [];
     }
diff --git a/test/StorageTest.php b/test/StorageTest.php
index 6d5cab4a..d3261aaf 100644
--- a/test/StorageTest.php
+++ b/test/StorageTest.php
@@ -21,7 +21,7 @@ class StorageTest extends TestCase
      */
     protected $storage;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->storage = new ArrayStorage;
     }
@@ -120,7 +120,7 @@ public function testLockWithKeyShouldWriteToMetadata()
         $this->storage->foo = 'bar';
         $this->storage->lock('foo');
         $locks = $this->storage->getMetadata('_LOCKS');
-        $this->assertInternalType('array', $locks);
+        $this->assertIsArray($locks);
         $this->assertArrayHasKey('foo', $locks);
     }
 
diff --git a/test/autoload.php b/test/autoload.php
deleted file mode 100644
index ed3bd7ae..00000000
--- a/test/autoload.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * @see       https://github.com/laminas/laminas-session for the canonical source repository
- * @copyright https://github.com/laminas/laminas-session/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-session/blob/master/LICENSE.md New BSD License
- */
-
-if (! class_exists(PHPUnit\Framework\Error\Deprecated::class)) {
-    class_alias(PHPUnit_Framework_Error_Deprecated::class, PHPUnit\Framework\Error\Deprecated::class);
-}

From 70dc8fba0e4181662b72a96aec760ac53d0909cf Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 11:31:57 +0200
Subject: [PATCH 02/18] qa: tests: import classes

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/Config/SessionConfigTest.php             |  2 +-
 test/Config/StandardConfigTest.php            |  2 +-
 test/ContainerTest.php                        | 72 ++++++++++---------
 test/ReflectionUtil.php                       |  4 +-
 .../SaveHandler/DbTableGatewayOptionsTest.php | 25 +++----
 test/SaveHandler/DbTableGatewayTest.php       |  2 +-
 test/SaveHandler/MongoDBOptionsTest.php       | 39 +++++-----
 test/SaveHandler/MongoDBTest.php              |  3 +-
 test/Service/SessionManagerFactoryTest.php    |  3 +-
 test/SessionArrayStorageTest.php              |  2 +-
 test/SessionManagerTest.php                   |  2 +-
 test/SessionStorageTest.php                   |  2 +-
 test/StorageTest.php                          |  2 +-
 13 files changed, 84 insertions(+), 76 deletions(-)

diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php
index da920d2c..99cafe88 100644
--- a/test/Config/SessionConfigTest.php
+++ b/test/Config/SessionConfigTest.php
@@ -33,7 +33,7 @@ class SessionConfigTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->config = new SessionConfig;
+        $this->config = new SessionConfig();
     }
 
     protected function tearDown(): void
diff --git a/test/Config/StandardConfigTest.php b/test/Config/StandardConfigTest.php
index 8e9f032a..ee0c0927 100644
--- a/test/Config/StandardConfigTest.php
+++ b/test/Config/StandardConfigTest.php
@@ -23,7 +23,7 @@ class StandardConfigTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->config = new StandardConfig;
+        $this->config = new StandardConfig();
     }
 
     // session.save_path
diff --git a/test/ContainerTest.php b/test/ContainerTest.php
index 86a1b653..b1aaa6f3 100644
--- a/test/ContainerTest.php
+++ b/test/ContainerTest.php
@@ -8,8 +8,10 @@
 
 namespace LaminasTest\Session;
 
+use ArrayObject;
 use Laminas\Session\Config\StandardConfig;
 use Laminas\Session\Container;
+use Laminas\Session\Exception\InvalidArgumentException;
 use Laminas\Session\ManagerInterface as Manager;
 use PHPUnit\Framework\TestCase;
 
@@ -106,7 +108,7 @@ public function testPassingInvalidNameToConstructorRaisesException()
             try {
                 $container = new Container($try);
                 $this->fail('Invalid container name should raise exception');
-            } catch (\Laminas\Session\Exception\InvalidArgumentException $e) {
+            } catch (InvalidArgumentException $e) {
                 $this->assertStringContainsString('invalid', $e->getMessage());
             }
         }
@@ -138,14 +140,14 @@ public function testDefaultManagerIsAlwaysPopulated()
 
     public function testCanSetDefaultManager()
     {
-        $manager = new TestAsset\TestManager;
+        $manager = new TestAsset\TestManager();
         Container::setDefaultManager($manager);
         $this->assertSame($manager, Container::getDefaultManager());
     }
 
     public function testCanSetDefaultManagerToNull()
     {
-        $manager = new TestAsset\TestManager;
+        $manager = new TestAsset\TestManager();
         Container::setDefaultManager($manager);
         Container::setDefaultManager(null);
         $this->assertNotSame($manager, Container::getDefaultManager());
@@ -153,7 +155,7 @@ public function testCanSetDefaultManagerToNull()
 
     public function testDefaultManagerUsedWhenNoManagerProvided()
     {
-        $manager = Container::getDefaultManager();
+        $manager   = Container::getDefaultManager();
         $container = new Container();
         $this->assertSame($manager, $container->getManager());
     }
@@ -163,7 +165,7 @@ public function testContainerInstantiatesManagerWithDefaultsWhenNotInjected()
         $container = new Container();
         $manager   = $container->getManager();
         $this->assertInstanceOf('Laminas\Session\ManagerInterface', $manager);
-        $config  = $manager->getConfig();
+        $config = $manager->getConfig();
         $this->assertInstanceOf('Laminas\Session\Config\SessionConfig', $config);
         $storage = $manager->getStorage();
         $this->assertInstanceOf('Laminas\Session\Storage\SessionArrayStorage', $storage);
@@ -171,10 +173,10 @@ public function testContainerInstantiatesManagerWithDefaultsWhenNotInjected()
 
     public function testContainerAllowsInjectingManagerViaConstructor()
     {
-        $config = new StandardConfig([
+        $config    = new StandardConfig([
             'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
         ]);
-        $manager = new TestAsset\TestManager($config);
+        $manager   = new TestAsset\TestManager($config);
         $container = new Container('Foo', $manager);
         $this->assertSame($manager, $container->getManager());
     }
@@ -182,7 +184,7 @@ public function testContainerAllowsInjectingManagerViaConstructor()
     public function testContainerWritesToStorage()
     {
         $this->container->foo = 'bar';
-        $storage = $this->manager->getStorage();
+        $storage              = $this->manager->getStorage();
         $this->assertTrue(isset($storage['Default']));
         $this->assertTrue(isset($storage['Default']['foo']));
         $this->assertEquals('bar', $storage['Default']['foo']);
@@ -195,7 +197,7 @@ public function testSettingExpirationSecondsUpdatesStorageMetadataForFullContain
     {
         $currentTimestamp = time();
         $this->container->setExpirationSeconds(3600);
-        $storage = $this->manager->getStorage();
+        $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
         $this->assertArrayHasKey('EXPIRE', $metadata);
         $this->assertEquals($currentTimestamp + 3600, $metadata['EXPIRE']);
@@ -204,9 +206,9 @@ public function testSettingExpirationSecondsUpdatesStorageMetadataForFullContain
     public function testSettingExpirationSecondsForIndividualKeyUpdatesStorageMetadataForThatKey()
     {
         $this->container->foo = 'bar';
-        $currentTimestamp = time();
+        $currentTimestamp     = time();
         $this->container->setExpirationSeconds(3600, 'foo');
-        $storage = $this->manager->getStorage();
+        $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
         $this->assertArrayHasKey('EXPIRE_KEYS', $metadata);
         $this->assertArrayHasKey('foo', $metadata['EXPIRE_KEYS']);
@@ -223,7 +225,7 @@ public function testMultipleCallsToExpirationSecondsAggregates()
         $this->container->setExpirationSeconds(3600);
         $this->container->setExpirationSeconds(1800, 'foo');
         $this->container->setExpirationSeconds(900, ['baz', 'bat']);
-        $storage = $this->manager->getStorage();
+        $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
         $this->assertEquals($currentTimestamp + 1800, $metadata['EXPIRE_KEYS']['foo']);
         $this->assertEquals($currentTimestamp + 900, $metadata['EXPIRE_KEYS']['baz']);
@@ -247,7 +249,7 @@ public function testSettingExpirationSecondsUsesCurrentTime()
     public function testPassingUnsetKeyToSetExpirationSecondsDoesNothing()
     {
         $this->container->setExpirationSeconds(3600, 'foo');
-        $storage = $this->manager->getStorage();
+        $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
         $this->assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
     }
@@ -255,7 +257,7 @@ public function testPassingUnsetKeyToSetExpirationSecondsDoesNothing()
     public function testPassingUnsetKeyInArrayToSetExpirationSecondsDoesNothing()
     {
         $this->container->setExpirationSeconds(3600, ['foo']);
-        $storage = $this->manager->getStorage();
+        $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
         $this->assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
     }
@@ -263,7 +265,7 @@ public function testPassingUnsetKeyInArrayToSetExpirationSecondsDoesNothing()
     public function testGetKeyWithContainerExpirationInPastResetsToNull()
     {
         $this->container->foo = 'bar';
-        $storage = $this->manager->getStorage();
+        $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE' => $_SERVER['REQUEST_TIME'] - 18600]);
         $this->assertNull($this->container->foo);
     }
@@ -272,7 +274,7 @@ public function testGetKeyWithExpirationInPastResetsToNull()
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
-        $storage = $this->manager->getStorage();
+        $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE_KEYS' => ['foo' => $_SERVER['REQUEST_TIME'] - 18600]]);
         $this->assertNull($this->container->foo);
         $this->assertEquals('baz', $this->container->bar);
@@ -281,7 +283,7 @@ public function testGetKeyWithExpirationInPastResetsToNull()
     public function testKeyExistsWithContainerExpirationInPastReturnsFalse()
     {
         $this->container->foo = 'bar';
-        $storage = $this->manager->getStorage();
+        $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE' => $_SERVER['REQUEST_TIME'] - 18600]);
         $this->assertFalse(isset($this->container->foo));
     }
@@ -290,7 +292,7 @@ public function testKeyExistsWithExpirationInPastReturnsFalse()
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
-        $storage = $this->manager->getStorage();
+        $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE_KEYS' => ['foo' => $_SERVER['REQUEST_TIME'] - 18600]]);
         $this->assertFalse(isset($this->container->foo));
         $this->assertTrue(isset($this->container->bar));
@@ -299,7 +301,7 @@ public function testKeyExistsWithExpirationInPastReturnsFalse()
     public function testKeyExistsWithContainerExpirationInPastWithSetExpirationSecondsReturnsFalse()
     {
         $this->container->foo = 'bar';
-        $storage = $this->manager->getStorage();
+        $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE' => $_SERVER['REQUEST_TIME'] - 18600]);
         $this->container->setExpirationSeconds(1);
         $this->assertFalse(isset($this->container->foo));
@@ -308,7 +310,7 @@ public function testKeyExistsWithContainerExpirationInPastWithSetExpirationSecon
     public function testSettingExpiredKeyOverwritesExpiryMetadataForThatKey()
     {
         $this->container->foo = 'bar';
-        $storage = $this->manager->getStorage();
+        $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE' => $_SERVER['REQUEST_TIME'] - 18600]);
         $this->container->foo = 'baz';
         $this->assertTrue(isset($this->container->foo));
@@ -320,7 +322,7 @@ public function testSettingExpiredKeyOverwritesExpiryMetadataForThatKey()
     public function testSettingExpirationHopsWithNoVariablesMarksContainerByWritingToStorage()
     {
         $this->container->setExpirationHops(2);
-        $storage = $this->manager->getStorage();
+        $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata('Default');
         $this->assertArrayHasKey('EXPIRE_HOPS', $metadata);
         $this->assertEquals(
@@ -333,7 +335,7 @@ public function testSettingExpirationHopsWithSingleKeyMarksContainerByWritingToS
     {
         $this->container->foo = 'bar';
         $this->container->setExpirationHops(2, 'foo');
-        $storage = $this->manager->getStorage();
+        $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata('Default');
         $this->assertArrayHasKey('EXPIRE_HOPS_KEYS', $metadata);
         $this->assertArrayHasKey('foo', $metadata['EXPIRE_HOPS_KEYS']);
@@ -349,7 +351,7 @@ public function testSettingExpirationHopsWithMultipleKeysMarksContainerByWriting
         $this->container->bar = 'baz';
         $this->container->baz = 'bat';
         $this->container->setExpirationHops(2, ['foo', 'baz']);
-        $storage = $this->manager->getStorage();
+        $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata('Default');
         $this->assertArrayHasKey('EXPIRE_HOPS_KEYS', $metadata);
 
@@ -374,7 +376,7 @@ public function testContainerExpiresAfterSpecifiedHops()
         $this->container->setExpirationHops(1);
 
         $storage = $this->manager->getStorage();
-        $ts = $storage->getRequestAccessTime();
+        $ts      = $storage->getRequestAccessTime();
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 60);
         $this->assertEquals('bar', $this->container->foo);
@@ -400,7 +402,7 @@ public function testKeyExpiresAfterSpecifiedHops()
         $this->container->setExpirationHops(1, 'foo');
 
         $storage = $this->manager->getStorage();
-        $ts = $storage->getRequestAccessTime();
+        $ts      = $storage->getRequestAccessTime();
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 60);
         $this->assertEquals('bar', $this->container->foo);
@@ -432,7 +434,7 @@ public function testKeysExpireAfterSpecifiedHops()
         $this->container->setExpirationHops(1, ['foo', 'baz']);
 
         $storage = $this->manager->getStorage();
-        $ts = $storage->getRequestAccessTime();
+        $ts      = $storage->getRequestAccessTime();
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 60);
         $this->assertEquals('bar', $this->container->foo);
@@ -450,12 +452,12 @@ public function testCanIterateOverContainer()
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
         $this->container->baz = 'bat';
-        $expected = [
+        $expected             = [
             'foo' => 'bar',
             'bar' => 'baz',
             'baz' => 'bat',
         ];
-        $test = [];
+        $test                 = [];
         foreach ($this->container as $key => $value) {
             $test[$key] = $value;
         }
@@ -470,7 +472,7 @@ public function testIterationHonorsExpirationHops()
         $this->container->setExpirationHops(1, ['foo', 'baz']);
 
         $storage = $this->manager->getStorage();
-        $ts = $storage->getRequestAccessTime();
+        $ts      = $storage->getRequestAccessTime();
 
         // First hop
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 60);
@@ -479,7 +481,7 @@ public function testIterationHonorsExpirationHops()
             'bar' => 'baz',
             'baz' => 'bat',
         ];
-        $test = [];
+        $test     = [];
         foreach ($this->container as $key => $value) {
             $test[$key] = $value;
         }
@@ -488,7 +490,7 @@ public function testIterationHonorsExpirationHops()
         // Second hop
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 120);
         $expected = ['bar' => 'baz'];
-        $test = [];
+        $test     = [];
         foreach ($this->container as $key => $value) {
             $test[$key] = $value;
         }
@@ -499,7 +501,7 @@ public function testIterationHonorsExpirationTimestamps()
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
-        $storage = $this->manager->getStorage();
+        $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE_KEYS' => ['foo' => $_SERVER['REQUEST_TIME'] - 18600]]);
         $expected = ['bar' => 'baz'];
         $test     = [];
@@ -511,7 +513,7 @@ public function testIterationHonorsExpirationTimestamps()
 
     public function testValidationShouldNotRaiseErrorForMissingResponseObject()
     {
-        $session = new Container('test');
+        $session       = new Container('test');
         $session->test = 42;
         $this->assertEquals(42, $session->test);
     }
@@ -547,8 +549,8 @@ public function testMultiDimensionalUnset()
 
     public function testUpgradeBehaviors()
     {
-        $storage = $this->manager->getStorage();
-        $storage['foo'] = new \ArrayObject(['bar' => 'baz']);
+        $storage        = $this->manager->getStorage();
+        $storage['foo'] = new ArrayObject(['bar' => 'baz']);
 
         $container = new Container('foo', $this->manager);
         $this->assertEquals('baz', $container->bar);
diff --git a/test/ReflectionUtil.php b/test/ReflectionUtil.php
index 7fb704f6..a82f3cf2 100644
--- a/test/ReflectionUtil.php
+++ b/test/ReflectionUtil.php
@@ -4,6 +4,8 @@
 
 namespace LaminasTest\Session;
 
+use ReflectionObject;
+
 final class ReflectionUtil
 {
     /**
@@ -11,7 +13,7 @@ final class ReflectionUtil
      */
     public static function getProperty(object $object, string $property)
     {
-        $reflectionObject   = new \ReflectionObject($object);
+        $reflectionObject   = new ReflectionObject($object);
         $reflectionProperty = $reflectionObject->getProperty($property);
         $reflectionProperty->setAccessible(true);
         $value = $reflectionProperty->getValue($object);
diff --git a/test/SaveHandler/DbTableGatewayOptionsTest.php b/test/SaveHandler/DbTableGatewayOptionsTest.php
index 5b00e044..729c5c1c 100644
--- a/test/SaveHandler/DbTableGatewayOptionsTest.php
+++ b/test/SaveHandler/DbTableGatewayOptionsTest.php
@@ -8,6 +8,7 @@
 
 namespace LaminasTest\Session\SaveHandler;
 
+use Laminas\Session\Exception\InvalidArgumentException;
 use Laminas\Session\SaveHandler\DbTableGatewayOptions;
 use PHPUnit\Framework\TestCase;
 
@@ -31,11 +32,11 @@ public function testDefaults()
     public function testSetConstructor()
     {
         $options = new DbTableGatewayOptions([
-            'idColumn' => 'testId',
-            'nameColumn' => 'testName',
+            'idColumn'       => 'testId',
+            'nameColumn'     => 'testName',
             'modifiedColumn' => 'testModified',
             'lifetimeColumn' => 'testLifetime',
-            'dataColumn' => 'testData',
+            'dataColumn'     => 'testData',
         ]);
 
         $this->assertEquals('testId', $options->getIdColumn());
@@ -49,10 +50,10 @@ public function testSetters()
     {
         $options = new DbTableGatewayOptions();
         $options->setIdColumn('testId')
-                ->setNameColumn('testName')
-                ->setModifiedColumn('testModified')
-                ->setLifetimeColumn('testLifetime')
-                ->setDataColumn('testData');
+            ->setNameColumn('testName')
+            ->setModifiedColumn('testModified')
+            ->setLifetimeColumn('testLifetime')
+            ->setDataColumn('testData');
 
         $this->assertEquals('testId', $options->getIdColumn());
         $this->assertEquals('testName', $options->getNameColumn());
@@ -63,7 +64,7 @@ public function testSetters()
 
     public function testInvalidIdColumn()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
             [
                 'idColumn' => null,
@@ -73,7 +74,7 @@ public function testInvalidIdColumn()
 
     public function testInvalidNameColumn()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
             [
                 'nameColumn' => null,
@@ -83,7 +84,7 @@ public function testInvalidNameColumn()
 
     public function testInvalidModifiedColumn()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
             [
                 'modifiedColumn' => null,
@@ -93,7 +94,7 @@ public function testInvalidModifiedColumn()
 
     public function testInvalidLifetimeColumn()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
             [
                 'lifetimeColumn' => null,
@@ -103,7 +104,7 @@ public function testInvalidLifetimeColumn()
 
     public function testInvalidDataColumn()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
             [
                 'dataColumn' => null,
diff --git a/test/SaveHandler/DbTableGatewayTest.php b/test/SaveHandler/DbTableGatewayTest.php
index fa06058b..ed48aac1 100644
--- a/test/SaveHandler/DbTableGatewayTest.php
+++ b/test/SaveHandler/DbTableGatewayTest.php
@@ -222,7 +222,7 @@ public function testReadDestroysExpiredSession()
     /**
      * Sets up the database connection and creates the table for session data
      *
-     * @param  \Laminas\Session\SaveHandler\DbTableGatewayOptions $options
+     * @param DbTableGatewayOptions $options
      * @return void
      */
     protected function setupDb(DbTableGatewayOptions $options)
diff --git a/test/SaveHandler/MongoDBOptionsTest.php b/test/SaveHandler/MongoDBOptionsTest.php
index 186cce6b..fc39ee8b 100644
--- a/test/SaveHandler/MongoDBOptionsTest.php
+++ b/test/SaveHandler/MongoDBOptionsTest.php
@@ -8,6 +8,7 @@
 
 namespace LaminasTest\Session\SaveHandler;
 
+use Laminas\Session\Exception\InvalidArgumentException;
 use Laminas\Session\SaveHandler\MongoDBOptions;
 use PHPUnit\Framework\TestCase;
 
@@ -21,7 +22,7 @@ public function testDefaults()
         $options = new MongoDBOptions();
         $this->assertNull($options->getDatabase());
         $this->assertNull($options->getCollection());
-        $mongoVersion = phpversion('mongo') ?: '0.0.0';
+        $mongoVersion       = phpversion('mongo') ?: '0.0.0';
         $defaultSaveOptions = version_compare($mongoVersion, '1.3.0', '<') ? ['safe' => true] : ['w' => 1];
         $this->assertEquals($defaultSaveOptions, $options->getSaveOptions());
         $this->assertEquals('name', $options->getNameField());
@@ -33,11 +34,11 @@ public function testDefaults()
     public function testSetConstructor()
     {
         $options = new MongoDBOptions([
-            'database' => 'testDatabase',
-            'collection' => 'testCollection',
-            'saveOptions' => ['w' => 2],
-            'nameField' => 'testName',
-            'dataField' => 'testData',
+            'database'      => 'testDatabase',
+            'collection'    => 'testCollection',
+            'saveOptions'   => ['w' => 2],
+            'nameField'     => 'testName',
+            'dataField'     => 'testData',
             'lifetimeField' => 'testLifetime',
             'modifiedField' => 'testModified',
         ]);
@@ -55,12 +56,12 @@ public function testSetters()
     {
         $options = new MongoDBOptions();
         $options->setDatabase('testDatabase')
-                ->setCollection('testCollection')
-                ->setSaveOptions(['w' => 2])
-                ->setNameField('testName')
-                ->setDataField('testData')
-                ->setLifetimeField('testLifetime')
-                ->setModifiedField('testModified');
+            ->setCollection('testCollection')
+            ->setSaveOptions(['w' => 2])
+            ->setNameField('testName')
+            ->setDataField('testData')
+            ->setLifetimeField('testLifetime')
+            ->setModifiedField('testModified');
 
         $this->assertEquals('testDatabase', $options->getDatabase());
         $this->assertEquals('testCollection', $options->getCollection());
@@ -73,7 +74,7 @@ public function testSetters()
 
     public function testInvalidDatabase()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
             [
                 'database' => null,
@@ -83,7 +84,7 @@ public function testInvalidDatabase()
 
     public function testInvalidCollection()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
             [
                 'collection' => null,
@@ -93,7 +94,7 @@ public function testInvalidCollection()
 
     public function testInvalidSaveOptions()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
             [
                 'saveOptions' => null,
@@ -103,7 +104,7 @@ public function testInvalidSaveOptions()
 
     public function testInvalidNameField()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
             [
                 'nameField' => null,
@@ -113,7 +114,7 @@ public function testInvalidNameField()
 
     public function testInvalidModifiedField()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
             [
                 'modifiedField' => null,
@@ -123,7 +124,7 @@ public function testInvalidModifiedField()
 
     public function testInvalidLifetimeField()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
             [
                 'lifetimeField' => null,
@@ -133,7 +134,7 @@ public function testInvalidLifetimeField()
 
     public function testInvalidDataField()
     {
-        $this->expectException(\Laminas\Session\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
             [
                 'dataField' => null,
diff --git a/test/SaveHandler/MongoDBTest.php b/test/SaveHandler/MongoDBTest.php
index 96396d68..af23a9ba 100644
--- a/test/SaveHandler/MongoDBTest.php
+++ b/test/SaveHandler/MongoDBTest.php
@@ -12,6 +12,7 @@
 use Laminas\Session\SaveHandler\MongoDBOptions;
 use MongoDB\Client as MongoClient;
 use MongoDB\Collection as MongoCollection;
+use MongoDB\Driver\Exception\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -158,7 +159,7 @@ public function testGarbageCollectionMaxlifetimeIsInSeconds()
 
     public function testWriteExceptionEdgeCaseForChangedSessionName()
     {
-        $this->expectException(\MongoDB\Driver\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
         $this->assertTrue($saveHandler->open('savepath', 'sessionname'));
 
diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php
index 79c01542..87048caf 100644
--- a/test/Service/SessionManagerFactoryTest.php
+++ b/test/Service/SessionManagerFactoryTest.php
@@ -25,6 +25,7 @@
 use LaminasTest\Session\TestAsset\TestManager;
 use LaminasTest\Session\TestAsset\TestSaveHandler;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 
 /**
  * @covers \Laminas\Session\Service\SessionManagerFactory
@@ -184,7 +185,7 @@ public function testFactoryDoesNotAttachValidatorTwoTimes()
         $manager = $this->services->get(ManagerInterface::class);
         try {
             $manager->start();
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // Ignore exception, because we are not interested whether session validation passes in this test
         }
 
diff --git a/test/SessionArrayStorageTest.php b/test/SessionArrayStorageTest.php
index 64f0ccf5..44bfa8ed 100644
--- a/test/SessionArrayStorageTest.php
+++ b/test/SessionArrayStorageTest.php
@@ -21,7 +21,7 @@ class SessionArrayStorageTest extends TestCase
     protected function setUp(): void
     {
         $_SESSION      = [];
-        $this->storage = new SessionArrayStorage;
+        $this->storage = new SessionArrayStorage();
     }
 
     protected function tearDown(): void
diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
index c5006ba1..34db4970 100644
--- a/test/SessionManagerTest.php
+++ b/test/SessionManagerTest.php
@@ -697,7 +697,7 @@ public function testStartingSessionThatFailsAValidatorShouldRaiseException()
     public function testResumeSessionThatFailsAValidatorShouldRaiseException()
     {
         $this->manager = new SessionManager();
-        $this->manager->setSaveHandler(new TestAsset\TestSaveHandlerWithValidator);
+        $this->manager->setSaveHandler(new TestAsset\TestSaveHandlerWithValidator());
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('failed');
         $this->manager->start();
diff --git a/test/SessionStorageTest.php b/test/SessionStorageTest.php
index 2ed667df..7ac1c776 100644
--- a/test/SessionStorageTest.php
+++ b/test/SessionStorageTest.php
@@ -19,7 +19,7 @@ class SessionStorageTest extends TestCase
     protected function setUp(): void
     {
         $_SESSION      = [];
-        $this->storage = new SessionStorage;
+        $this->storage = new SessionStorage();
     }
 
     protected function tearDown(): void
diff --git a/test/StorageTest.php b/test/StorageTest.php
index d3261aaf..4505f77a 100644
--- a/test/StorageTest.php
+++ b/test/StorageTest.php
@@ -23,7 +23,7 @@ class StorageTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->storage = new ArrayStorage;
+        $this->storage = new ArrayStorage();
     }
 
     public function testStorageAllowsArrayAccess()

From b2b1c36fa23d6ae04707c49215edd4fdd4f2d6cc Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 11:32:42 +0200
Subject: [PATCH 03/18] qa: tests: use static invocation in assert calls

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/Config/SessionConfigTest.php             | 222 +++++++++---------
 test/Config/StandardConfigTest.php            |  88 +++----
 test/ContainerTest.php                        | 182 +++++++-------
 test/SaveHandler/CacheTest.php                |  24 +-
 .../DbTableGateway/MysqliAdapterTest.php      |  20 +-
 .../DbTableGateway/PdoMysqlAdapterTest.php    |  20 +-
 .../DbTableGateway/PdoSqliteAdapterTest.php   |  10 +-
 .../DbTableGateway/PgsqlAdapterTest.php       |  20 +-
 .../SaveHandler/DbTableGatewayOptionsTest.php |  46 ++--
 test/SaveHandler/DbTableGatewayTest.php       |  30 +--
 test/SaveHandler/MongoDBOptionsTest.php       |  62 ++---
 test/SaveHandler/MongoDBTest.php              |  58 ++---
 .../ContainerAbstractServiceFactoryTest.php   |  12 +-
 test/Service/SessionConfigFactoryTest.php     |   8 +-
 test/Service/SessionManagerFactoryTest.php    |  41 ++--
 test/Service/StorageFactoryTest.php           |  16 +-
 test/SessionArrayStorageTest.php              |  70 +++---
 test/SessionManagerTest.php                   | 178 +++++++-------
 test/SessionStorageTest.php                   |  38 +--
 test/StorageTest.php                          |  80 +++----
 test/Validator/RemoteAddrTest.php             |  30 +--
 21 files changed, 642 insertions(+), 613 deletions(-)

diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php
index 99cafe88..0cfbf6e7 100644
--- a/test/Config/SessionConfigTest.php
+++ b/test/Config/SessionConfigTest.php
@@ -46,7 +46,7 @@ public function assertPhpLessThan71($message = 'This test requires a PHP version
         if (PHP_VERSION_ID < 70100) {
             return true;
         }
-        $this->markTestSkipped($message);
+        self::markTestSkipped($message);
     }
 
     // session.save_path
@@ -60,45 +60,45 @@ public function testSetSavePathErrorsOnInvalidPath()
 
     public function testSavePathDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.save_path'), $this->config->getSavePath());
+        self::assertSame(ini_get('session.save_path'), $this->config->getSavePath());
     }
 
     public function testSavePathIsMutable()
     {
         $this->config->setSavePath(__DIR__);
-        $this->assertEquals(__DIR__, $this->config->getSavePath());
+        self::assertEquals(__DIR__, $this->config->getSavePath());
     }
 
     public function testSavePathAltersIniSetting()
     {
         $this->config->setSavePath(__DIR__);
-        $this->assertEquals(__DIR__, ini_get('session.save_path'));
+        self::assertEquals(__DIR__, ini_get('session.save_path'));
     }
 
     public function testSavePathCanBeNonDirectoryWhenSaveHandlerNotFiles()
     {
         $this->config->setPhpSaveHandler(TestSaveHandler::class);
         $this->config->setSavePath('/tmp/sessions.db');
-        $this->assertEquals('/tmp/sessions.db', ini_get('session.save_path'));
+        self::assertEquals('/tmp/sessions.db', ini_get('session.save_path'));
     }
 
     // session.name
 
     public function testNameDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.name'), $this->config->getName());
+        self::assertSame(ini_get('session.name'), $this->config->getName());
     }
 
     public function testNameIsMutable()
     {
         $this->config->setName('FOOBAR');
-        $this->assertEquals('FOOBAR', $this->config->getName());
+        self::assertEquals('FOOBAR', $this->config->getName());
     }
 
     public function testNameAltersIniSetting()
     {
         $this->config->setName('FOOBAR');
-        $this->assertEquals('FOOBAR', ini_get('session.name'));
+        self::assertEquals('FOOBAR', ini_get('session.name'));
     }
 
     public function testNameAltersIniSettingAfterSessionStart()
@@ -106,7 +106,7 @@ public function testNameAltersIniSettingAfterSessionStart()
         session_start();
 
         $this->config->setName('FOOBAR');
-        $this->assertEquals('FOOBAR', ini_get('session.name'));
+        self::assertEquals('FOOBAR', ini_get('session.name'));
     }
 
     public function testIdempotentNameAltersIniSettingWithSameValueAfterSessionStart()
@@ -115,14 +115,14 @@ public function testIdempotentNameAltersIniSettingWithSameValueAfterSessionStart
         session_start();
 
         $this->config->setName('FOOBAR');
-        $this->assertEquals('FOOBAR', ini_get('session.name'));
+        self::assertEquals('FOOBAR', ini_get('session.name'));
     }
 
     // session.save_handler
 
     public function testSaveHandlerDefaultsToIniSettings()
     {
-        $this->assertSame(
+        self::assertSame(
             ini_get('session.save_handler'),
             $this->config->getSaveHandler(),
             var_export($this->config->toArray(), 1)
@@ -132,13 +132,13 @@ public function testSaveHandlerDefaultsToIniSettings()
     public function testSaveHandlerIsMutable()
     {
         $this->config->setSaveHandler(TestSaveHandler::class);
-        $this->assertSame(TestSaveHandler::class, $this->config->getSaveHandler());
+        self::assertSame(TestSaveHandler::class, $this->config->getSaveHandler());
     }
 
     public function testSaveHandlerDoesNotAlterIniSetting()
     {
         $this->config->setSaveHandler(TestSaveHandler::class);
-        $this->assertNotSame(TestSaveHandler::class, ini_get('session.save_handler'));
+        self::assertNotSame(TestSaveHandler::class, ini_get('session.save_handler'));
     }
 
     public function testSettingInvalidSaveHandlerRaisesException()
@@ -152,19 +152,19 @@ public function testSettingInvalidSaveHandlerRaisesException()
 
     public function testGcProbabilityDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.gc_probability'), $this->config->getGcProbability());
+        self::assertSame(ini_get('session.gc_probability'), $this->config->getGcProbability());
     }
 
     public function testGcProbabilityIsMutable()
     {
         $this->config->setGcProbability(20);
-        $this->assertEquals(20, $this->config->getGcProbability());
+        self::assertEquals(20, $this->config->getGcProbability());
     }
 
     public function testGcProbabilityAltersIniSetting()
     {
         $this->config->setGcProbability(24);
-        $this->assertEquals(24, ini_get('session.gc_probability'));
+        self::assertEquals(24, ini_get('session.gc_probability'));
     }
 
     public function testSettingInvalidGcProbabilityRaisesException()
@@ -192,19 +192,19 @@ public function testSettingInvalidGcProbabilityRaisesException3()
 
     public function testGcDivisorDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.gc_divisor'), $this->config->getGcDivisor());
+        self::assertSame(ini_get('session.gc_divisor'), $this->config->getGcDivisor());
     }
 
     public function testGcDivisorIsMutable()
     {
         $this->config->setGcDivisor(20);
-        $this->assertEquals(20, $this->config->getGcDivisor());
+        self::assertEquals(20, $this->config->getGcDivisor());
     }
 
     public function testGcDivisorAltersIniSetting()
     {
         $this->config->setGcDivisor(24);
-        $this->assertEquals(24, ini_get('session.gc_divisor'));
+        self::assertEquals(24, ini_get('session.gc_divisor'));
     }
 
     public function testSettingInvalidGcDivisorRaisesException()
@@ -225,19 +225,19 @@ public function testSettingInvalidGcDivisorRaisesException2()
 
     public function testGcMaxlifetimeDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.gc_maxlifetime'), $this->config->getGcMaxlifetime());
+        self::assertSame(ini_get('session.gc_maxlifetime'), $this->config->getGcMaxlifetime());
     }
 
     public function testGcMaxlifetimeIsMutable()
     {
         $this->config->setGcMaxlifetime(20);
-        $this->assertEquals(20, $this->config->getGcMaxlifetime());
+        self::assertEquals(20, $this->config->getGcMaxlifetime());
     }
 
     public function testGcMaxlifetimeAltersIniSetting()
     {
         $this->config->setGcMaxlifetime(24);
-        $this->assertEquals(24, ini_get('session.gc_maxlifetime'));
+        self::assertEquals(24, ini_get('session.gc_maxlifetime'));
     }
 
     public function testSettingInvalidGcMaxlifetimeRaisesException()
@@ -258,21 +258,21 @@ public function testSettingInvalidGcMaxlifetimeRaisesException2()
 
     public function testSerializeHandlerDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.serialize_handler'), $this->config->getSerializeHandler());
+        self::assertSame(ini_get('session.serialize_handler'), $this->config->getSerializeHandler());
     }
 
     public function testSerializeHandlerIsMutable()
     {
         $value = extension_loaded('wddx') ? 'wddx' : 'php_binary';
         $this->config->setSerializeHandler($value);
-        $this->assertEquals($value, $this->config->getSerializeHandler());
+        self::assertEquals($value, $this->config->getSerializeHandler());
     }
 
     public function testSerializeHandlerAltersIniSetting()
     {
         $value = extension_loaded('wddx') ? 'wddx' : 'php_binary';
         $this->config->setSerializeHandler($value);
-        $this->assertEquals($value, ini_get('session.serialize_handler'));
+        self::assertEquals($value, ini_get('session.serialize_handler'));
     }
 
     public function testSettingInvalidSerializeHandlerRaisesException()
@@ -286,25 +286,25 @@ public function testSettingInvalidSerializeHandlerRaisesException()
 
     public function testCookieLifetimeDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.cookie_lifetime'), $this->config->getCookieLifetime());
+        self::assertSame(ini_get('session.cookie_lifetime'), $this->config->getCookieLifetime());
     }
 
     public function testCookieLifetimeIsMutable()
     {
         $this->config->setCookieLifetime(20);
-        $this->assertEquals(20, $this->config->getCookieLifetime());
+        self::assertEquals(20, $this->config->getCookieLifetime());
     }
 
     public function testCookieLifetimeAltersIniSetting()
     {
         $this->config->setCookieLifetime(24);
-        $this->assertEquals(24, ini_get('session.cookie_lifetime'));
+        self::assertEquals(24, ini_get('session.cookie_lifetime'));
     }
 
     public function testCookieLifetimeCanBeZero()
     {
         $this->config->setCookieLifetime(0);
-        $this->assertEquals(0, ini_get('session.cookie_lifetime'));
+        self::assertEquals(0, ini_get('session.cookie_lifetime'));
     }
 
     public function testSettingInvalidCookieLifetimeRaisesException()
@@ -325,19 +325,19 @@ public function testSettingInvalidCookieLifetimeRaisesException2()
 
     public function testCookiePathDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.cookie_path'), $this->config->getCookiePath());
+        self::assertSame(ini_get('session.cookie_path'), $this->config->getCookiePath());
     }
 
     public function testCookiePathIsMutable()
     {
         $this->config->setCookiePath('/foo');
-        $this->assertEquals('/foo', $this->config->getCookiePath());
+        self::assertEquals('/foo', $this->config->getCookiePath());
     }
 
     public function testCookiePathAltersIniSetting()
     {
         $this->config->setCookiePath('/bar');
-        $this->assertEquals('/bar', ini_get('session.cookie_path'));
+        self::assertEquals('/bar', ini_get('session.cookie_path'));
     }
 
     public function testSettingInvalidCookiePathRaisesException()
@@ -365,25 +365,25 @@ public function testSettingInvalidCookiePathRaisesException3()
 
     public function testCookieDomainDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.cookie_domain'), $this->config->getCookieDomain());
+        self::assertSame(ini_get('session.cookie_domain'), $this->config->getCookieDomain());
     }
 
     public function testCookieDomainIsMutable()
     {
         $this->config->setCookieDomain('example.com');
-        $this->assertEquals('example.com', $this->config->getCookieDomain());
+        self::assertEquals('example.com', $this->config->getCookieDomain());
     }
 
     public function testCookieDomainCanBeEmpty()
     {
         $this->config->setCookieDomain('');
-        $this->assertEquals('', $this->config->getCookieDomain());
+        self::assertEquals('', $this->config->getCookieDomain());
     }
 
     public function testCookieDomainAltersIniSetting()
     {
         $this->config->setCookieDomain('localhost');
-        $this->assertEquals('localhost', ini_get('session.cookie_domain'));
+        self::assertEquals('localhost', ini_get('session.cookie_domain'));
     }
 
     public function testSettingInvalidCookieDomainRaisesException()
@@ -404,109 +404,109 @@ public function testSettingInvalidCookieDomainRaisesException2()
 
     public function testCookieSecureDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.cookie_secure'), $this->config->getCookieSecure());
+        self::assertSame(ini_get('session.cookie_secure'), $this->config->getCookieSecure());
     }
 
     public function testCookieSecureIsMutable()
     {
         $value = ! ini_get('session.cookie_secure');
         $this->config->setCookieSecure($value);
-        $this->assertEquals($value, $this->config->getCookieSecure());
+        self::assertEquals($value, $this->config->getCookieSecure());
     }
 
     public function testCookieSecureAltersIniSetting()
     {
         $value = ! ini_get('session.cookie_secure');
         $this->config->setCookieSecure($value);
-        $this->assertEquals($value, ini_get('session.cookie_secure'));
+        self::assertEquals($value, ini_get('session.cookie_secure'));
     }
 
     // session.cookie_httponly
 
     public function testCookieHttpOnlyDefaultsToIniSettings()
     {
-        $this->assertSame((bool) ini_get('session.cookie_httponly'), $this->config->getCookieHttpOnly());
+        self::assertSame((bool)ini_get('session.cookie_httponly'), $this->config->getCookieHttpOnly());
     }
 
     public function testCookieHttpOnlyIsMutable()
     {
         $value = ! ini_get('session.cookie_httponly');
         $this->config->setCookieHttpOnly($value);
-        $this->assertEquals($value, $this->config->getCookieHttpOnly());
+        self::assertEquals($value, $this->config->getCookieHttpOnly());
     }
 
     public function testCookieHttpOnlyAltersIniSetting()
     {
         $value = ! ini_get('session.cookie_httponly');
         $this->config->setCookieHttpOnly($value);
-        $this->assertEquals($value, ini_get('session.cookie_httponly'));
+        self::assertEquals($value, ini_get('session.cookie_httponly'));
     }
 
     // session.use_cookies
 
     public function testUseCookiesDefaultsToIniSettings()
     {
-        $this->assertSame((bool) ini_get('session.use_cookies'), $this->config->getUseCookies());
+        self::assertSame((bool)ini_get('session.use_cookies'), $this->config->getUseCookies());
     }
 
     public function testUseCookiesIsMutable()
     {
         $value = ! ini_get('session.use_cookies');
         $this->config->setUseCookies($value);
-        $this->assertEquals($value, $this->config->getUseCookies());
+        self::assertEquals($value, $this->config->getUseCookies());
     }
 
     public function testUseCookiesAltersIniSetting()
     {
         $value = ! ini_get('session.use_cookies');
         $this->config->setUseCookies($value);
-        $this->assertEquals($value, (bool) ini_get('session.use_cookies'));
+        self::assertEquals($value, (bool)ini_get('session.use_cookies'));
     }
 
     // session.use_only_cookies
 
     public function testUseOnlyCookiesDefaultsToIniSettings()
     {
-        $this->assertSame((bool) ini_get('session.use_only_cookies'), $this->config->getUseOnlyCookies());
+        self::assertSame((bool)ini_get('session.use_only_cookies'), $this->config->getUseOnlyCookies());
     }
 
     public function testUseOnlyCookiesIsMutable()
     {
         $value = ! ini_get('session.use_only_cookies');
         $this->config->setOption('use_only_cookies', $value);
-        $this->assertEquals($value, (bool) $this->config->getOption('use_only_cookies'));
+        self::assertEquals($value, (bool)$this->config->getOption('use_only_cookies'));
     }
 
     public function testUseOnlyCookiesAltersIniSetting()
     {
         $value = ! ini_get('session.use_only_cookies');
         $this->config->setOption('use_only_cookies', $value);
-        $this->assertEquals($value, (bool) ini_get('session.use_only_cookies'));
+        self::assertEquals($value, (bool)ini_get('session.use_only_cookies'));
     }
 
     // session.referer_check
 
     public function testRefererCheckDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.referer_check'), $this->config->getRefererCheck());
+        self::assertSame(ini_get('session.referer_check'), $this->config->getRefererCheck());
     }
 
     public function testRefererCheckIsMutable()
     {
         $this->config->setOption('referer_check', 'FOOBAR');
-        $this->assertEquals('FOOBAR', $this->config->getOption('referer_check'));
+        self::assertEquals('FOOBAR', $this->config->getOption('referer_check'));
     }
 
     public function testRefererCheckMayBeEmpty()
     {
         $this->config->setOption('referer_check', '');
-        $this->assertEquals('', $this->config->getOption('referer_check'));
+        self::assertEquals('', $this->config->getOption('referer_check'));
     }
 
     public function testRefererCheckAltersIniSetting()
     {
         $this->config->setOption('referer_check', 'BARBAZ');
-        $this->assertEquals('BARBAZ', ini_get('session.referer_check'));
+        self::assertEquals('BARBAZ', ini_get('session.referer_check'));
     }
 
     // session.entropy_file
@@ -522,21 +522,21 @@ public function testSetEntropyFileErrorsOnInvalidPath()
     public function testEntropyFileDefaultsToIniSettings()
     {
         $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
-        $this->assertSame(ini_get('session.entropy_file'), $this->config->getEntropyFile());
+        self::assertSame(ini_get('session.entropy_file'), $this->config->getEntropyFile());
     }
 
     public function testEntropyFileIsMutable()
     {
         $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
         $this->config->setEntropyFile(__FILE__);
-        $this->assertEquals(__FILE__, $this->config->getEntropyFile());
+        self::assertEquals(__FILE__, $this->config->getEntropyFile());
     }
 
     public function testEntropyFileAltersIniSetting()
     {
         $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
         $this->config->setEntropyFile(__FILE__);
-        $this->assertEquals(__FILE__, ini_get('session.entropy_file'));
+        self::assertEquals(__FILE__, ini_get('session.entropy_file'));
     }
 
     /**
@@ -562,28 +562,28 @@ public function testGetEntropyFileError()
     public function testEntropyLengthDefaultsToIniSettings()
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
-        $this->assertSame(ini_get('session.entropy_length'), $this->config->getEntropyLength());
+        self::assertSame(ini_get('session.entropy_length'), $this->config->getEntropyLength());
     }
 
     public function testEntropyLengthIsMutable()
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         $this->config->setEntropyLength(20);
-        $this->assertEquals(20, $this->config->getEntropyLength());
+        self::assertEquals(20, $this->config->getEntropyLength());
     }
 
     public function testEntropyLengthAltersIniSetting()
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         $this->config->setEntropyLength(24);
-        $this->assertEquals(24, ini_get('session.entropy_length'));
+        self::assertEquals(24, ini_get('session.entropy_length'));
     }
 
     public function testEntropyLengthCanBeZero()
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         $this->config->setEntropyLength(0);
-        $this->assertEquals(0, ini_get('session.entropy_length'));
+        self::assertEquals(0, ini_get('session.entropy_length'));
     }
 
     public function testSettingInvalidEntropyLengthRaisesException()
@@ -635,7 +635,7 @@ public function cacheLimiters()
 
     public function testCacheLimiterDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.cache_limiter'), $this->config->getCacheLimiter());
+        self::assertSame(ini_get('session.cache_limiter'), $this->config->getCacheLimiter());
     }
 
     /**
@@ -644,7 +644,7 @@ public function testCacheLimiterDefaultsToIniSettings()
     public function testCacheLimiterIsMutable($cacheLimiter)
     {
         $this->config->setCacheLimiter($cacheLimiter);
-        $this->assertEquals($cacheLimiter, $this->config->getCacheLimiter());
+        self::assertEquals($cacheLimiter, $this->config->getCacheLimiter());
     }
 
     /**
@@ -653,7 +653,7 @@ public function testCacheLimiterIsMutable($cacheLimiter)
     public function testCacheLimiterAltersIniSetting($cacheLimiter)
     {
         $this->config->setCacheLimiter($cacheLimiter);
-        $this->assertEquals($cacheLimiter, ini_get('session.cache_limiter'));
+        self::assertEquals($cacheLimiter, ini_get('session.cache_limiter'));
     }
 
     public function testSettingInvalidCacheLimiterRaisesException()
@@ -667,19 +667,19 @@ public function testSettingInvalidCacheLimiterRaisesException()
 
     public function testCacheExpireDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.cache_expire'), $this->config->getCacheExpire());
+        self::assertSame(ini_get('session.cache_expire'), $this->config->getCacheExpire());
     }
 
     public function testCacheExpireIsMutable()
     {
         $this->config->setCacheExpire(20);
-        $this->assertEquals(20, $this->config->getCacheExpire());
+        self::assertEquals(20, $this->config->getCacheExpire());
     }
 
     public function testCacheExpireAltersIniSetting()
     {
         $this->config->setCacheExpire(24);
-        $this->assertEquals(24, ini_get('session.cache_expire'));
+        self::assertEquals(24, ini_get('session.cache_expire'));
     }
 
     public function testSettingInvalidCacheExpireRaisesException()
@@ -700,21 +700,21 @@ public function testSettingInvalidCacheExpireRaisesException2()
 
     public function testUseTransSidDefaultsToIniSettings()
     {
-        $this->assertSame((bool) ini_get('session.use_trans_sid'), $this->config->getUseTransSid());
+        self::assertSame((bool)ini_get('session.use_trans_sid'), $this->config->getUseTransSid());
     }
 
     public function testUseTransSidIsMutable()
     {
         $value = ! ini_get('session.use_trans_sid');
         $this->config->setOption('use_trans_sid', $value);
-        $this->assertEquals($value, (bool) $this->config->getOption('use_trans_sid'));
+        self::assertEquals($value, (bool)$this->config->getOption('use_trans_sid'));
     }
 
     public function testUseTransSidAltersIniSetting()
     {
         $value = ! ini_get('session.use_trans_sid');
         $this->config->setOption('use_trans_sid', $value);
-        $this->assertEquals($value, (bool) ini_get('session.use_trans_sid'));
+        self::assertEquals($value, (bool)ini_get('session.use_trans_sid'));
     }
 
     // session.hash_function
@@ -732,7 +732,7 @@ public function hashFunctions()
     public function testHashFunctionDefaultsToIniSettings()
     {
         $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
-        $this->assertSame(ini_get('session.hash_function'), $this->config->getHashFunction());
+        self::assertSame(ini_get('session.hash_function'), $this->config->getHashFunction());
     }
 
     /**
@@ -742,7 +742,7 @@ public function testHashFunctionIsMutable($hashFunction)
     {
         $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
         $this->config->setHashFunction($hashFunction);
-        $this->assertEquals($hashFunction, $this->config->getHashFunction());
+        self::assertEquals($hashFunction, $this->config->getHashFunction());
     }
 
     /**
@@ -752,7 +752,7 @@ public function testHashFunctionAltersIniSetting($hashFunction)
     {
         $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
         $this->config->setHashFunction($hashFunction);
-        $this->assertEquals($hashFunction, ini_get('session.hash_function'));
+        self::assertEquals($hashFunction, ini_get('session.hash_function'));
     }
 
     public function testSettingInvalidHashFunctionRaisesException()
@@ -795,10 +795,10 @@ public function hashBitsPerCharacters()
     public function testHashBitsPerCharacterDefaultsToIniSettings()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
+            self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
         }
 
-        $this->assertSame(ini_get('session.hash_bits_per_character'), $this->config->getHashBitsPerCharacter());
+        self::assertSame(ini_get('session.hash_bits_per_character'), $this->config->getHashBitsPerCharacter());
     }
 
     /**
@@ -808,7 +808,7 @@ public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter)
     {
         $this->assertPhpLessThan71('session.hash_bits_per_character directive removed in PHP 7.1');
         $this->config->setHashBitsPerCharacter($hashBitsPerCharacter);
-        $this->assertEquals($hashBitsPerCharacter, $this->config->getHashBitsPerCharacter());
+        self::assertEquals($hashBitsPerCharacter, $this->config->getHashBitsPerCharacter());
     }
 
     /**
@@ -818,7 +818,7 @@ public function testHashBitsPerCharacterAltersIniSetting($hashBitsPerCharacter)
     {
         $this->assertPhpLessThan71('session.hash_bits_per_character directive removed in PHP 7.1');
         $this->config->setHashBitsPerCharacter($hashBitsPerCharacter);
-        $this->assertEquals($hashBitsPerCharacter, ini_get('session.hash_bits_per_character'));
+        self::assertEquals($hashBitsPerCharacter, ini_get('session.hash_bits_per_character'));
     }
 
     public function testSettingInvalidHashBitsPerCharacterRaisesException()
@@ -854,7 +854,7 @@ public function testSetHashBitsPerCharacterError()
      */
     public function testSidLengthDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.sid_length'), $this->config->getSidLength());
+        self::assertSame(ini_get('session.sid_length'), $this->config->getSidLength());
     }
 
     /**
@@ -863,7 +863,7 @@ public function testSidLengthDefaultsToIniSettings()
     public function testSidLengthIsMutable()
     {
         $this->config->setSidLength(40);
-        $this->assertEquals(40, $this->config->getSidLength());
+        self::assertEquals(40, $this->config->getSidLength());
     }
 
     /**
@@ -872,7 +872,7 @@ public function testSidLengthIsMutable()
     public function testSidLengthAltersIniSetting()
     {
         $this->config->setSidLength(40);
-        $this->assertEquals(40, ini_get('session.sid_length'));
+        self::assertEquals(40, ini_get('session.sid_length'));
     }
 
     /**
@@ -911,7 +911,7 @@ public function sidSidPerCharacters()
      */
     public function testSidBitsPerCharacterDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('session.sid_bits_per_character'), $this->config->getSidBitsPerCharacter());
+        self::assertSame(ini_get('session.sid_bits_per_character'), $this->config->getSidBitsPerCharacter());
     }
 
     /**
@@ -921,7 +921,7 @@ public function testSidBitsPerCharacterDefaultsToIniSettings()
     public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter)
     {
         $this->config->setSidBitsPerCharacter($sidBitsPerCharacter);
-        $this->assertEquals($sidBitsPerCharacter, $this->config->getSidBitsPerCharacter());
+        self::assertEquals($sidBitsPerCharacter, $this->config->getSidBitsPerCharacter());
     }
 
     /**
@@ -931,7 +931,7 @@ public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter)
     public function testSidBitsPerCharacterAltersIniSetting($sidBitsPerCharacter)
     {
         $this->config->setSidBitsPerCharacter($sidBitsPerCharacter);
-        $this->assertEquals($sidBitsPerCharacter, ini_get('session.sid_bits_per_character'));
+        self::assertEquals($sidBitsPerCharacter, ini_get('session.sid_bits_per_character'));
     }
 
     /**
@@ -958,32 +958,32 @@ public function testSettingOutOfBoundSidBitsPerCharacterRaisesException()
 
     public function testUrlRewriterTagsDefaultsToIniSettings()
     {
-        $this->assertSame(ini_get('url_rewriter.tags'), $this->config->getUrlRewriterTags());
+        self::assertSame(ini_get('url_rewriter.tags'), $this->config->getUrlRewriterTags());
     }
 
     public function testUrlRewriterTagsIsMutable()
     {
         $this->config->setUrlRewriterTags('a=href,form=action');
-        $this->assertEquals('a=href,form=action', $this->config->getUrlRewriterTags());
+        self::assertEquals('a=href,form=action', $this->config->getUrlRewriterTags());
     }
 
     public function testUrlRewriterTagsAltersIniSetting()
     {
         $this->config->setUrlRewriterTags('a=href,fieldset=');
-        $this->assertEquals('a=href,fieldset=', ini_get('url_rewriter.tags'));
+        self::assertEquals('a=href,fieldset=', ini_get('url_rewriter.tags'));
     }
 
     // remember_me_seconds
 
     public function testRememberMeSecondsDefaultsToTwoWeeks()
     {
-        $this->assertEquals(1209600, $this->config->getRememberMeSeconds());
+        self::assertEquals(1209600, $this->config->getRememberMeSeconds());
     }
 
     public function testRememberMeSecondsIsMutable()
     {
         $this->config->setRememberMeSeconds(604800);
-        $this->assertEquals(604800, $this->config->getRememberMeSeconds());
+        self::assertEquals(604800, $this->config->getRememberMeSeconds());
     }
 
     // setOption
@@ -995,23 +995,23 @@ public function testSetOptionSetsIniSetting($option, $getter, $value)
     {
         // Leaving out special cases.
         if ($option == 'remember_me_seconds' || $option == 'url_rewriter_tags') {
-            $this->markTestSkipped('remember_me_seconds && url_rewriter_tags');
+            self::markTestSkipped('remember_me_seconds && url_rewriter_tags');
         }
 
         $this->config->setStorageOption($option, $value);
-        $this->assertEquals(ini_get('session.' . $option), $value);
+        self::assertEquals(ini_get('session.' . $option), $value);
     }
 
     public function testSetOptionUrlRewriterTagsGetsMunged()
     {
         $value = 'a=href';
         $this->config->setStorageOption('url_rewriter_tags', $value);
-        $this->assertEquals(ini_get('url_rewriter.tags'), $value);
+        self::assertEquals(ini_get('url_rewriter.tags'), $value);
     }
 
     public function testSetOptionRememberMeSecondsDoesNothing()
     {
-        $this->markTestIncomplete('I have no idea how to test this.');
+        self::markTestIncomplete('I have no idea how to test this.');
     }
 
     public function testSetOptionsThrowsExceptionOnInvalidKey()
@@ -1033,9 +1033,9 @@ public function testSetOptionsTranslatesUnderscoreSeparatedKeys($option, $getter
         $options = [$option => $value];
         $this->config->setOptions($options);
         if ('getOption' == $getter) {
-            $this->assertSame($value, $this->config->getOption($option));
+            self::assertSame($value, $this->config->getOption($option));
         } else {
-            $this->assertSame($value, $this->config->$getter());
+            self::assertSame($value, $this->config->$getter());
         }
     }
 
@@ -1217,45 +1217,53 @@ public function testProvidingValidKnownSessionHandlerToSetPhpSaveHandlerResultsI
     {
         $phpinfo = $this->getFunctionMock('Laminas\Session\Config', 'phpinfo');
         $phpinfo
-            ->expects($this->once())
-            ->will($this->returnCallback(function () {
-                echo "Registered save handlers => user files unittest";
-            }));
+            ->expects(self::once())
+            ->will(
+                self::returnCallback(
+                    function () {
+                        echo "Registered save handlers => user files unittest";
+                    }
+                )
+            );
 
         $sessionModuleName = $this->getFunctionMock('Laminas\Session\Config', 'session_module_name');
-        $sessionModuleName->expects($this->once());
+        $sessionModuleName->expects(self::once());
 
-        $this->assertSame($this->config, $this->config->setPhpSaveHandler('unittest'));
-        $this->assertEquals('unittest', $this->config->getOption('save_handler'));
+        self::assertSame($this->config, $this->config->setPhpSaveHandler('unittest'));
+        self::assertEquals('unittest', $this->config->getOption('save_handler'));
     }
 
     public function testCanProvidePathWhenUsingRedisSaveHandler()
     {
         $phpinfo = $this->getFunctionMock('Laminas\Session\Config', 'phpinfo');
         $phpinfo
-            ->expects($this->once())
-            ->will($this->returnCallback(function () {
-                echo "Registered save handlers => user files redis";
-            }));
+            ->expects(self::once())
+            ->will(
+                self::returnCallback(
+                    function () {
+                        echo "Registered save handlers => user files redis";
+                    }
+                )
+            );
 
         $sessionModuleName = $this->getFunctionMock('Laminas\Session\Config', 'session_module_name');
         $sessionModuleName
-            ->expects($this->once())
-            ->with($this->equalTo('redis'));
+            ->expects(self::once())
+            ->with(self::equalTo('redis'));
 
         $url = 'tcp://localhost:6379?auth=foobar&database=1';
 
         $this->config->setOption('save_handler', 'redis');
         $this->config->setOption('save_path', $url);
 
-        $this->assertSame($url, $this->config->getOption('save_path'));
+        self::assertSame($url, $this->config->getOption('save_path'));
     }
 
     public function testNotCallLocateRegisteredSaveHandlersMethodIfSessionHandlerInterfaceWasPassed()
     {
         $phpinfo = $this->getFunctionMock('Laminas\Session\Config', 'phpinfo');
         $phpinfo
-            ->expects($this->never());
+            ->expects(self::never());
 
         $saveHandler = $this->createMock(SessionHandlerInterface::class);
         $this->config->setPhpSaveHandler($saveHandler);
diff --git a/test/Config/StandardConfigTest.php b/test/Config/StandardConfigTest.php
index ee0c0927..e74b4282 100644
--- a/test/Config/StandardConfigTest.php
+++ b/test/Config/StandardConfigTest.php
@@ -38,14 +38,14 @@ public function testSetSavePathErrorsOnInvalidPath()
     public function testSavePathIsMutable()
     {
         $this->config->setSavePath(__DIR__);
-        $this->assertEquals(__DIR__, $this->config->getSavePath());
+        self::assertEquals(__DIR__, $this->config->getSavePath());
     }
     // session.name
 
     public function testNameIsMutable()
     {
         $this->config->setName('FOOBAR');
-        $this->assertEquals('FOOBAR', $this->config->getName());
+        self::assertEquals('FOOBAR', $this->config->getName());
     }
 
     // session.save_handler
@@ -53,7 +53,7 @@ public function testNameIsMutable()
     public function testSaveHandlerIsMutable()
     {
         $this->config->setSaveHandler('user');
-        $this->assertEquals('user', $this->config->getSaveHandler());
+        self::assertEquals('user', $this->config->getSaveHandler());
     }
 
     // session.gc_probability
@@ -61,13 +61,13 @@ public function testSaveHandlerIsMutable()
     public function testGcProbabilityIsMutable()
     {
         $this->config->setGcProbability(20);
-        $this->assertEquals(20, $this->config->getGcProbability());
+        self::assertEquals(20, $this->config->getGcProbability());
     }
 
     public function testGcProbabilityCanBeSetToZero()
     {
         $this->config->setGcProbability(0);
-        $this->assertEquals(0, $this->config->getGcProbability());
+        self::assertEquals(0, $this->config->getGcProbability());
     }
 
     public function testSettingInvalidGcProbabilityRaisesException()
@@ -96,7 +96,7 @@ public function testSettingInvalidGcProbabilityRaisesException3()
     public function testGcDivisorIsMutable()
     {
         $this->config->setGcDivisor(20);
-        $this->assertEquals(20, $this->config->getGcDivisor());
+        self::assertEquals(20, $this->config->getGcDivisor());
     }
 
     public function testSettingInvalidGcDivisorRaisesException()
@@ -118,7 +118,7 @@ public function testSettingInvalidGcDivisorRaisesException2()
     public function testGcMaxlifetimeIsMutable()
     {
         $this->config->setGcMaxlifetime(20);
-        $this->assertEquals(20, $this->config->getGcMaxlifetime());
+        self::assertEquals(20, $this->config->getGcMaxlifetime());
     }
 
     public function testSettingInvalidGcMaxlifetimeRaisesException()
@@ -141,7 +141,7 @@ public function testSerializeHandlerIsMutable()
     {
         $value = extension_loaded('wddx') ? 'wddx' : 'php_binary';
         $this->config->setSerializeHandler($value);
-        $this->assertEquals($value, $this->config->getSerializeHandler());
+        self::assertEquals($value, $this->config->getSerializeHandler());
     }
 
     // session.cookie_lifetime
@@ -149,13 +149,13 @@ public function testSerializeHandlerIsMutable()
     public function testCookieLifetimeIsMutable()
     {
         $this->config->setCookieLifetime(20);
-        $this->assertEquals(20, $this->config->getCookieLifetime());
+        self::assertEquals(20, $this->config->getCookieLifetime());
     }
 
     public function testCookieLifetimeCanBeZero()
     {
         $this->config->setCookieLifetime(0);
-        $this->assertEquals(0, $this->config->getCookieLifetime());
+        self::assertEquals(0, $this->config->getCookieLifetime());
     }
 
     public function testSettingInvalidCookieLifetimeRaisesException()
@@ -177,7 +177,7 @@ public function testSettingInvalidCookieLifetimeRaisesException2()
     public function testCookiePathIsMutable()
     {
         $this->config->setCookiePath('/foo');
-        $this->assertEquals('/foo', $this->config->getCookiePath());
+        self::assertEquals('/foo', $this->config->getCookiePath());
     }
 
     public function testSettingInvalidCookiePathRaisesException()
@@ -206,13 +206,13 @@ public function testSettingInvalidCookiePathRaisesException3()
     public function testCookieDomainIsMutable()
     {
         $this->config->setCookieDomain('example.com');
-        $this->assertEquals('example.com', $this->config->getCookieDomain());
+        self::assertEquals('example.com', $this->config->getCookieDomain());
     }
 
     public function testCookieDomainCanBeEmpty()
     {
         $this->config->setCookieDomain('');
-        $this->assertEquals('', $this->config->getCookieDomain());
+        self::assertEquals('', $this->config->getCookieDomain());
     }
 
     public function testSettingInvalidCookieDomainRaisesException()
@@ -234,7 +234,7 @@ public function testSettingInvalidCookieDomainRaisesException2()
     public function testCookieSecureIsMutable()
     {
         $this->config->setCookieSecure(true);
-        $this->assertEquals(true, $this->config->getCookieSecure());
+        self::assertEquals(true, $this->config->getCookieSecure());
     }
 
     // session.cookie_httponly
@@ -242,7 +242,7 @@ public function testCookieSecureIsMutable()
     public function testCookieHttpOnlyIsMutable()
     {
         $this->config->setCookieHttpOnly(true);
-        $this->assertEquals(true, $this->config->getCookieHttpOnly());
+        self::assertEquals(true, $this->config->getCookieHttpOnly());
     }
 
     // session.use_cookies
@@ -250,7 +250,7 @@ public function testCookieHttpOnlyIsMutable()
     public function testUseCookiesIsMutable()
     {
         $this->config->setUseCookies(true);
-        $this->assertEquals(true, (bool) $this->config->getUseCookies());
+        self::assertEquals(true, (bool)$this->config->getUseCookies());
     }
 
     // session.use_only_cookies
@@ -258,7 +258,7 @@ public function testUseCookiesIsMutable()
     public function testUseOnlyCookiesIsMutable()
     {
         $this->config->setUseOnlyCookies(true);
-        $this->assertEquals(true, (bool) $this->config->getUseOnlyCookies());
+        self::assertEquals(true, (bool)$this->config->getUseOnlyCookies());
     }
 
     // session.referer_check
@@ -266,13 +266,13 @@ public function testUseOnlyCookiesIsMutable()
     public function testRefererCheckIsMutable()
     {
         $this->config->setRefererCheck('FOOBAR');
-        $this->assertEquals('FOOBAR', $this->config->getRefererCheck());
+        self::assertEquals('FOOBAR', $this->config->getRefererCheck());
     }
 
     public function testRefererCheckMayBeEmpty()
     {
         $this->config->setRefererCheck('');
-        $this->assertEquals('', $this->config->getRefererCheck());
+        self::assertEquals('', $this->config->getRefererCheck());
     }
 
     // session.entropy_file
@@ -280,7 +280,7 @@ public function testRefererCheckMayBeEmpty()
     public function testSetEntropyFileErrorsOnInvalidPath()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.entropy_file directive removed in PHP 7.1');
+            self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
         }
 
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -291,11 +291,11 @@ public function testSetEntropyFileErrorsOnInvalidPath()
     public function testEntropyFileIsMutable()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.entropy_file directive removed in PHP 7.1');
+            self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
         }
 
         $this->config->setEntropyFile(__FILE__);
-        $this->assertEquals(__FILE__, $this->config->getEntropyFile());
+        self::assertEquals(__FILE__, $this->config->getEntropyFile());
     }
 
     /**
@@ -321,27 +321,27 @@ public function testGetEntropyFileError()
     public function testEntropyLengthIsMutable()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.entropy_length directive removed in PHP 7.1');
+            self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
         }
 
         $this->config->setEntropyLength(20);
-        $this->assertEquals(20, $this->config->getEntropyLength());
+        self::assertEquals(20, $this->config->getEntropyLength());
     }
 
     public function testEntropyLengthCanBeZero()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.entropy_length directive removed in PHP 7.1');
+            self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
         }
 
         $this->config->setEntropyLength(0);
-        $this->assertEquals(0, $this->config->getEntropyLength());
+        self::assertEquals(0, $this->config->getEntropyLength());
     }
 
     public function testSettingInvalidEntropyLengthRaisesException()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.entropy_length directive removed in PHP 7.1');
+            self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
         }
 
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -352,7 +352,7 @@ public function testSettingInvalidEntropyLengthRaisesException()
     public function testSettingInvalidEntropyLengthRaisesException2()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.entropy_length directive removed in PHP 7.1');
+            self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
         }
 
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -396,7 +396,7 @@ public function cacheLimiters()
     public function testCacheLimiterIsMutable($cacheLimiter)
     {
         $this->config->setCacheLimiter($cacheLimiter);
-        $this->assertEquals($cacheLimiter, $this->config->getCacheLimiter());
+        self::assertEquals($cacheLimiter, $this->config->getCacheLimiter());
     }
 
     // session.cache_expire
@@ -404,7 +404,7 @@ public function testCacheLimiterIsMutable($cacheLimiter)
     public function testCacheExpireIsMutable()
     {
         $this->config->setCacheExpire(20);
-        $this->assertEquals(20, $this->config->getCacheExpire());
+        self::assertEquals(20, $this->config->getCacheExpire());
     }
 
     public function testSettingInvalidCacheExpireRaisesException()
@@ -426,7 +426,7 @@ public function testSettingInvalidCacheExpireRaisesException2()
     public function testUseTransSidIsMutable()
     {
         $this->config->setUseTransSid(true);
-        $this->assertEquals(true, (bool) $this->config->getUseTransSid());
+        self::assertEquals(true, (bool)$this->config->getUseTransSid());
     }
 
     // session.hash_function
@@ -447,11 +447,11 @@ public function hashFunctions()
     public function testHashFunctionIsMutable($hashFunction)
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.hash_function directive removed in PHP 7.1');
+            self::markTestSkipped('session.hash_function directive removed in PHP 7.1');
         }
 
         $this->config->setHashFunction($hashFunction);
-        $this->assertEquals($hashFunction, $this->config->getHashFunction());
+        self::assertEquals($hashFunction, $this->config->getHashFunction());
     }
 
     /**
@@ -489,17 +489,17 @@ public function hashBitsPerCharacters()
     public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter)
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
+            self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
         }
 
         $this->config->setHashBitsPerCharacter($hashBitsPerCharacter);
-        $this->assertEquals($hashBitsPerCharacter, $this->config->getHashBitsPerCharacter());
+        self::assertEquals($hashBitsPerCharacter, $this->config->getHashBitsPerCharacter());
     }
 
     public function testSettingInvalidHashBitsPerCharacterRaisesException()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
+            self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
         }
 
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -533,7 +533,7 @@ public function testSetHashBitsPerCharacterError()
     public function testSidLengthIsMutable()
     {
         $this->config->setSidLength(40);
-        $this->assertEquals(40, $this->config->getSidLength());
+        self::assertEquals(40, $this->config->getSidLength());
     }
 
     /**
@@ -574,7 +574,7 @@ public function sidBitsPerCharacters()
     public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter)
     {
         $this->config->setSidBitsPerCharacter($sidBitsPerCharacter);
-        $this->assertEquals($sidBitsPerCharacter, $this->config->getSidBitsPerCharacter());
+        self::assertEquals($sidBitsPerCharacter, $this->config->getSidBitsPerCharacter());
     }
 
     /**
@@ -592,7 +592,7 @@ public function testSettingInvalidSidBitsPerCharacterRaisesException()
     public function testUrlRewriterTagsIsMutable()
     {
         $this->config->setUrlRewriterTags('a=href,form=action');
-        $this->assertEquals('a=href,form=action', $this->config->getUrlRewriterTags());
+        self::assertEquals('a=href,form=action', $this->config->getUrlRewriterTags());
     }
 
     // remember_me_seconds
@@ -600,7 +600,7 @@ public function testUrlRewriterTagsIsMutable()
     public function testRememberMeSecondsIsMutable()
     {
         $this->config->setRememberMeSeconds(20);
-        $this->assertEquals(20, $this->config->getRememberMeSeconds());
+        self::assertEquals(20, $this->config->getRememberMeSeconds());
     }
 
     public function testSettingInvalidRememberMeSecondsRaisesException()
@@ -626,7 +626,7 @@ public function testSetOptionsTranslatesUnderscoreSeparatedKeys($option, $getter
     {
         $options = [$option => $value];
         $this->config->setOptions($options);
-        $this->assertSame($value, $this->config->$getter());
+        self::assertSame($value, $this->config->$getter());
     }
 
     public function optionsProvider()
@@ -774,15 +774,15 @@ public function optionsProvider()
     public function testSetEntropyDevUrandom()
     {
         if (PHP_VERSION_ID >= 70100) {
-            $this->markTestSkipped('session.entropy_file directive removed in PHP 7.1');
+            self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
         }
 
         if (! file_exists('/dev/urandom')) {
-            $this->markTestSkipped(
+            self::markTestSkipped(
                 "This test doesn't work because /dev/urandom file doesn't exist."
             );
         }
         $result = $this->config->setEntropyFile('/dev/urandom');
-        $this->assertInstanceOf('Laminas\Session\Config\StandardConfig', $result);
+        self::assertInstanceOf('Laminas\Session\Config\StandardConfig', $result);
     }
 }
diff --git a/test/ContainerTest.php b/test/ContainerTest.php
index b1aaa6f3..0b215958 100644
--- a/test/ContainerTest.php
+++ b/test/ContainerTest.php
@@ -62,36 +62,36 @@ public function testInstantiationStartsSession()
     {
         $this->manager->destroy();
         $container = new Container('Default', $this->manager);
-        $this->assertTrue($this->manager->started);
+        self::assertTrue($this->manager->started);
     }
 
     public function testInstantiatingContainerWithoutNameUsesDefaultAsName()
     {
-        $this->assertEquals('Default', $this->container->getName());
+        self::assertEquals('Default', $this->container->getName());
     }
 
     public function testPassingNameToConstructorInstantiatesContainerWithThatName()
     {
         $container = new Container('foo', $this->manager);
-        $this->assertEquals('foo', $container->getName());
+        self::assertEquals('foo', $container->getName());
     }
 
     public function testPassingNameStartingWithDigitToConstructorInstantiatesContainerWithThatName()
     {
         $container = new Container('0foo', $this->manager);
-        $this->assertEquals('0foo', $container->getName());
+        self::assertEquals('0foo', $container->getName());
     }
 
     public function testUsingOldLaminas1NameIsStillValid()
     {
         $container = new Container('Laminas_Foo', $this->manager);
-        $this->assertEquals('Laminas_Foo', $container->getName());
+        self::assertEquals('Laminas_Foo', $container->getName());
     }
 
     public function testUsingNewLaminasNamespaceIsValid()
     {
         $container = new Container('Laminas\Foo', $this->manager);
-        $this->assertEquals('Laminas\Foo', $container->getName());
+        self::assertEquals('Laminas\Foo', $container->getName());
     }
 
     public function testPassingInvalidNameToConstructorRaisesException()
@@ -107,9 +107,9 @@ public function testPassingInvalidNameToConstructorRaisesException()
         foreach ($tries as $try) {
             try {
                 $container = new Container($try);
-                $this->fail('Invalid container name should raise exception');
+                self::fail('Invalid container name should raise exception');
             } catch (InvalidArgumentException $e) {
-                $this->assertStringContainsString('invalid', $e->getMessage());
+                self::assertStringContainsString('invalid', $e->getMessage());
             }
         }
     }
@@ -117,32 +117,32 @@ public function testPassingInvalidNameToConstructorRaisesException()
     public function testContainerActsAsArray()
     {
         $this->container['foo'] = 'bar';
-        $this->assertTrue(isset($this->container['foo']));
-        $this->assertEquals('bar', $this->container['foo']);
+        self::assertTrue(isset($this->container['foo']));
+        self::assertEquals('bar', $this->container['foo']);
         unset($this->container['foo']);
-        $this->assertFalse(isset($this->container['foo']));
+        self::assertFalse(isset($this->container['foo']));
     }
 
     public function testContainerActsAsObject()
     {
         $this->container->foo = 'bar';
-        $this->assertTrue(isset($this->container->foo));
-        $this->assertEquals('bar', $this->container->foo);
+        self::assertTrue(isset($this->container->foo));
+        self::assertEquals('bar', $this->container->foo);
         unset($this->container->foo);
-        $this->assertFalse(isset($this->container->foo));
+        self::assertFalse(isset($this->container->foo));
     }
 
     public function testDefaultManagerIsAlwaysPopulated()
     {
         $manager = Container::getDefaultManager();
-        $this->assertInstanceOf('Laminas\Session\ManagerInterface', $manager);
+        self::assertInstanceOf('Laminas\Session\ManagerInterface', $manager);
     }
 
     public function testCanSetDefaultManager()
     {
         $manager = new TestAsset\TestManager();
         Container::setDefaultManager($manager);
-        $this->assertSame($manager, Container::getDefaultManager());
+        self::assertSame($manager, Container::getDefaultManager());
     }
 
     public function testCanSetDefaultManagerToNull()
@@ -150,25 +150,25 @@ public function testCanSetDefaultManagerToNull()
         $manager = new TestAsset\TestManager();
         Container::setDefaultManager($manager);
         Container::setDefaultManager(null);
-        $this->assertNotSame($manager, Container::getDefaultManager());
+        self::assertNotSame($manager, Container::getDefaultManager());
     }
 
     public function testDefaultManagerUsedWhenNoManagerProvided()
     {
         $manager   = Container::getDefaultManager();
         $container = new Container();
-        $this->assertSame($manager, $container->getManager());
+        self::assertSame($manager, $container->getManager());
     }
 
     public function testContainerInstantiatesManagerWithDefaultsWhenNotInjected()
     {
         $container = new Container();
         $manager   = $container->getManager();
-        $this->assertInstanceOf('Laminas\Session\ManagerInterface', $manager);
+        self::assertInstanceOf('Laminas\Session\ManagerInterface', $manager);
         $config = $manager->getConfig();
-        $this->assertInstanceOf('Laminas\Session\Config\SessionConfig', $config);
+        self::assertInstanceOf('Laminas\Session\Config\SessionConfig', $config);
         $storage = $manager->getStorage();
-        $this->assertInstanceOf('Laminas\Session\Storage\SessionArrayStorage', $storage);
+        self::assertInstanceOf('Laminas\Session\Storage\SessionArrayStorage', $storage);
     }
 
     public function testContainerAllowsInjectingManagerViaConstructor()
@@ -178,19 +178,19 @@ public function testContainerAllowsInjectingManagerViaConstructor()
         ]);
         $manager   = new TestAsset\TestManager($config);
         $container = new Container('Foo', $manager);
-        $this->assertSame($manager, $container->getManager());
+        self::assertSame($manager, $container->getManager());
     }
 
     public function testContainerWritesToStorage()
     {
         $this->container->foo = 'bar';
         $storage              = $this->manager->getStorage();
-        $this->assertTrue(isset($storage['Default']));
-        $this->assertTrue(isset($storage['Default']['foo']));
-        $this->assertEquals('bar', $storage['Default']['foo']);
+        self::assertTrue(isset($storage['Default']));
+        self::assertTrue(isset($storage['Default']['foo']));
+        self::assertEquals('bar', $storage['Default']['foo']);
 
         unset($this->container->foo);
-        $this->assertFalse(isset($storage['Default']['foo']));
+        self::assertFalse(isset($storage['Default']['foo']));
     }
 
     public function testSettingExpirationSecondsUpdatesStorageMetadataForFullContainer()
@@ -199,8 +199,8 @@ public function testSettingExpirationSecondsUpdatesStorageMetadataForFullContain
         $this->container->setExpirationSeconds(3600);
         $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
-        $this->assertArrayHasKey('EXPIRE', $metadata);
-        $this->assertEquals($currentTimestamp + 3600, $metadata['EXPIRE']);
+        self::assertArrayHasKey('EXPIRE', $metadata);
+        self::assertEquals($currentTimestamp + 3600, $metadata['EXPIRE']);
     }
 
     public function testSettingExpirationSecondsForIndividualKeyUpdatesStorageMetadataForThatKey()
@@ -210,9 +210,9 @@ public function testSettingExpirationSecondsForIndividualKeyUpdatesStorageMetada
         $this->container->setExpirationSeconds(3600, 'foo');
         $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
-        $this->assertArrayHasKey('EXPIRE_KEYS', $metadata);
-        $this->assertArrayHasKey('foo', $metadata['EXPIRE_KEYS']);
-        $this->assertEquals($currentTimestamp + 3600, $metadata['EXPIRE_KEYS']['foo']);
+        self::assertArrayHasKey('EXPIRE_KEYS', $metadata);
+        self::assertArrayHasKey('foo', $metadata['EXPIRE_KEYS']);
+        self::assertEquals($currentTimestamp + 3600, $metadata['EXPIRE_KEYS']['foo']);
     }
 
     public function testMultipleCallsToExpirationSecondsAggregates()
@@ -227,10 +227,10 @@ public function testMultipleCallsToExpirationSecondsAggregates()
         $this->container->setExpirationSeconds(900, ['baz', 'bat']);
         $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
-        $this->assertEquals($currentTimestamp + 1800, $metadata['EXPIRE_KEYS']['foo']);
-        $this->assertEquals($currentTimestamp + 900, $metadata['EXPIRE_KEYS']['baz']);
-        $this->assertEquals($currentTimestamp + 900, $metadata['EXPIRE_KEYS']['bat']);
-        $this->assertEquals($currentTimestamp + 3600, $metadata['EXPIRE']);
+        self::assertEquals($currentTimestamp + 1800, $metadata['EXPIRE_KEYS']['foo']);
+        self::assertEquals($currentTimestamp + 900, $metadata['EXPIRE_KEYS']['baz']);
+        self::assertEquals($currentTimestamp + 900, $metadata['EXPIRE_KEYS']['bat']);
+        self::assertEquals($currentTimestamp + 3600, $metadata['EXPIRE']);
     }
 
     public function testSettingExpirationSecondsUsesCurrentTime()
@@ -243,7 +243,7 @@ public function testSettingExpirationSecondsUsesCurrentTime()
         $_SERVER['REQUEST_TIME']       = time();
         $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
 
-        $this->assertEquals('bar', $this->container->foo);
+        self::assertEquals('bar', $this->container->foo);
     }
 
     public function testPassingUnsetKeyToSetExpirationSecondsDoesNothing()
@@ -251,7 +251,7 @@ public function testPassingUnsetKeyToSetExpirationSecondsDoesNothing()
         $this->container->setExpirationSeconds(3600, 'foo');
         $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
-        $this->assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
+        self::assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
     }
 
     public function testPassingUnsetKeyInArrayToSetExpirationSecondsDoesNothing()
@@ -259,7 +259,7 @@ public function testPassingUnsetKeyInArrayToSetExpirationSecondsDoesNothing()
         $this->container->setExpirationSeconds(3600, ['foo']);
         $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata($this->container->getName());
-        $this->assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
+        self::assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
     }
 
     public function testGetKeyWithContainerExpirationInPastResetsToNull()
@@ -267,7 +267,7 @@ public function testGetKeyWithContainerExpirationInPastResetsToNull()
         $this->container->foo = 'bar';
         $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE' => $_SERVER['REQUEST_TIME'] - 18600]);
-        $this->assertNull($this->container->foo);
+        self::assertNull($this->container->foo);
     }
 
     public function testGetKeyWithExpirationInPastResetsToNull()
@@ -276,8 +276,8 @@ public function testGetKeyWithExpirationInPastResetsToNull()
         $this->container->bar = 'baz';
         $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE_KEYS' => ['foo' => $_SERVER['REQUEST_TIME'] - 18600]]);
-        $this->assertNull($this->container->foo);
-        $this->assertEquals('baz', $this->container->bar);
+        self::assertNull($this->container->foo);
+        self::assertEquals('baz', $this->container->bar);
     }
 
     public function testKeyExistsWithContainerExpirationInPastReturnsFalse()
@@ -285,7 +285,7 @@ public function testKeyExistsWithContainerExpirationInPastReturnsFalse()
         $this->container->foo = 'bar';
         $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE' => $_SERVER['REQUEST_TIME'] - 18600]);
-        $this->assertFalse(isset($this->container->foo));
+        self::assertFalse(isset($this->container->foo));
     }
 
     public function testKeyExistsWithExpirationInPastReturnsFalse()
@@ -294,8 +294,8 @@ public function testKeyExistsWithExpirationInPastReturnsFalse()
         $this->container->bar = 'baz';
         $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE_KEYS' => ['foo' => $_SERVER['REQUEST_TIME'] - 18600]]);
-        $this->assertFalse(isset($this->container->foo));
-        $this->assertTrue(isset($this->container->bar));
+        self::assertFalse(isset($this->container->foo));
+        self::assertTrue(isset($this->container->bar));
     }
 
     public function testKeyExistsWithContainerExpirationInPastWithSetExpirationSecondsReturnsFalse()
@@ -304,7 +304,7 @@ public function testKeyExistsWithContainerExpirationInPastWithSetExpirationSecon
         $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE' => $_SERVER['REQUEST_TIME'] - 18600]);
         $this->container->setExpirationSeconds(1);
-        $this->assertFalse(isset($this->container->foo));
+        self::assertFalse(isset($this->container->foo));
     }
 
     public function testSettingExpiredKeyOverwritesExpiryMetadataForThatKey()
@@ -313,10 +313,10 @@ public function testSettingExpiredKeyOverwritesExpiryMetadataForThatKey()
         $storage              = $this->manager->getStorage();
         $storage->setMetadata('Default', ['EXPIRE' => $_SERVER['REQUEST_TIME'] - 18600]);
         $this->container->foo = 'baz';
-        $this->assertTrue(isset($this->container->foo));
-        $this->assertEquals('baz', $this->container->foo);
+        self::assertTrue(isset($this->container->foo));
+        self::assertEquals('baz', $this->container->foo);
         $metadata = $storage->getMetadata('Default');
-        $this->assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
+        self::assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
     }
 
     public function testSettingExpirationHopsWithNoVariablesMarksContainerByWritingToStorage()
@@ -324,8 +324,8 @@ public function testSettingExpirationHopsWithNoVariablesMarksContainerByWritingT
         $this->container->setExpirationHops(2);
         $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata('Default');
-        $this->assertArrayHasKey('EXPIRE_HOPS', $metadata);
-        $this->assertEquals(
+        self::assertArrayHasKey('EXPIRE_HOPS', $metadata);
+        self::assertEquals(
             ['hops' => 2, 'ts' => $storage->getRequestAccessTime()],
             $metadata['EXPIRE_HOPS']
         );
@@ -337,9 +337,9 @@ public function testSettingExpirationHopsWithSingleKeyMarksContainerByWritingToS
         $this->container->setExpirationHops(2, 'foo');
         $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata('Default');
-        $this->assertArrayHasKey('EXPIRE_HOPS_KEYS', $metadata);
-        $this->assertArrayHasKey('foo', $metadata['EXPIRE_HOPS_KEYS']);
-        $this->assertEquals(
+        self::assertArrayHasKey('EXPIRE_HOPS_KEYS', $metadata);
+        self::assertArrayHasKey('foo', $metadata['EXPIRE_HOPS_KEYS']);
+        self::assertEquals(
             ['hops' => 2, 'ts' => $storage->getRequestAccessTime()],
             $metadata['EXPIRE_HOPS_KEYS']['foo']
         );
@@ -353,7 +353,7 @@ public function testSettingExpirationHopsWithMultipleKeysMarksContainerByWriting
         $this->container->setExpirationHops(2, ['foo', 'baz']);
         $storage  = $this->manager->getStorage();
         $metadata = $storage->getMetadata('Default');
-        $this->assertArrayHasKey('EXPIRE_HOPS_KEYS', $metadata);
+        self::assertArrayHasKey('EXPIRE_HOPS_KEYS', $metadata);
 
         $hops     = $metadata['EXPIRE_HOPS_KEYS'];
         $ts       = $storage->getRequestAccessTime();
@@ -367,7 +367,7 @@ public function testSettingExpirationHopsWithMultipleKeysMarksContainerByWriting
                 'ts'   => $ts,
             ],
         ];
-        $this->assertEquals($expected, $hops);
+        self::assertEquals($expected, $hops);
     }
 
     public function testContainerExpiresAfterSpecifiedHops()
@@ -379,10 +379,10 @@ public function testContainerExpiresAfterSpecifiedHops()
         $ts      = $storage->getRequestAccessTime();
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 60);
-        $this->assertEquals('bar', $this->container->foo);
+        self::assertEquals('bar', $this->container->foo);
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 120);
-        $this->assertNull($this->container->foo);
+        self::assertNull($this->container->foo);
     }
 
     public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExtraHops()
@@ -391,8 +391,8 @@ public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExt
         $this->container->setExpirationHops(1);
 
         $container = new Container('Default', $this->manager);
-        $this->assertEquals('bar', $container->foo);
-        $this->assertEquals('bar', $this->container->foo);
+        self::assertEquals('bar', $container->foo);
+        self::assertEquals('bar', $this->container->foo);
     }
 
     public function testKeyExpiresAfterSpecifiedHops()
@@ -405,12 +405,12 @@ public function testKeyExpiresAfterSpecifiedHops()
         $ts      = $storage->getRequestAccessTime();
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 60);
-        $this->assertEquals('bar', $this->container->foo);
-        $this->assertEquals('baz', $this->container->bar);
+        self::assertEquals('bar', $this->container->foo);
+        self::assertEquals('baz', $this->container->bar);
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 120);
-        $this->assertNull($this->container->foo);
-        $this->assertEquals('baz', $this->container->bar);
+        self::assertNull($this->container->foo);
+        self::assertEquals('baz', $this->container->bar);
     }
 
     public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExtraKeyHops()
@@ -420,10 +420,10 @@ public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExt
         $this->container->setExpirationHops(1, 'foo');
 
         $container = new Container('Default', $this->manager);
-        $this->assertEquals('bar', $container->foo);
-        $this->assertEquals('bar', $this->container->foo);
-        $this->assertEquals('baz', $container->bar);
-        $this->assertEquals('baz', $this->container->bar);
+        self::assertEquals('bar', $container->foo);
+        self::assertEquals('bar', $this->container->foo);
+        self::assertEquals('baz', $container->bar);
+        self::assertEquals('baz', $this->container->bar);
     }
 
     public function testKeysExpireAfterSpecifiedHops()
@@ -437,14 +437,14 @@ public function testKeysExpireAfterSpecifiedHops()
         $ts      = $storage->getRequestAccessTime();
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 60);
-        $this->assertEquals('bar', $this->container->foo);
-        $this->assertEquals('baz', $this->container->bar);
-        $this->assertEquals('bat', $this->container->baz);
+        self::assertEquals('bar', $this->container->foo);
+        self::assertEquals('baz', $this->container->bar);
+        self::assertEquals('bat', $this->container->baz);
 
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 120);
-        $this->assertNull($this->container->foo);
-        $this->assertEquals('baz', $this->container->bar);
-        $this->assertNull($this->container->baz);
+        self::assertNull($this->container->foo);
+        self::assertEquals('baz', $this->container->bar);
+        self::assertNull($this->container->baz);
     }
 
     public function testCanIterateOverContainer()
@@ -461,7 +461,7 @@ public function testCanIterateOverContainer()
         foreach ($this->container as $key => $value) {
             $test[$key] = $value;
         }
-        $this->assertSame($expected, $test);
+        self::assertSame($expected, $test);
     }
 
     public function testIterationHonorsExpirationHops()
@@ -485,7 +485,7 @@ public function testIterationHonorsExpirationHops()
         foreach ($this->container as $key => $value) {
             $test[$key] = $value;
         }
-        $this->assertSame($expected, $test);
+        self::assertSame($expected, $test);
 
         // Second hop
         $storage->setMetadata('_REQUEST_ACCESS_TIME', $ts + 120);
@@ -494,7 +494,7 @@ public function testIterationHonorsExpirationHops()
         foreach ($this->container as $key => $value) {
             $test[$key] = $value;
         }
-        $this->assertSame($expected, $test);
+        self::assertSame($expected, $test);
     }
 
     public function testIterationHonorsExpirationTimestamps()
@@ -508,43 +508,43 @@ public function testIterationHonorsExpirationTimestamps()
         foreach ($this->container as $key => $value) {
             $test[$key] = $value;
         }
-        $this->assertSame($expected, $test);
+        self::assertSame($expected, $test);
     }
 
     public function testValidationShouldNotRaiseErrorForMissingResponseObject()
     {
         $session       = new Container('test');
         $session->test = 42;
-        $this->assertEquals(42, $session->test);
+        self::assertEquals(42, $session->test);
     }
 
     public function testExchangeArray()
     {
         $this->container->offsetSet('old', 'old');
-        $this->assertTrue($this->container->offsetExists('old'));
+        self::assertTrue($this->container->offsetExists('old'));
 
         $old = $this->container->exchangeArray(['new' => 'new']);
-        $this->assertArrayHasKey('old', $old, "'exchangeArray' doesn't return an array of old items");
-        $this->assertFalse($this->container->offsetExists('old'), "'exchangeArray' doesn't remove old items");
-        $this->assertTrue($this->container->offsetExists('new'), "'exchangeArray' doesn't add the new array items");
+        self::assertArrayHasKey('old', $old, "'exchangeArray' doesn't return an array of old items");
+        self::assertFalse($this->container->offsetExists('old'), "'exchangeArray' doesn't remove old items");
+        self::assertTrue($this->container->offsetExists('new'), "'exchangeArray' doesn't add the new array items");
     }
 
     public function testExchangeArrayObject()
     {
         $this->container->offsetSet('old', 'old');
-        $this->assertTrue($this->container->offsetExists('old'));
+        self::assertTrue($this->container->offsetExists('old'));
 
         $old = $this->container->exchangeArray(new \Laminas\Stdlib\ArrayObject(['new' => 'new']));
-        $this->assertArrayHasKey('old', $old, "'exchangeArray' doesn't return an array of old items");
-        $this->assertFalse($this->container->offsetExists('old'), "'exchangeArray' doesn't remove old items");
-        $this->assertTrue($this->container->offsetExists('new'), "'exchangeArray' doesn't add the new array items");
+        self::assertArrayHasKey('old', $old, "'exchangeArray' doesn't return an array of old items");
+        self::assertFalse($this->container->offsetExists('old'), "'exchangeArray' doesn't remove old items");
+        self::assertTrue($this->container->offsetExists('new'), "'exchangeArray' doesn't add the new array items");
     }
 
     public function testMultiDimensionalUnset()
     {
         $this->container->foo = ['bar' => 'baz'];
         unset($this->container['foo']['bar']);
-        $this->assertSame([], $this->container->foo);
+        self::assertSame([], $this->container->foo);
     }
 
     public function testUpgradeBehaviors()
@@ -553,9 +553,9 @@ public function testUpgradeBehaviors()
         $storage['foo'] = new ArrayObject(['bar' => 'baz']);
 
         $container = new Container('foo', $this->manager);
-        $this->assertEquals('baz', $container->bar);
+        self::assertEquals('baz', $container->bar);
         $container->baz = 'boo';
-        $this->assertEquals('boo', $storage['foo']['baz']);
+        self::assertEquals('boo', $storage['foo']['baz']);
     }
 
     public function testGetArrayCopyAfterExchangeArray()
@@ -564,7 +564,7 @@ public function testGetArrayCopyAfterExchangeArray()
 
         $contents = $this->container->getArrayCopy();
 
-        $this->assertIsArray($contents);
-        $this->assertArrayHasKey('foo', $contents, "'getArrayCopy' doesn't return exchanged array");
+        self::assertIsArray($contents);
+        self::assertArrayHasKey('foo', $contents, "'getArrayCopy' doesn't return exchanged array");
     }
 }
diff --git a/test/SaveHandler/CacheTest.php b/test/SaveHandler/CacheTest.php
index 1d9196c0..1a4aa436 100644
--- a/test/SaveHandler/CacheTest.php
+++ b/test/SaveHandler/CacheTest.php
@@ -58,10 +58,10 @@ public function testReadWrite()
 
         $id = '242';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
         $data = unserialize($saveHandler->read($id));
-        $this->assertEquals(
+        self::assertEquals(
             $this->testArray,
             $data,
             'Expected ' . var_export($this->testArray, 1) . "\nbut got: " . var_export($data, 1)
@@ -81,9 +81,9 @@ public function testReadWriteComplex()
 
         $id = '242';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
-        $this->assertEquals($this->testArray, unserialize($saveHandler->read($id)));
+        self::assertEquals($this->testArray, unserialize($saveHandler->read($id)));
     }
 
     public function testReadWriteTwice()
@@ -99,13 +99,13 @@ public function testReadWriteTwice()
 
         $id = '242';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
-        $this->assertEquals($this->testArray, unserialize($saveHandler->read($id)));
+        self::assertEquals($this->testArray, unserialize($saveHandler->read($id)));
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
-        $this->assertEquals($this->testArray, unserialize($saveHandler->read($id)));
+        self::assertEquals($this->testArray, unserialize($saveHandler->read($id)));
     }
 
     public function testReadShouldAlwaysReturnString()
@@ -118,7 +118,7 @@ public function testReadShouldAlwaysReturnString()
 
         $data = $saveHandler->read($id);
 
-        $this->assertTrue(is_string($data));
+        self::assertTrue(is_string($data));
     }
 
     public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist()
@@ -130,7 +130,7 @@ public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist()
 
         $result = $saveHandler->destroy($id);
 
-        $this->assertTrue($result);
+        self::assertTrue($result);
     }
 
     public function testDestroyReturnsTrueWhenSessionIsDeleted()
@@ -149,10 +149,10 @@ public function testDestroyReturnsTrueWhenSessionIsDeleted()
 
         $id = '242';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
         $result = $saveHandler->destroy($id);
 
-        $this->assertTrue($result);
+        self::assertTrue($result);
     }
 }
diff --git a/test/SaveHandler/DbTableGateway/MysqliAdapterTest.php b/test/SaveHandler/DbTableGateway/MysqliAdapterTest.php
index 45d6868a..f042693f 100644
--- a/test/SaveHandler/DbTableGateway/MysqliAdapterTest.php
+++ b/test/SaveHandler/DbTableGateway/MysqliAdapterTest.php
@@ -20,17 +20,21 @@ class MysqliAdapterTest extends DbTableGatewayTest
     protected function getAdapter()
     {
         if (! getenv('TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL')) {
-            $this->markTestSkipped(sprintf(
-                '%s tests with MySQL are disabled',
-                DbTableGateway::class
-            ));
+            self::markTestSkipped(
+                sprintf(
+                    '%s tests with MySQL are disabled',
+                    DbTableGateway::class
+                )
+            );
         }
 
         if (! extension_loaded('mysqli')) {
-            $this->markTestSkipped(sprintf(
-                '%s tests with Mysqli adapter are not enabled due to missing Mysqli extension',
-                DbTableGateway::class
-            ));
+            self::markTestSkipped(
+                sprintf(
+                    '%s tests with Mysqli adapter are not enabled due to missing Mysqli extension',
+                    DbTableGateway::class
+                )
+            );
         }
 
         return new Adapter([
diff --git a/test/SaveHandler/DbTableGateway/PdoMysqlAdapterTest.php b/test/SaveHandler/DbTableGateway/PdoMysqlAdapterTest.php
index 1bd2ec49..5ba673e3 100644
--- a/test/SaveHandler/DbTableGateway/PdoMysqlAdapterTest.php
+++ b/test/SaveHandler/DbTableGateway/PdoMysqlAdapterTest.php
@@ -20,17 +20,21 @@ class PdoMysqlAdapterTest extends DbTableGatewayTest
     protected function getAdapter()
     {
         if (! getenv('TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL')) {
-            $this->markTestSkipped(sprintf(
-                '%s tests with MySQL are disabled',
-                DbTableGateway::class
-            ));
+            self::markTestSkipped(
+                sprintf(
+                    '%s tests with MySQL are disabled',
+                    DbTableGateway::class
+                )
+            );
         }
 
         if (! extension_loaded('mysqli')) {
-            $this->markTestSkipped(sprintf(
-                '%s tests with PDO_Mysql adapter are not enabled due to missing PDO_Mysql extension',
-                DbTableGateway::class
-            ));
+            self::markTestSkipped(
+                sprintf(
+                    '%s tests with PDO_Mysql adapter are not enabled due to missing PDO_Mysql extension',
+                    DbTableGateway::class
+                )
+            );
         }
 
         return new Adapter([
diff --git a/test/SaveHandler/DbTableGateway/PdoSqliteAdapterTest.php b/test/SaveHandler/DbTableGateway/PdoSqliteAdapterTest.php
index b96f5ff1..296029b9 100644
--- a/test/SaveHandler/DbTableGateway/PdoSqliteAdapterTest.php
+++ b/test/SaveHandler/DbTableGateway/PdoSqliteAdapterTest.php
@@ -20,10 +20,12 @@ class PdoSqliteAdapterTest extends DbTableGatewayTest
     protected function getAdapter()
     {
         if (! extension_loaded('pdo_sqlite')) {
-            $this->markTestSkipped(sprintf(
-                '%s tests with PDO_Sqlite adapter are not enabled due to missing PDO_Sqlite extension',
-                DbTableGateway::class
-            ));
+            self::markTestSkipped(
+                sprintf(
+                    '%s tests with PDO_Sqlite adapter are not enabled due to missing PDO_Sqlite extension',
+                    DbTableGateway::class
+                )
+            );
         }
 
         return new Adapter([
diff --git a/test/SaveHandler/DbTableGateway/PgsqlAdapterTest.php b/test/SaveHandler/DbTableGateway/PgsqlAdapterTest.php
index 1dac4f1e..c65976be 100644
--- a/test/SaveHandler/DbTableGateway/PgsqlAdapterTest.php
+++ b/test/SaveHandler/DbTableGateway/PgsqlAdapterTest.php
@@ -20,17 +20,21 @@ class PgsqlAdapterTest extends DbTableGatewayTest
     protected function getAdapter()
     {
         if (! getenv('TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL')) {
-            $this->markTestSkipped(sprintf(
-                '%s tests with Pgsql adapter are disabled',
-                DbTableGateway::class
-            ));
+            self::markTestSkipped(
+                sprintf(
+                    '%s tests with Pgsql adapter are disabled',
+                    DbTableGateway::class
+                )
+            );
         }
 
         if (! extension_loaded('mysqli')) {
-            $this->markTestSkipped(sprintf(
-                '%s tests with Pgsql adapter are not enabled due to missing Pgsql extension',
-                DbTableGateway::class
-            ));
+            self::markTestSkipped(
+                sprintf(
+                    '%s tests with Pgsql adapter are not enabled due to missing Pgsql extension',
+                    DbTableGateway::class
+                )
+            );
         }
 
         return new Adapter([
diff --git a/test/SaveHandler/DbTableGatewayOptionsTest.php b/test/SaveHandler/DbTableGatewayOptionsTest.php
index 729c5c1c..1944dca5 100644
--- a/test/SaveHandler/DbTableGatewayOptionsTest.php
+++ b/test/SaveHandler/DbTableGatewayOptionsTest.php
@@ -22,28 +22,30 @@ class DbTableGatewayOptionsTest extends TestCase
     public function testDefaults()
     {
         $options = new DbTableGatewayOptions();
-        $this->assertEquals('id', $options->getIdColumn());
-        $this->assertEquals('name', $options->getNameColumn());
-        $this->assertEquals('modified', $options->getModifiedColumn());
-        $this->assertEquals('lifetime', $options->getLifetimeColumn());
-        $this->assertEquals('data', $options->getDataColumn());
+        self::assertEquals('id', $options->getIdColumn());
+        self::assertEquals('name', $options->getNameColumn());
+        self::assertEquals('modified', $options->getModifiedColumn());
+        self::assertEquals('lifetime', $options->getLifetimeColumn());
+        self::assertEquals('data', $options->getDataColumn());
     }
 
     public function testSetConstructor()
     {
-        $options = new DbTableGatewayOptions([
-            'idColumn'       => 'testId',
-            'nameColumn'     => 'testName',
-            'modifiedColumn' => 'testModified',
-            'lifetimeColumn' => 'testLifetime',
-            'dataColumn'     => 'testData',
-        ]);
+        $options = new DbTableGatewayOptions(
+            [
+                'idColumn'       => 'testId',
+                'nameColumn'     => 'testName',
+                'modifiedColumn' => 'testModified',
+                'lifetimeColumn' => 'testLifetime',
+                'dataColumn'     => 'testData',
+            ]
+        );
 
-        $this->assertEquals('testId', $options->getIdColumn());
-        $this->assertEquals('testName', $options->getNameColumn());
-        $this->assertEquals('testModified', $options->getModifiedColumn());
-        $this->assertEquals('testLifetime', $options->getLifetimeColumn());
-        $this->assertEquals('testData', $options->getDataColumn());
+        self::assertEquals('testId', $options->getIdColumn());
+        self::assertEquals('testName', $options->getNameColumn());
+        self::assertEquals('testModified', $options->getModifiedColumn());
+        self::assertEquals('testLifetime', $options->getLifetimeColumn());
+        self::assertEquals('testData', $options->getDataColumn());
     }
 
     public function testSetters()
@@ -55,11 +57,11 @@ public function testSetters()
             ->setLifetimeColumn('testLifetime')
             ->setDataColumn('testData');
 
-        $this->assertEquals('testId', $options->getIdColumn());
-        $this->assertEquals('testName', $options->getNameColumn());
-        $this->assertEquals('testModified', $options->getModifiedColumn());
-        $this->assertEquals('testLifetime', $options->getLifetimeColumn());
-        $this->assertEquals('testData', $options->getDataColumn());
+        self::assertEquals('testId', $options->getIdColumn());
+        self::assertEquals('testName', $options->getNameColumn());
+        self::assertEquals('testModified', $options->getModifiedColumn());
+        self::assertEquals('testLifetime', $options->getLifetimeColumn());
+        self::assertEquals('testData', $options->getDataColumn());
     }
 
     public function testInvalidIdColumn()
diff --git a/test/SaveHandler/DbTableGatewayTest.php b/test/SaveHandler/DbTableGatewayTest.php
index ed48aac1..14fc667f 100644
--- a/test/SaveHandler/DbTableGatewayTest.php
+++ b/test/SaveHandler/DbTableGatewayTest.php
@@ -100,10 +100,10 @@ public function testReadWrite()
 
         $id = '242';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
         $data = unserialize($saveHandler->read($id));
-        $this->assertEquals(
+        self::assertEquals(
             $this->testArray,
             $data,
             'Expected ' . var_export($this->testArray, 1) . "\nbut got: " . var_export($data, 1)
@@ -117,9 +117,9 @@ public function testReadWriteComplex()
 
         $id = '242';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
-        $this->assertEquals($this->testArray, unserialize($saveHandler->read($id)));
+        self::assertEquals($this->testArray, unserialize($saveHandler->read($id)));
     }
 
     public function testReadWriteTwice()
@@ -129,14 +129,14 @@ public function testReadWriteTwice()
 
         $id = '242';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
-        $this->assertEquals($this->testArray, unserialize($saveHandler->read($id)));
+        self::assertEquals($this->testArray, unserialize($saveHandler->read($id)));
 
         $updateData = $this->testArray + ['time' => microtime(true)];
-        $this->assertTrue($saveHandler->write($id, serialize($updateData)));
+        self::assertTrue($saveHandler->write($id, serialize($updateData)));
 
-        $this->assertEquals($updateData, unserialize($saveHandler->read($id)));
+        self::assertEquals($updateData, unserialize($saveHandler->read($id)));
     }
 
     public function testReadShouldAlwaysReturnString()
@@ -148,7 +148,7 @@ public function testReadShouldAlwaysReturnString()
 
         $data = $saveHandler->read($id);
 
-        $this->assertTrue(is_string($data));
+        self::assertTrue(is_string($data));
     }
 
     public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist()
@@ -160,7 +160,7 @@ public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist()
 
         $result = $saveHandler->destroy($id);
 
-        $this->assertTrue($result);
+        self::assertTrue($result);
     }
 
     public function testDestroyReturnsTrueWhenSessionIsDeleted()
@@ -170,11 +170,11 @@ public function testDestroyReturnsTrueWhenSessionIsDeleted()
 
         $id = '242';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
         $result = $saveHandler->destroy($id);
 
-        $this->assertTrue($result);
+        self::assertTrue($result);
     }
 
     public function testReadDestroysExpiredSession()
@@ -184,7 +184,7 @@ public function testReadDestroysExpiredSession()
 
         $id = '345';
 
-        $this->assertTrue($saveHandler->write($id, serialize($this->testArray)));
+        self::assertTrue($saveHandler->write($id, serialize($this->testArray)));
 
         // set lifetime to 0
         $query = <<<EOD
@@ -198,7 +198,7 @@ public function testReadDestroysExpiredSession()
 
         // check destroy session
         $result = $saveHandler->read($id);
-        $this->assertEquals($result, '');
+        self::assertEquals($result, '');
 
         // check if the record really has been deleted
         $result = $this->adapter->query(
@@ -210,7 +210,7 @@ public function testReadDestroysExpiredSession()
             Adapter::QUERY_MODE_EXECUTE
         );
 
-        $this->assertEquals(0, $result->count());
+        self::assertEquals(0, $result->count());
 
         // cleans the test record from the db
         $this->adapter->query(
diff --git a/test/SaveHandler/MongoDBOptionsTest.php b/test/SaveHandler/MongoDBOptionsTest.php
index fc39ee8b..0d9341d6 100644
--- a/test/SaveHandler/MongoDBOptionsTest.php
+++ b/test/SaveHandler/MongoDBOptionsTest.php
@@ -20,36 +20,38 @@ class MongoDBOptionsTest extends TestCase
     public function testDefaults()
     {
         $options = new MongoDBOptions();
-        $this->assertNull($options->getDatabase());
-        $this->assertNull($options->getCollection());
+        self::assertNull($options->getDatabase());
+        self::assertNull($options->getCollection());
         $mongoVersion       = phpversion('mongo') ?: '0.0.0';
         $defaultSaveOptions = version_compare($mongoVersion, '1.3.0', '<') ? ['safe' => true] : ['w' => 1];
-        $this->assertEquals($defaultSaveOptions, $options->getSaveOptions());
-        $this->assertEquals('name', $options->getNameField());
-        $this->assertEquals('data', $options->getDataField());
-        $this->assertEquals('lifetime', $options->getLifetimeField());
-        $this->assertEquals('modified', $options->getModifiedField());
+        self::assertEquals($defaultSaveOptions, $options->getSaveOptions());
+        self::assertEquals('name', $options->getNameField());
+        self::assertEquals('data', $options->getDataField());
+        self::assertEquals('lifetime', $options->getLifetimeField());
+        self::assertEquals('modified', $options->getModifiedField());
     }
 
     public function testSetConstructor()
     {
-        $options = new MongoDBOptions([
-            'database'      => 'testDatabase',
-            'collection'    => 'testCollection',
-            'saveOptions'   => ['w' => 2],
-            'nameField'     => 'testName',
-            'dataField'     => 'testData',
-            'lifetimeField' => 'testLifetime',
-            'modifiedField' => 'testModified',
-        ]);
+        $options = new MongoDBOptions(
+            [
+                'database'      => 'testDatabase',
+                'collection'    => 'testCollection',
+                'saveOptions'   => ['w' => 2],
+                'nameField'     => 'testName',
+                'dataField'     => 'testData',
+                'lifetimeField' => 'testLifetime',
+                'modifiedField' => 'testModified',
+            ]
+        );
 
-        $this->assertEquals('testDatabase', $options->getDatabase());
-        $this->assertEquals('testCollection', $options->getCollection());
-        $this->assertEquals(['w' => 2], $options->getSaveOptions());
-        $this->assertEquals('testName', $options->getNameField());
-        $this->assertEquals('testData', $options->getDataField());
-        $this->assertEquals('testLifetime', $options->getLifetimeField());
-        $this->assertEquals('testModified', $options->getModifiedField());
+        self::assertEquals('testDatabase', $options->getDatabase());
+        self::assertEquals('testCollection', $options->getCollection());
+        self::assertEquals(['w' => 2], $options->getSaveOptions());
+        self::assertEquals('testName', $options->getNameField());
+        self::assertEquals('testData', $options->getDataField());
+        self::assertEquals('testLifetime', $options->getLifetimeField());
+        self::assertEquals('testModified', $options->getModifiedField());
     }
 
     public function testSetters()
@@ -63,13 +65,13 @@ public function testSetters()
             ->setLifetimeField('testLifetime')
             ->setModifiedField('testModified');
 
-        $this->assertEquals('testDatabase', $options->getDatabase());
-        $this->assertEquals('testCollection', $options->getCollection());
-        $this->assertEquals(['w' => 2], $options->getSaveOptions());
-        $this->assertEquals('testName', $options->getNameField());
-        $this->assertEquals('testData', $options->getDataField());
-        $this->assertEquals('testLifetime', $options->getLifetimeField());
-        $this->assertEquals('testModified', $options->getModifiedField());
+        self::assertEquals('testDatabase', $options->getDatabase());
+        self::assertEquals('testCollection', $options->getCollection());
+        self::assertEquals(['w' => 2], $options->getSaveOptions());
+        self::assertEquals('testName', $options->getNameField());
+        self::assertEquals('testData', $options->getDataField());
+        self::assertEquals('testLifetime', $options->getLifetimeField());
+        self::assertEquals('testModified', $options->getModifiedField());
     }
 
     public function testInvalidDatabase()
diff --git a/test/SaveHandler/MongoDBTest.php b/test/SaveHandler/MongoDBTest.php
index af23a9ba..e6676a9f 100644
--- a/test/SaveHandler/MongoDBTest.php
+++ b/test/SaveHandler/MongoDBTest.php
@@ -74,18 +74,18 @@ protected function tearDown(): void
     public function testReadWrite()
     {
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
-        $this->assertTrue($saveHandler->open('savepath', 'sessionname'));
+        self::assertTrue($saveHandler->open('savepath', 'sessionname'));
 
-        $id = '242';
+        $id   = '242';
         $data = ['foo' => 'bar', 'bar' => ['foo' => 'bar']];
 
-        $this->assertTrue($saveHandler->write($id, serialize($data)));
-        $this->assertEquals($data, unserialize($saveHandler->read($id)));
+        self::assertTrue($saveHandler->write($id, serialize($data)));
+        self::assertEquals($data, unserialize($saveHandler->read($id)));
 
         $data = ['foo' => [1, 2, 3]];
 
-        $this->assertTrue($saveHandler->write($id, serialize($data)));
-        $this->assertEquals($data, unserialize($saveHandler->read($id)));
+        self::assertTrue($saveHandler->write($id, serialize($data)));
+        self::assertEquals($data, unserialize($saveHandler->read($id)));
     }
 
     /**
@@ -101,17 +101,17 @@ public function testReadDestroysExpiredSession()
         ini_set('session.gc_maxlifetime', 0);
 
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
-        $this->assertTrue($saveHandler->open('savepath', 'sessionname'));
+        self::assertTrue($saveHandler->open('savepath', 'sessionname'));
 
-        $id = '242';
+        $id   = '242';
         $data = ['foo' => 'bar'];
 
-        $this->assertNull($this->mongoCollection->findOne(['_id' => $id]));
+        self::assertNull($this->mongoCollection->findOne(['_id' => $id]));
 
-        $this->assertTrue($saveHandler->write($id, serialize($data)));
-        $this->assertNotNull($this->mongoCollection->findOne(['_id' => $id]));
-        $this->assertEquals('', $saveHandler->read($id));
-        $this->assertNull($this->mongoCollection->findOne(['_id' => $id]));
+        self::assertTrue($saveHandler->write($id, serialize($data)));
+        self::assertNotNull($this->mongoCollection->findOne(['_id' => $id]));
+        self::assertEquals('', $saveHandler->read($id));
+        self::assertNull($this->mongoCollection->findOne(['_id' => $id]));
 
         ini_set('session.gc_maxlifetime', $oldMaxlifetime);
     }
@@ -119,49 +119,49 @@ public function testReadDestroysExpiredSession()
     public function testGarbageCollection()
     {
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
-        $this->assertTrue($saveHandler->open('savepath', 'sessionname'));
+        self::assertTrue($saveHandler->open('savepath', 'sessionname'));
 
         $data = ['foo' => 'bar'];
 
-        $this->assertTrue($saveHandler->write(123, serialize($data)));
-        $this->assertTrue($saveHandler->write(456, serialize($data)));
-        $this->assertEquals(2, $this->mongoCollection->count());
+        self::assertTrue($saveHandler->write(123, serialize($data)));
+        self::assertTrue($saveHandler->write(456, serialize($data)));
+        self::assertEquals(2, $this->mongoCollection->count());
         $saveHandler->gc(5);
-        $this->assertEquals(2, $this->mongoCollection->count());
+        self::assertEquals(2, $this->mongoCollection->count());
 
         /* Note: MongoDate uses micro-second precision, so even a maximum
          * lifetime of zero would not match records that were just inserted.
          * Use a negative number instead.
          */
         $saveHandler->gc(-1);
-        $this->assertEquals(0, $this->mongoCollection->count());
+        self::assertEquals(0, $this->mongoCollection->count());
     }
 
     public function testGarbageCollectionMaxlifetimeIsInSeconds()
     {
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
-        $this->assertTrue($saveHandler->open('savepath', 'sessionname'));
+        self::assertTrue($saveHandler->open('savepath', 'sessionname'));
 
         $data = ['foo' => 'bar'];
 
-        $this->assertTrue($saveHandler->write(123, serialize($data)));
+        self::assertTrue($saveHandler->write(123, serialize($data)));
         sleep(1);
-        $this->assertTrue($saveHandler->write(456, serialize($data)));
-        $this->assertEquals(2, $this->mongoCollection->count());
+        self::assertTrue($saveHandler->write(456, serialize($data)));
+        self::assertEquals(2, $this->mongoCollection->count());
 
         // Clear everything what is at least 1 second old.
         $saveHandler->gc(1);
-        $this->assertEquals(1, $this->mongoCollection->count());
+        self::assertEquals(1, $this->mongoCollection->count());
 
-        $this->assertEmpty($saveHandler->read(123));
-        $this->assertNotEmpty($saveHandler->read(456));
+        self::assertEmpty($saveHandler->read(123));
+        self::assertNotEmpty($saveHandler->read(456));
     }
 
     public function testWriteExceptionEdgeCaseForChangedSessionName()
     {
         $this->expectException(RuntimeException::class);
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
-        $this->assertTrue($saveHandler->open('savepath', 'sessionname'));
+        self::assertTrue($saveHandler->open('savepath', 'sessionname'));
 
         $id = '242';
         $data = ['foo' => 'bar'];
@@ -180,12 +180,12 @@ public function testWriteExceptionEdgeCaseForChangedSessionName()
     public function testReadShouldAlwaysReturnString()
     {
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
-        $this->assertTrue($saveHandler->open('savepath', 'sessionname'));
+        self::assertTrue($saveHandler->open('savepath', 'sessionname'));
 
         $id = '242';
 
         $data = $saveHandler->read($id);
 
-        $this->assertTrue(is_string($data));
+        self::assertTrue(is_string($data));
     }
 }
diff --git a/test/Service/ContainerAbstractServiceFactoryTest.php b/test/Service/ContainerAbstractServiceFactoryTest.php
index 87287b8d..7d1745c2 100644
--- a/test/Service/ContainerAbstractServiceFactoryTest.php
+++ b/test/Service/ContainerAbstractServiceFactoryTest.php
@@ -69,10 +69,10 @@ public function validContainers()
      */
     public function testCanRetrieveNamedContainers($serviceName, $containerName)
     {
-        $this->assertTrue($this->services->has($serviceName), "Container does not have service by name '$serviceName'");
+        self::assertTrue($this->services->has($serviceName), "Container does not have service by name '$serviceName'");
         $container = $this->services->get($serviceName);
-        $this->assertInstanceOf(Container::class, $container);
-        $this->assertEquals($containerName, $container->getName());
+        self::assertInstanceOf(Container::class, $container);
+        self::assertEquals($containerName, $container->getName());
     }
 
     /**
@@ -80,9 +80,9 @@ public function testCanRetrieveNamedContainers($serviceName, $containerName)
      */
     public function testContainersAreInjectedWithSessionManagerService($serviceName, $containerName)
     {
-        $this->assertTrue($this->services->has($serviceName), "Container does not have service by name '$serviceName'");
+        self::assertTrue($this->services->has($serviceName), "Container does not have service by name '$serviceName'");
         $container = $this->services->get($serviceName);
-        $this->assertSame($this->services->get(ManagerInterface::class), $container->getManager());
+        self::assertSame($this->services->get(ManagerInterface::class), $container->getManager());
     }
 
     public function invalidContainers()
@@ -102,6 +102,6 @@ public function invalidContainers()
      */
     public function testInvalidContainerNamesAreNotMatchedByAbstractFactory($name)
     {
-        $this->assertFalse($this->services->has($name));
+        self::assertFalse($this->services->has($name));
     }
 }
diff --git a/test/Service/SessionConfigFactoryTest.php b/test/Service/SessionConfigFactoryTest.php
index 91567543..b3f512d0 100644
--- a/test/Service/SessionConfigFactoryTest.php
+++ b/test/Service/SessionConfigFactoryTest.php
@@ -40,7 +40,7 @@ public function testCreatesSessionConfigByDefault()
             'session_config' => [],
         ]);
         $config = $this->services->get(ConfigInterface::class);
-        $this->assertInstanceOf(SessionConfig::class, $config);
+        self::assertInstanceOf(SessionConfig::class, $config);
     }
 
     public function testCanCreateAlternateSessionConfigTypeViaConfigClassKey()
@@ -51,9 +51,9 @@ public function testCanCreateAlternateSessionConfigTypeViaConfigClassKey()
             ],
         ]);
         $config = $this->services->get(ConfigInterface::class);
-        $this->assertInstanceOf(StandardConfig::class, $config);
+        self::assertInstanceOf(StandardConfig::class, $config);
         // Since SessionConfig extends StandardConfig, need to assert not SessionConfig
-        $this->assertNotInstanceOf(SessionConfig::class, $config);
+        self::assertNotInstanceOf(SessionConfig::class, $config);
     }
 
     public function testServiceReceivesConfiguration()
@@ -65,6 +65,6 @@ public function testServiceReceivesConfiguration()
             ],
         ]);
         $config = $this->services->get(ConfigInterface::class);
-        $this->assertEquals('laminas', $config->getName());
+        self::assertEquals('laminas', $config->getName());
     }
 }
diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php
index 87048caf..002b2ee0 100644
--- a/test/Service/SessionManagerFactoryTest.php
+++ b/test/Service/SessionManagerFactoryTest.php
@@ -55,7 +55,7 @@ protected function setUp(): void
     public function testCreatesSessionManager()
     {
         $manager = $this->services->get(ManagerInterface::class);
-        $this->assertInstanceOf(SessionManager::class, $manager);
+        self::assertInstanceOf(SessionManager::class, $manager);
     }
 
     public function testConfigObjectIsInjectedIfPresentInServices()
@@ -63,8 +63,8 @@ public function testConfigObjectIsInjectedIfPresentInServices()
         $config = $this->createMock(ConfigInterface::class);
         $this->services->setService(ConfigInterface::class, $config);
         $manager = $this->services->get(ManagerInterface::class);
-        $test = $manager->getConfig();
-        $this->assertSame($config, $test);
+        $test    = $manager->getConfig();
+        self::assertSame($config, $test);
     }
 
     public function testFactoryWillInjectStorageIfPresentInServices()
@@ -73,8 +73,8 @@ public function testFactoryWillInjectStorageIfPresentInServices()
         $storage = new ArrayStorage();
         $this->services->setService(StorageInterface::class, $storage);
         $manager = $this->services->get(ManagerInterface::class);
-        $test = $manager->getStorage();
-        $this->assertSame($storage, $test);
+        $test    = $manager->getStorage();
+        self::assertSame($storage, $test);
     }
 
     public function testFactoryWillInjectSaveHandlerIfPresentInServices()
@@ -82,14 +82,14 @@ public function testFactoryWillInjectSaveHandlerIfPresentInServices()
         $saveHandler = $this->createMock(SaveHandlerInterface::class);
         $this->services->setService(SaveHandlerInterface::class, $saveHandler);
         $manager = $this->services->get(ManagerInterface::class);
-        $test = $manager->getSaveHandler();
-        $this->assertSame($saveHandler, $test);
+        $test    = $manager->getSaveHandler();
+        self::assertSame($saveHandler, $test);
     }
 
     public function testFactoryWillMarkManagerAsContainerDefaultByDefault()
     {
         $manager = $this->services->get(ManagerInterface::class);
-        $this->assertSame($manager, Container::getDefaultManager());
+        self::assertSame($manager, Container::getDefaultManager());
     }
 
     public function testCanDisableContainerDefaultManagerInjectionViaConfiguration()
@@ -99,7 +99,7 @@ public function testCanDisableContainerDefaultManagerInjectionViaConfiguration()
         ]];
         $this->services->setService('config', $config);
         $manager = $this->services->get(ManagerInterface::class);
-        $this->assertNotSame($manager, Container::getDefaultManager());
+        self::assertNotSame($manager, Container::getDefaultManager());
     }
 
     /**
@@ -117,9 +117,9 @@ public function testFactoryWillAddValidatorViaConfiguration()
 
         $manager->start();
 
-        $chain = $manager->getValidatorChain();
+        $chain     = $manager->getValidatorChain();
         $listeners = iterator_to_array($this->getListenersForEvent('session.validate', $chain));
-        $this->assertCount(2, $listeners);
+        self::assertCount(2, $listeners);
     }
 
     /**
@@ -133,7 +133,7 @@ public function testStartingSessionManagerFromFactoryDoesNotTriggerUndefinedVari
         $manager = $this->services->get(ManagerInterface::class);
         $manager->start();
 
-        $this->assertSame($storage, $manager->getStorage());
+        self::assertSame($storage, $manager->getStorage());
     }
 
     /**
@@ -154,14 +154,15 @@ public function testFactoryDoesNotOverwriteValidatorStorageValues()
                     Validator\RemoteAddr::class,
                 ],
             ],
-        ]);
+        ]
+        );
 
         // This call is needed to make sure session storage data is not overwritten by the factory
         $manager = $this->services->get(ManagerInterface::class);
 
         $validatorData = $storage->getMetaData('_VALID');
-        $this->assertSame('Foo', $validatorData[Validator\HttpUserAgent::class]);
-        $this->assertSame('1.2.3.4', $validatorData[Validator\RemoteAddr::class]);
+        self::assertSame('Foo', $validatorData[Validator\HttpUserAgent::class]);
+        self::assertSame('1.2.3.4', $validatorData[Validator\RemoteAddr::class]);
     }
 
     /**
@@ -189,9 +190,9 @@ public function testFactoryDoesNotAttachValidatorTwoTimes()
             // Ignore exception, because we are not interested whether session validation passes in this test
         }
 
-        $chain = $manager->getValidatorChain();
+        $chain     = $manager->getValidatorChain();
         $listeners = iterator_to_array($this->getListenersForEvent('session.validate', $chain));
-        $this->assertCount(2, $listeners);
+        self::assertCount(2, $listeners);
 
         $found = false;
         foreach ($listeners as $listener) {
@@ -201,7 +202,7 @@ public function testFactoryDoesNotAttachValidatorTwoTimes()
                 break;
             }
         }
-        $this->assertTrue($found, 'Did not find RemoteAddr validator in listeners');
+        self::assertTrue($found, 'Did not find RemoteAddr validator in listeners');
     }
 
     public function testFactoryAllowsOverridingOptions()
@@ -221,13 +222,13 @@ public function testFactoryAllowsOverridingOptions()
         $manager = $this->services->get(ManagerInterface::class);
 
         $containedValidators = ReflectionUtil::getProperty($manager, 'validators');
-        $this->assertSame([], $containedValidators);
+        self::assertSame([], $containedValidators);
     }
 
     public function testFactoryWillUseRequestedNameAsSessionManagerIfItImplementsManagerInterface()
     {
         $manager = $this->services->get(TestManager::class);
-        $this->assertInstanceOf(TestManager::class, $manager);
+        self::assertInstanceOf(TestManager::class, $manager);
     }
 
     public function testFactoryWillRaiseServiceNotCreatedExceptionIfRequestedNameIsNotAManagerInterfaceSubclass()
diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php
index 5f15383a..b8af49c5 100644
--- a/test/Service/StorageFactoryTest.php
+++ b/test/Service/StorageFactoryTest.php
@@ -99,24 +99,26 @@ public function testUsesConfigurationToCreateStorage($config, $class)
     {
         $this->services->setService('config', $config);
         $storage = $this->services->get(StorageInterface::class);
-        $this->assertInstanceOf($class, $storage);
+        self::assertInstanceOf($class, $storage);
         $test = $storage->toArray();
-        $this->assertEquals($config['session_storage']['options']['input'], $test);
+        self::assertEquals($config['session_storage']['options']['input'], $test);
     }
 
     public function testConfigurationWithoutInputIsValid()
     {
-        $this->services->setService('config', [
+        $this->services->setService(
+            'config', [
             'session_storage' => [
-                'type' => ArrayStorage::class,
+                'type'    => ArrayStorage::class,
                 'options' => [],
             ],
-        ]);
+        ]
+        );
 
         $storage = $this->services->get(StorageInterface::class);
 
-        $this->assertInstanceOf(ArrayStorage::class, $storage);
-        $this->assertSame([], $storage->toArray());
+        self::assertInstanceOf(ArrayStorage::class, $storage);
+        self::assertSame([], $storage->toArray());
     }
 
     public function invalidSessionStorageConfig()
diff --git a/test/SessionArrayStorageTest.php b/test/SessionArrayStorageTest.php
index 44bfa8ed..d7e901f9 100644
--- a/test/SessionArrayStorageTest.php
+++ b/test/SessionArrayStorageTest.php
@@ -32,29 +32,29 @@ protected function tearDown(): void
     public function testStorageWritesToSessionSuperglobal()
     {
         $this->storage['foo'] = 'bar';
-        $this->assertSame($_SESSION['foo'], $this->storage->foo);
+        self::assertSame($_SESSION['foo'], $this->storage->foo);
         unset($this->storage['foo']);
-        $this->assertArrayNotHasKey('foo', $_SESSION);
+        self::assertArrayNotHasKey('foo', $_SESSION);
     }
 
     public function testPassingArrayToConstructorOverwritesSessionSuperglobal()
     {
         $_SESSION['foo'] = 'bar';
-        $array   = ['foo' => 'FOO'];
-        $storage = new SessionArrayStorage($array);
-        $expected = [
-            'foo' => 'FOO',
+        $array           = ['foo' => 'FOO'];
+        $storage         = new SessionArrayStorage($array);
+        $expected        = [
+            'foo'       => 'FOO',
             '__Laminas' => [
                 '_REQUEST_ACCESS_TIME' => $storage->getRequestAccessTime(),
             ],
         ];
-        $this->assertSame($expected, $_SESSION);
+        self::assertSame($expected, $_SESSION);
     }
 
     public function testModifyingSessionSuperglobalDirectlyUpdatesStorage()
     {
         $_SESSION['foo'] = 'bar';
-        $this->assertTrue(isset($this->storage['foo']));
+        self::assertTrue(isset($this->storage['foo']));
     }
 
     public function testDestructorSetsSessionToArray()
@@ -67,52 +67,52 @@ public function testDestructorSetsSessionToArray()
             'foo' => 'bar',
         ];
         $this->storage->__destruct();
-        $this->assertSame($expected, $_SESSION);
+        self::assertSame($expected, $_SESSION);
     }
 
     public function testModifyingOneSessionObjectModifiesTheOther()
     {
         $this->storage->foo = 'bar';
-        $storage = new SessionArrayStorage();
-        $storage->bar = 'foo';
-        $this->assertEquals('foo', $this->storage->bar);
+        $storage            = new SessionArrayStorage();
+        $storage->bar       = 'foo';
+        self::assertEquals('foo', $this->storage->bar);
     }
 
     public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmutable()
     {
         $this->storage->foo = 'bar';
-        $storage = new SessionArrayStorage();
-        $this->assertEquals('bar', $storage['foo']);
+        $storage            = new SessionArrayStorage();
+        self::assertEquals('bar', $storage['foo']);
         $this->storage->markImmutable();
-        $this->assertTrue($storage->isImmutable(), var_export($_SESSION, 1));
+        self::assertTrue($storage->isImmutable(), var_export($_SESSION, 1));
     }
 
     public function testAssignment()
     {
         $_SESSION['foo'] = 'bar';
-        $this->assertEquals('bar', $this->storage['foo']);
+        self::assertEquals('bar', $this->storage['foo']);
     }
 
     public function testMultiDimensionalAssignment()
     {
         $_SESSION['foo']['bar'] = 'baz';
-        $this->assertEquals('baz', $this->storage['foo']['bar']);
+        self::assertEquals('baz', $this->storage['foo']['bar']);
     }
 
     public function testUnset()
     {
         $_SESSION['foo'] = 'bar';
         unset($_SESSION['foo']);
-        $this->assertFalse(isset($this->storage['foo']));
+        self::assertFalse(isset($this->storage['foo']));
     }
 
     public function testMultiDimensionalUnset()
     {
         $this->storage['foo'] = ['bar' => ['baz' => 'boo']];
         unset($this->storage['foo']['bar']['baz']);
-        $this->assertFalse(isset($this->storage['foo']['bar']['baz']));
+        self::assertFalse(isset($this->storage['foo']['bar']['baz']));
         unset($this->storage['foo']['bar']);
-        $this->assertFalse(isset($this->storage['foo']['bar']));
+        self::assertFalse(isset($this->storage['foo']['bar']));
     }
 
     public function testSessionWorksWithContainer()
@@ -124,7 +124,7 @@ public function testSessionWorksWithContainer()
         );
         $container->foo = 'bar';
 
-        $this->assertSame($container->foo, $_SESSION['test']['foo']);
+        self::assertSame($container->foo, $_SESSION['test']['foo']);
     }
 
     public function testToArrayWithMetaData()
@@ -135,12 +135,12 @@ public function testToArrayWithMetaData()
         $expected = [
             '__Laminas' => [
                 '_REQUEST_ACCESS_TIME' => $this->storage->getRequestAccessTime(),
-                'foo' => 'bar',
+                'foo'                  => 'bar',
             ],
-            'foo' => 'bar',
-            'bar' => 'baz',
+            'foo'       => 'bar',
+            'bar'       => 'baz',
         ];
-        $this->assertSame($expected, $this->storage->toArray(true));
+        self::assertSame($expected, $this->storage->toArray(true));
     }
 
     public function testUndefinedSessionManipulation()
@@ -153,11 +153,11 @@ public function testUndefinedSessionManipulation()
             '__Laminas' => [
                 '_REQUEST_ACCESS_TIME' => $this->storage->getRequestAccessTime(),
             ],
-            'foo' => 'bar',
-            'bar' => ['bar'],
-            'baz' => ['foo' => 'bar'],
+            'foo'       => 'bar',
+            'bar'       => ['bar'],
+            'baz'       => ['foo' => 'bar'],
         ];
-        $this->assertSame($expected, $this->storage->toArray(true));
+        self::assertSame($expected, $this->storage->toArray(true));
     }
 
     /**
@@ -178,12 +178,12 @@ public function testExpirationHops()
         $copy = $_SESSION;
         $_SESSION = null;
         $storage->init($copy);
-        $this->assertEquals('bar', $container->foo);
+        self::assertEquals('bar', $container->foo);
 
         $copy = $_SESSION;
         $_SESSION = null;
         $storage->init($copy);
-        $this->assertNull($container->foo);
+        self::assertNull($container->foo);
     }
 
     /**
@@ -192,16 +192,16 @@ public function testExpirationHops()
     public function testPreserveRequestAccessTimeAfterStart()
     {
         $manager = new SessionManager(null, $this->storage);
-        $this->assertGreaterThan(0, $this->storage->getRequestAccessTime());
+        self::assertGreaterThan(0, $this->storage->getRequestAccessTime());
         $manager->start();
-        $this->assertGreaterThan(0, $this->storage->getRequestAccessTime());
+        self::assertGreaterThan(0, $this->storage->getRequestAccessTime());
     }
 
     public function testGetArrayCopyFromContainer()
     {
-        $container = new Container('test');
+        $container      = new Container('test');
         $container->foo = 'bar';
         $container->baz = 'qux';
-        $this->assertSame(['foo' => 'bar', 'baz' => 'qux'], $container->getArrayCopy());
+        self::assertSame(['foo' => 'bar', 'baz' => 'qux'], $container->getArrayCopy());
     }
 }
diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
index 34db4970..f6d0e630 100644
--- a/test/SessionManagerTest.php
+++ b/test/SessionManagerTest.php
@@ -63,37 +63,37 @@ public function getTimestampFromCookie($cookie)
     public function testManagerUsesSessionConfigByDefault()
     {
         $this->manager = new SessionManager();
-        $config = $this->manager->getConfig();
-        $this->assertInstanceOf(SessionConfig::class, $config);
+        $config        = $this->manager->getConfig();
+        self::assertInstanceOf(SessionConfig::class, $config);
     }
 
     public function testCanPassConfigurationToConstructor()
     {
         $this->manager = new SessionManager();
-        $config = new StandardConfig();
-        $manager = new SessionManager($config);
-        $this->assertSame($config, $manager->getConfig());
+        $config        = new StandardConfig();
+        $manager       = new SessionManager($config);
+        self::assertSame($config, $manager->getConfig());
     }
 
     public function testManagerUsesSessionStorageByDefault()
     {
         $this->manager = new SessionManager();
-        $storage = $this->manager->getStorage();
-        $this->assertInstanceOf(SessionArrayStorage::class, $storage);
+        $storage       = $this->manager->getStorage();
+        self::assertInstanceOf(SessionArrayStorage::class, $storage);
     }
 
     public function testCanPassStorageToConstructor()
     {
         $storage = new ArrayStorage();
         $manager = new SessionManager(null, $storage);
-        $this->assertSame($storage, $manager->getStorage());
+        self::assertSame($storage, $manager->getStorage());
     }
 
     public function testCanPassSaveHandlerToConstructor()
     {
         $saveHandler = new TestAsset\TestSaveHandler();
-        $manager = new SessionManager(null, null, $saveHandler);
-        $this->assertSame($saveHandler, $manager->getSaveHandler());
+        $manager     = new SessionManager(null, null, $saveHandler);
+        self::assertSame($saveHandler, $manager->getSaveHandler());
     }
 
     public function testCanPassValidatorsToConstructor()
@@ -144,7 +144,7 @@ public function testCanDisableAttachDefaultValidators()
     public function testSessionExistsReturnsFalseWhenNoSessionStarted()
     {
         $this->manager = new SessionManager();
-        $this->assertFalse($this->manager->sessionExists());
+        self::assertFalse($this->manager->sessionExists());
     }
 
     /**
@@ -154,7 +154,7 @@ public function testSessionExistsReturnsTrueWhenSessionStarted()
     {
         $this->manager = new SessionManager();
         session_start();
-        $this->assertTrue($this->manager->sessionExists());
+        self::assertTrue($this->manager->sessionExists());
     }
 
     /**
@@ -165,7 +165,7 @@ public function testSessionExistsReturnsTrueWhenSessionStartedThenWritten()
         $this->manager = new SessionManager();
         session_start();
         session_write_close();
-        $this->assertTrue($this->manager->sessionExists());
+        self::assertTrue($this->manager->sessionExists());
     }
 
     /**
@@ -176,7 +176,7 @@ public function testSessionExistsReturnsFalseWhenSessionStartedThenDestroyed()
         $this->manager = new SessionManager();
         session_start();
         session_destroy();
-        $this->assertFalse($this->manager->sessionExists());
+        self::assertFalse($this->manager->sessionExists());
     }
 
     /**
@@ -185,9 +185,9 @@ public function testSessionExistsReturnsFalseWhenSessionStartedThenDestroyed()
     public function testSessionIsStartedAfterCallingStart()
     {
         $this->manager = new SessionManager();
-        $this->assertFalse($this->manager->sessionExists());
+        self::assertFalse($this->manager->sessionExists());
         $this->manager->start();
-        $this->assertTrue($this->manager->sessionExists());
+        self::assertTrue($this->manager->sessionExists());
     }
 
     /**
@@ -201,8 +201,8 @@ public function testStartDoesNothingWhenCalledAfterWriteCloseOperation()
         session_write_close();
         $this->manager->start();
         $id2 = session_id();
-        $this->assertTrue($this->manager->sessionExists());
-        $this->assertEquals($id1, $id2);
+        self::assertTrue($this->manager->sessionExists());
+        self::assertEquals($id1, $id2);
     }
 
     /**
@@ -213,15 +213,15 @@ public function testStartWithOldTraversableSessionData()
         // pre-populate session with data
         $_SESSION['key1'] = 'value1';
         $_SESSION['key2'] = 'value2';
-        $storage = new SessionStorage();
+        $storage          = new SessionStorage();
         // create session manager with SessionStorage that will populate object with existing session array
         $manager = new SessionManager(null, $storage);
-        $this->assertFalse($manager->sessionExists());
+        self::assertFalse($manager->sessionExists());
         $manager->start();
-        $this->assertTrue($manager->sessionExists());
-        $this->assertInstanceOf('\Traversable', $_SESSION);
-        $this->assertEquals('value1', $_SESSION->key1);
-        $this->assertEquals('value2', $_SESSION->key2);
+        self::assertTrue($manager->sessionExists());
+        self::assertInstanceOf('\Traversable', $_SESSION);
+        self::assertEquals('value1', $_SESSION->key1);
+        self::assertEquals('value2', $_SESSION->key2);
     }
 
     /**
@@ -231,11 +231,11 @@ public function testStorageContentIsPreservedByWriteCloseOperation()
     {
         $this->manager = new SessionManager();
         $this->manager->start();
-        $storage = $this->manager->getStorage();
+        $storage        = $this->manager->getStorage();
         $storage['foo'] = 'bar';
         $this->manager->writeClose();
-        $this->assertArrayHasKey('foo', $storage);
-        $this->assertEquals('bar', $storage['foo']);
+        self::assertArrayHasKey('foo', $storage);
+        self::assertEquals('bar', $storage['foo']);
     }
 
     /**
@@ -249,8 +249,8 @@ public function testStartCreatesNewSessionIfPreviousSessionHasBeenDestroyed()
         session_destroy();
         $this->manager->start();
         $id2 = session_id();
-        $this->assertTrue($this->manager->sessionExists());
-        $this->assertNotEquals($id1, $id2);
+        self::assertTrue($this->manager->sessionExists());
+        self::assertNotEquals($id1, $id2);
     }
 
     /**
@@ -268,9 +268,9 @@ public function testStartConvertsSessionDataFromStorageInterfaceToArrayBeforeMer
 
         $this->manager->start();
 
-        $this->assertIsArray($_SESSION);
-        $this->assertArrayHasKey($key, $_SESSION);
-        $this->assertSame($data[$key], $_SESSION[$key]);
+        self::assertIsArray($_SESSION);
+        self::assertArrayHasKey($key, $_SESSION);
+        self::assertSame($data[$key], $_SESSION[$key]);
     }
 
     /**
@@ -286,9 +286,9 @@ public function testStartConvertsSessionDataFromTraversableToArrayBeforeMerging(
 
         $this->manager->start();
 
-        $this->assertIsArray($_SESSION);
-        $this->assertArrayHasKey($key, $_SESSION);
-        $this->assertSame($data[$key], $_SESSION[$key]);
+        self::assertIsArray($_SESSION);
+        self::assertArrayHasKey($key, $_SESSION);
+        self::assertSame($data[$key], $_SESSION[$key]);
     }
 
     /**
@@ -298,15 +298,15 @@ public function testStartWillNotBlockHeaderSentNotices()
     {
         $this->manager = new SessionManager();
         if ('cli' == PHP_SAPI) {
-            $this->markTestSkipped('session_start() will not raise headers_sent warnings in CLI');
+            self::markTestSkipped('session_start() will not raise headers_sent warnings in CLI');
         }
         set_error_handler([$this, 'handleErrors'], E_WARNING);
         echo ' ';
-        $this->assertTrue(headers_sent());
+        self::assertTrue(headers_sent());
         $this->manager->start();
         restore_error_handler();
-        $this->assertIsString($this->error);
-        $this->assertContains('already sent', $this->error);
+        self::assertIsString($this->error);
+        self::assertContains('already sent', $this->error);
     }
 
     /**
@@ -315,8 +315,8 @@ public function testStartWillNotBlockHeaderSentNotices()
     public function testGetNameReturnsSessionName()
     {
         $this->manager = new SessionManager();
-        $ini = ini_get('session.name');
-        $this->assertEquals($ini, $this->manager->getName());
+        $ini           = ini_get('session.name');
+        self::assertEquals($ini, $this->manager->getName());
     }
 
     /**
@@ -337,8 +337,8 @@ public function testSetNameSetsSessionNameOnSuccess()
     {
         $this->manager = new SessionManager();
         $this->manager->setName('foobar');
-        $this->assertEquals('foobar', $this->manager->getName());
-        $this->assertEquals('foobar', session_name());
+        self::assertEquals('foobar', $this->manager->getName());
+        self::assertEquals('foobar', session_name());
     }
 
     /**
@@ -350,8 +350,8 @@ public function testCanSetNewSessionNameAfterSessionDestroyed()
         $this->manager->start();
         session_destroy();
         $this->manager->setName('foobar');
-        $this->assertEquals('foobar', $this->manager->getName());
-        $this->assertEquals('foobar', session_name());
+        self::assertEquals('foobar', $this->manager->getName());
+        self::assertEquals('foobar', session_name());
     }
 
     /**
@@ -372,7 +372,7 @@ public function testSettingNameWhenAnActiveSessionExistsRaisesException()
     public function testDestroyByDefaultSendsAnExpireCookie()
     {
         if (! extension_loaded('xdebug')) {
-            $this->markTestSkipped('Xdebug required for this test');
+            self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
@@ -393,7 +393,7 @@ public function testDestroyByDefaultSendsAnExpireCookie()
             }
         }
 
-        $this->assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
+        self::assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
     }
 
     /**
@@ -402,7 +402,7 @@ public function testDestroyByDefaultSendsAnExpireCookie()
     public function testSendingFalseToSendExpireCookieWhenCallingDestroyShouldNotSendCookie()
     {
         if (! extension_loaded('xdebug')) {
-            $this->markTestSkipped('Xdebug required for this test');
+            self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
@@ -424,9 +424,9 @@ public function testSendingFalseToSendExpireCookieWhenCallingDestroyShouldNotSen
         }
 
         if ($found) {
-            $this->assertNotContains('expires=', $header);
+            self::assertNotContains('expires=', $header);
         } else {
-            $this->assertFalse($found, 'Unexpected session cookie found: ' . var_export($headers, true));
+            self::assertFalse($found, 'Unexpected session cookie found: ' . var_export($headers, true));
         }
     }
 
@@ -437,11 +437,11 @@ public function testDestroyDoesNotClearSessionStorageByDefault()
     {
         $this->manager = new SessionManager();
         $this->manager->start();
-        $storage = $this->manager->getStorage();
+        $storage        = $this->manager->getStorage();
         $storage['foo'] = 'bar';
         $this->manager->destroy();
-        $this->assertTrue(isset($storage['foo']));
-        $this->assertEquals('bar', $storage['foo']);
+        self::assertTrue(isset($storage['foo']));
+        self::assertEquals('bar', $storage['foo']);
     }
 
     /**
@@ -454,7 +454,7 @@ public function testPassingClearStorageOptionWhenCallingDestroyClearsStorage()
         $storage = $this->manager->getStorage();
         $storage['foo'] = 'bar';
         $this->manager->destroy(['clear_storage' => true]);
-        $this->assertFalse(isset($storage['foo']));
+        self::assertFalse(isset($storage['foo']));
     }
 
     /**
@@ -467,7 +467,7 @@ public function testCallingWriteCloseMarksStorageAsImmutable()
         $storage = $this->manager->getStorage();
         $storage['foo'] = 'bar';
         $this->manager->writeClose();
-        $this->assertTrue($storage->isImmutable());
+        self::assertTrue($storage->isImmutable());
     }
 
     /**
@@ -478,7 +478,7 @@ public function testCallingWriteCloseShouldNotAlterSessionExistsStatus()
         $this->manager = new SessionManager();
         $this->manager->start();
         $this->manager->writeClose();
-        $this->assertTrue($this->manager->sessionExists());
+        self::assertTrue($this->manager->sessionExists());
     }
 
     /**
@@ -487,7 +487,7 @@ public function testCallingWriteCloseShouldNotAlterSessionExistsStatus()
     public function testIdShouldBeEmptyPriorToCallingStart()
     {
         $this->manager = new SessionManager();
-        $this->assertSame('', $this->manager->getId());
+        self::assertSame('', $this->manager->getId());
     }
 
     /**
@@ -497,8 +497,8 @@ public function testIdShouldBeMutablePriorToCallingStart()
     {
         $this->manager = new SessionManager();
         $this->manager->setId(__CLASS__);
-        $this->assertSame(__CLASS__, $this->manager->getId());
-        $this->assertSame(__CLASS__, session_id());
+        self::assertSame(__CLASS__, $this->manager->getId());
+        self::assertSame(__CLASS__, session_id());
     }
 
     /**
@@ -523,7 +523,7 @@ public function testRegenerateIdShouldWorkAfterSessionStarted()
         $this->manager->start();
         $origId = $this->manager->getId();
         $this->manager->regenerateId();
-        $this->assertNotSame($origId, $this->manager->getId());
+        self::assertNotSame($origId, $this->manager->getId());
     }
 
     /**
@@ -532,10 +532,10 @@ public function testRegenerateIdShouldWorkAfterSessionStarted()
     public function testRegenerateIdDoesNothingWhenSessioIsNotStarted()
     {
         $this->manager = new SessionManager();
-        $origId = $this->manager->getId();
+        $origId        = $this->manager->getId();
         $this->manager->regenerateId();
-        $this->assertEquals($origId, $this->manager->getId());
-        $this->assertEquals('', $this->manager->getId());
+        self::assertEquals($origId, $this->manager->getId());
+        self::assertEquals('', $this->manager->getId());
     }
 
     /**
@@ -544,7 +544,7 @@ public function testRegenerateIdDoesNothingWhenSessioIsNotStarted()
     public function testRegeneratingIdAfterSessionStartedShouldSendExpireCookie()
     {
         if (! extension_loaded('xdebug')) {
-            $this->markTestSkipped('Xdebug required for this test');
+            self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
@@ -564,7 +564,7 @@ public function testRegeneratingIdAfterSessionStartedShouldSendExpireCookie()
             }
         }
 
-        $this->assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
+        self::assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
     }
 
     /**
@@ -573,7 +573,7 @@ public function testRegeneratingIdAfterSessionStartedShouldSendExpireCookie()
     public function testRememberMeShouldSendNewSessionCookieWithUpdatedTimestamp()
     {
         if (! extension_loaded('xdebug')) {
-            $this->markTestSkipped('Xdebug required for this test');
+            self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
@@ -594,14 +594,14 @@ public function testRememberMeShouldSendNewSessionCookieWithUpdatedTimestamp()
             }
         }
 
-        $this->assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
+        self::assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
 
         $ts = $this->getTimestampFromCookie($cookie);
         if (! $ts) {
-            $this->fail('Cookie did not contain expiry? ' . var_export($headers, true));
+            self::fail('Cookie did not contain expiry? ' . var_export($headers, true));
         }
 
-        $this->assertGreaterThan(
+        self::assertGreaterThan(
             $_SERVER['REQUEST_TIME'],
             $ts->getTimestamp(),
             'Session cookie: ' . var_export($headers, 1)
@@ -614,7 +614,7 @@ public function testRememberMeShouldSendNewSessionCookieWithUpdatedTimestamp()
     public function testRememberMeShouldSetTimestampBasedOnConfigurationByDefault()
     {
         if (! extension_loaded('xdebug')) {
-            $this->markTestSkipped('Xdebug required for this test');
+            self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
@@ -637,16 +637,16 @@ public function testRememberMeShouldSetTimestampBasedOnConfigurationByDefault()
             }
         }
 
-        $this->assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
+        self::assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
 
         $ts = $this->getTimestampFromCookie($cookie);
         if (! $ts) {
-            $this->fail('Cookie did not contain expiry? ' . var_export($headers, true));
+            self::fail('Cookie did not contain expiry? ' . var_export($headers, true));
         }
 
         $compare  = $_SERVER['REQUEST_TIME'] + $ttl;
         $cookieTs = $ts->getTimestamp();
-        $this->assertContains($cookieTs, range($compare, $compare + 10), 'Session cookie: ' . var_export($headers, 1));
+        self::assertContains($cookieTs, range($compare, $compare + 10), 'Session cookie: ' . var_export($headers, 1));
     }
 
     /**
@@ -655,7 +655,7 @@ public function testRememberMeShouldSetTimestampBasedOnConfigurationByDefault()
     public function testForgetMeShouldSendCookieWithZeroTimestamp()
     {
         if (! extension_loaded('xdebug')) {
-            $this->markTestSkipped('Xdebug required for this test');
+            self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
@@ -674,8 +674,8 @@ public function testForgetMeShouldSendCookieWithZeroTimestamp()
             }
         }
 
-        $this->assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
-        $this->assertNotContains('expires=', $header);
+        self::assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
+        self::assertNotContains('expires=', $header);
     }
 
     /**
@@ -714,7 +714,7 @@ public function testSessionWriteCloseStoresMetadata()
         $storage->setMetadata('foo', 'bar');
         $metaData = $storage->getMetadata();
         $this->manager->writeClose();
-        $this->assertSame($_SESSION['__Laminas'], $metaData);
+        self::assertSame($_SESSION['__Laminas'], $metaData);
     }
 
     /**
@@ -722,16 +722,16 @@ public function testSessionWriteCloseStoresMetadata()
      */
     public function testSessionValidationDoesNotHaltOnNoopListener()
     {
-        $this->manager = new SessionManager();
+        $this->manager   = new SessionManager();
         $validatorCalled = false;
-        $validator = function () use (& $validatorCalled) {
+        $validator       = function () use (& $validatorCalled) {
             $validatorCalled = true;
         };
 
         $this->manager->getValidatorChain()->attach('session.validate', $validator);
 
-        $this->assertTrue($this->manager->isValid());
-        $this->assertTrue($validatorCalled);
+        self::assertTrue($this->manager->isValid());
+        self::assertTrue($validatorCalled);
     }
 
     /**
@@ -739,13 +739,13 @@ public function testSessionValidationDoesNotHaltOnNoopListener()
      */
     public function testProducedSessionManagerWillNotReplaceSessionSuperGlobalValues()
     {
-        $this->manager = new SessionManager();
+        $this->manager   = new SessionManager();
         $_SESSION['foo'] = 'bar';
 
         $this->manager->start();
 
-        $this->assertArrayHasKey('foo', $_SESSION);
-        $this->assertSame('bar', $_SESSION['foo']);
+        self::assertArrayHasKey('foo', $_SESSION);
+        self::assertSame('bar', $_SESSION['foo']);
     }
 
     /**
@@ -757,13 +757,13 @@ public function testValidatorChainSessionMetadataIsPreserved()
         $this->manager->getValidatorChain()
             ->attach('session.validate', [new RemoteAddr(), 'isValid']);
 
-        $this->assertFalse($this->manager->sessionExists());
+        self::assertFalse($this->manager->sessionExists());
 
         $this->manager->start();
 
-        $this->assertIsArray($_SESSION['__Laminas']['_VALID']);
-        $this->assertArrayHasKey(RemoteAddr::class, $_SESSION['__Laminas']['_VALID']);
-        $this->assertEquals('', $_SESSION['__Laminas']['_VALID'][RemoteAddr::class]);
+        self::assertIsArray($_SESSION['__Laminas']['_VALID']);
+        self::assertArrayHasKey(RemoteAddr::class, $_SESSION['__Laminas']['_VALID']);
+        self::assertEquals('', $_SESSION['__Laminas']['_VALID'][RemoteAddr::class]);
     }
 
     /**
@@ -796,7 +796,7 @@ public function testRemoteAddressValidationWillSucceedWithValidPreSetData()
 
         $this->manager->start();
 
-        $this->assertTrue($this->manager->isValid());
+        self::assertTrue($this->manager->isValid());
     }
 
     /**
diff --git a/test/SessionStorageTest.php b/test/SessionStorageTest.php
index 7ac1c776..cc345218 100644
--- a/test/SessionStorageTest.php
+++ b/test/SessionStorageTest.php
@@ -29,36 +29,36 @@ protected function tearDown(): void
 
     public function testSessionStorageInheritsFromArrayStorage()
     {
-        $this->assertInstanceOf('Laminas\Session\Storage\SessionStorage', $this->storage);
-        $this->assertInstanceOf('Laminas\Session\Storage\ArrayStorage', $this->storage);
+        self::assertInstanceOf('Laminas\Session\Storage\SessionStorage', $this->storage);
+        self::assertInstanceOf('Laminas\Session\Storage\ArrayStorage', $this->storage);
     }
 
     public function testStorageWritesToSessionSuperglobal()
     {
         $this->storage['foo'] = 'bar';
-        $this->assertSame($_SESSION, $this->storage);
+        self::assertSame($_SESSION, $this->storage);
         unset($this->storage['foo']);
-        $this->assertArrayNotHasKey('foo', $_SESSION);
+        self::assertArrayNotHasKey('foo', $_SESSION);
     }
 
     public function testPassingArrayToConstructorOverwritesSessionSuperglobal()
     {
         $_SESSION['foo'] = 'bar';
-        $array   = ['foo' => 'FOO'];
-        $storage = new SessionStorage($array);
-        $expected = [
-            'foo' => 'FOO',
+        $array           = ['foo' => 'FOO'];
+        $storage         = new SessionStorage($array);
+        $expected        = [
+            'foo'       => 'FOO',
             '__Laminas' => [
                 '_REQUEST_ACCESS_TIME' => $storage->getRequestAccessTime(),
             ],
         ];
-        $this->assertSame($expected, $_SESSION->getArrayCopy());
+        self::assertSame($expected, $_SESSION->getArrayCopy());
     }
 
     public function testModifyingSessionSuperglobalDirectlyUpdatesStorage()
     {
         $_SESSION['foo'] = 'bar';
-        $this->assertTrue(isset($this->storage['foo']));
+        self::assertTrue(isset($this->storage['foo']));
     }
 
     public function testDestructorSetsSessionToArray()
@@ -71,32 +71,32 @@ public function testDestructorSetsSessionToArray()
             'foo' => 'bar',
         ];
         $this->storage->__destruct();
-        $this->assertSame($expected, $_SESSION);
+        self::assertSame($expected, $_SESSION);
     }
 
     public function testModifyingOneSessionObjectModifiesTheOther()
     {
         $this->storage->foo = 'bar';
-        $storage = new SessionStorage();
-        $storage->bar = 'foo';
-        $this->assertEquals('foo', $this->storage->bar);
+        $storage            = new SessionStorage();
+        $storage->bar       = 'foo';
+        self::assertEquals('foo', $this->storage->bar);
     }
 
     public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmutable()
     {
         $this->storage->foo = 'bar';
-        $storage = new SessionStorage();
-        $this->assertEquals('bar', $storage['foo']);
+        $storage            = new SessionStorage();
+        self::assertEquals('bar', $storage['foo']);
         $this->storage->markImmutable();
-        $this->assertTrue($storage->isImmutable(), var_export($_SESSION, 1));
+        self::assertTrue($storage->isImmutable(), var_export($_SESSION, 1));
     }
 
     public function testMultiDimensionalUnset()
     {
         $this->storage['foo'] = ['bar' => ['baz' => 'boo']];
         unset($this->storage['foo']['bar']['baz']);
-        $this->assertFalse(isset($this->storage['foo']['bar']['baz']));
+        self::assertFalse(isset($this->storage['foo']['bar']['baz']));
         unset($this->storage['foo']['bar']);
-        $this->assertFalse(isset($this->storage['foo']['bar']));
+        self::assertFalse(isset($this->storage['foo']['bar']));
     }
 }
diff --git a/test/StorageTest.php b/test/StorageTest.php
index 4505f77a..e9ad94d9 100644
--- a/test/StorageTest.php
+++ b/test/StorageTest.php
@@ -29,25 +29,25 @@ protected function setUp(): void
     public function testStorageAllowsArrayAccess()
     {
         $this->storage['foo'] = 'bar';
-        $this->assertTrue(isset($this->storage['foo']));
-        $this->assertEquals('bar', $this->storage['foo']);
+        self::assertTrue(isset($this->storage['foo']));
+        self::assertEquals('bar', $this->storage['foo']);
         unset($this->storage['foo']);
-        $this->assertFalse(isset($this->storage['foo']));
+        self::assertFalse(isset($this->storage['foo']));
     }
 
     public function testStorageAllowsPropertyAccess()
     {
         $this->storage->foo = 'bar';
-        $this->assertTrue(isset($this->storage->foo));
-        $this->assertEquals('bar', $this->storage->foo);
+        self::assertTrue(isset($this->storage->foo));
+        self::assertEquals('bar', $this->storage->foo);
         unset($this->storage->foo);
-        $this->assertFalse(isset($this->storage->foo));
+        self::assertFalse(isset($this->storage->foo));
     }
 
     public function testStorageAllowsSettingMetadata()
     {
         $this->storage->setMetadata('TEST', 'foo');
-        $this->assertEquals('foo', $this->storage->getMetadata('TEST'));
+        self::assertEquals('foo', $this->storage->getMetadata('TEST'));
     }
 
     public function testSettingArrayMetadataMergesOnSubsequentRequests()
@@ -55,7 +55,7 @@ public function testSettingArrayMetadataMergesOnSubsequentRequests()
         $this->storage->setMetadata('TEST', ['foo' => 'bar', 'bar' => 'baz']);
         $this->storage->setMetadata('TEST', ['foo' => 'baz', 'baz' => 'bat', 'lonesome']);
         $expected = ['foo' => 'baz', 'bar' => 'baz', 'baz' => 'bat', 'lonesome'];
-        $this->assertEquals($expected, $this->storage->getMetadata('TEST'));
+        self::assertEquals($expected, $this->storage->getMetadata('TEST'));
     }
 
     public function testSettingArrayMetadataWithOverwriteFlagOverwritesExistingData()
@@ -63,7 +63,7 @@ public function testSettingArrayMetadataWithOverwriteFlagOverwritesExistingData(
         $this->storage->setMetadata('TEST', ['foo' => 'bar', 'bar' => 'baz']);
         $this->storage->setMetadata('TEST', ['foo' => 'baz', 'baz' => 'bat', 'lonesome'], true);
         $expected = ['foo' => 'baz', 'baz' => 'bat', 'lonesome'];
-        $this->assertEquals($expected, $this->storage->getMetadata('TEST'));
+        self::assertEquals($expected, $this->storage->getMetadata('TEST'));
     }
 
     public function testLockWithNoKeyMakesStorageReadOnly()
@@ -80,9 +80,9 @@ public function testLockWithNoKeyMarksEntireStorageLocked()
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
         $this->storage->lock();
-        $this->assertTrue($this->storage->isLocked());
-        $this->assertTrue($this->storage->isLocked('foo'));
-        $this->assertTrue($this->storage->isLocked('bar'));
+        self::assertTrue($this->storage->isLocked());
+        self::assertTrue($this->storage->isLocked('foo'));
+        self::assertTrue($this->storage->isLocked('bar'));
     }
 
     public function testLockWithKeyMakesOnlyThatKeyReadOnly()
@@ -91,7 +91,7 @@ public function testLockWithKeyMakesOnlyThatKeyReadOnly()
         $this->storage->lock('foo');
 
         $this->storage->bar = 'baz';
-        $this->assertEquals('baz', $this->storage->bar);
+        self::assertEquals('baz', $this->storage->bar);
 
         $this->expectException('Laminas\Session\Exception\RuntimeException');
         $this->expectExceptionMessage('Cannot set key "foo" due to locking');
@@ -103,8 +103,8 @@ public function testLockWithKeyMarksOnlyThatKeyLocked()
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
         $this->storage->lock('foo');
-        $this->assertTrue($this->storage->isLocked('foo'));
-        $this->assertFalse($this->storage->isLocked('bar'));
+        self::assertTrue($this->storage->isLocked('foo'));
+        self::assertFalse($this->storage->isLocked('bar'));
     }
 
     public function testLockWithNoKeyShouldWriteToMetadata()
@@ -112,7 +112,7 @@ public function testLockWithNoKeyShouldWriteToMetadata()
         $this->storage->foo = 'bar';
         $this->storage->lock();
         $locked = $this->storage->getMetadata('_READONLY');
-        $this->assertTrue($locked);
+        self::assertTrue($locked);
     }
 
     public function testLockWithKeyShouldWriteToMetadata()
@@ -120,8 +120,8 @@ public function testLockWithKeyShouldWriteToMetadata()
         $this->storage->foo = 'bar';
         $this->storage->lock('foo');
         $locks = $this->storage->getMetadata('_LOCKS');
-        $this->assertIsArray($locks);
-        $this->assertArrayHasKey('foo', $locks);
+        self::assertIsArray($locks);
+        self::assertArrayHasKey('foo', $locks);
     }
 
     public function testUnlockShouldUnlockEntireObject()
@@ -130,8 +130,8 @@ public function testUnlockShouldUnlockEntireObject()
         $this->storage->bar = 'baz';
         $this->storage->lock();
         $this->storage->unlock();
-        $this->assertFalse($this->storage->isLocked('foo'));
-        $this->assertFalse($this->storage->isLocked('bar'));
+        self::assertFalse($this->storage->isLocked('foo'));
+        self::assertFalse($this->storage->isLocked('bar'));
     }
 
     public function testUnlockShouldUnlockSelectivelyLockedKeys()
@@ -140,8 +140,8 @@ public function testUnlockShouldUnlockSelectivelyLockedKeys()
         $this->storage->bar = 'baz';
         $this->storage->lock('foo');
         $this->storage->unlock();
-        $this->assertFalse($this->storage->isLocked('foo'));
-        $this->assertFalse($this->storage->isLocked('bar'));
+        self::assertFalse($this->storage->isLocked('foo'));
+        self::assertFalse($this->storage->isLocked('bar'));
     }
 
     public function testUnlockWithKeyShouldUnlockOnlyThatKey()
@@ -150,8 +150,8 @@ public function testUnlockWithKeyShouldUnlockOnlyThatKey()
         $this->storage->bar = 'baz';
         $this->storage->lock();
         $this->storage->unlock('foo');
-        $this->assertFalse($this->storage->isLocked('foo'));
-        $this->assertTrue($this->storage->isLocked('bar'));
+        self::assertFalse($this->storage->isLocked('foo'));
+        self::assertTrue($this->storage->isLocked('bar'));
     }
 
     public function testUnlockWithKeyOfSelectiveLockShouldUnlockThatKey()
@@ -159,7 +159,7 @@ public function testUnlockWithKeyOfSelectiveLockShouldUnlockThatKey()
         $this->storage->foo = 'bar';
         $this->storage->lock('foo');
         $this->storage->unlock('foo');
-        $this->assertFalse($this->storage->isLocked('foo'));
+        self::assertFalse($this->storage->isLocked('foo'));
     }
 
     public function testClearWithNoArgumentsRemovesExistingData()
@@ -169,7 +169,7 @@ public function testClearWithNoArgumentsRemovesExistingData()
 
         $this->storage->clear();
         $data = $this->storage->toArray();
-        $this->assertSame([], $data);
+        self::assertSame([], $data);
     }
 
     public function testClearWithNoArgumentsRemovesExistingMetadata()
@@ -179,8 +179,8 @@ public function testClearWithNoArgumentsRemovesExistingMetadata()
         $this->storage->setMetadata('FOO', 'bar');
         $this->storage->clear();
 
-        $this->assertFalse($this->storage->isLocked('foo'));
-        $this->assertFalse($this->storage->getMetadata('FOO'));
+        self::assertFalse($this->storage->isLocked('foo'));
+        self::assertFalse($this->storage->getMetadata('FOO'));
     }
 
     public function testClearWithArgumentRemovesExistingDataForThatKeyOnly()
@@ -190,7 +190,7 @@ public function testClearWithArgumentRemovesExistingDataForThatKeyOnly()
 
         $this->storage->clear('foo');
         $data = $this->storage->toArray();
-        $this->assertSame(['bar' => 'baz'], $data);
+        self::assertSame(['bar' => 'baz'], $data);
     }
 
     public function testClearWithArgumentRemovesExistingMetadataForThatKeyOnly()
@@ -203,10 +203,10 @@ public function testClearWithArgumentRemovesExistingMetadataForThatKeyOnly()
         $this->storage->setMetadata('bar', 'baz');
         $this->storage->clear('foo');
 
-        $this->assertFalse($this->storage->isLocked('foo'));
-        $this->assertTrue($this->storage->isLocked('bar'));
-        $this->assertFalse($this->storage->getMetadata('foo'));
-        $this->assertEquals('baz', $this->storage->getMetadata('bar'));
+        self::assertFalse($this->storage->isLocked('foo'));
+        self::assertTrue($this->storage->isLocked('bar'));
+        self::assertFalse($this->storage->getMetadata('foo'));
+        self::assertEquals('baz', $this->storage->getMetadata('bar'));
     }
 
     public function testClearWhenStorageMarkedImmutableRaisesException()
@@ -221,9 +221,9 @@ public function testClearWhenStorageMarkedImmutableRaisesException()
 
     public function testRequestAccessTimeIsPreservedEvenInFactoryMethod()
     {
-        $this->assertNotEmpty($this->storage->getRequestAccessTime());
+        self::assertNotEmpty($this->storage->getRequestAccessTime());
         $this->storage->fromArray([]);
-        $this->assertNotEmpty($this->storage->getRequestAccessTime());
+        self::assertNotEmpty($this->storage->getRequestAccessTime());
     }
 
     public function testToArrayWithMetaData()
@@ -234,12 +234,12 @@ public function testToArrayWithMetaData()
         $expected = [
             '__Laminas' => [
                 '_REQUEST_ACCESS_TIME' => $this->storage->getRequestAccessTime(),
-                'foo' => 'bar',
+                'foo'                  => 'bar',
             ],
-            'foo' => 'bar',
-            'bar' => 'baz',
+            'foo'       => 'bar',
+            'bar'       => 'baz',
         ];
-        $this->assertSame($expected, $this->storage->toArray(true));
+        self::assertSame($expected, $this->storage->toArray(true));
     }
 
     public function testUnsetMultidimensional()
@@ -248,6 +248,6 @@ public function testUnsetMultidimensional()
         unset($this->storage['foo']['bar']['baz']);
         unset($this->storage['foo']['bar']);
 
-        $this->assertFalse(isset($this->storage['foo']['bar']));
+        self::assertFalse(isset($this->storage['foo']['bar']));
     }
 }
diff --git a/test/Validator/RemoteAddrTest.php b/test/Validator/RemoteAddrTest.php
index de0fae18..9efdc301 100644
--- a/test/Validator/RemoteAddrTest.php
+++ b/test/Validator/RemoteAddrTest.php
@@ -42,20 +42,20 @@ protected function restore()
     public function testGetData()
     {
         $validator = new RemoteAddr('0.1.2.3');
-        $this->assertEquals('0.1.2.3', $validator->getData());
+        self::assertEquals('0.1.2.3', $validator->getData());
     }
 
     public function testDefaultUseProxy()
     {
-        $this->assertFalse(RemoteAddr::getUseProxy());
+        self::assertFalse(RemoteAddr::getUseProxy());
     }
 
     public function testRemoteAddrWithoutProxy()
     {
         $this->backup();
         $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
-        $validator = new RemoteAddr();
-        $this->assertEquals('0.1.2.3', $validator->getData());
+        $validator              = new RemoteAddr();
+        self::assertEquals('0.1.2.3', $validator->getData());
         $this->restore();
     }
 
@@ -63,19 +63,19 @@ public function testIsValid()
     {
         $this->backup();
         $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
-        $validator = new RemoteAddr();
+        $validator              = new RemoteAddr();
         $_SERVER['REMOTE_ADDR'] = '1.1.2.3';
-        $this->assertFalse($validator->isValid());
+        self::assertFalse($validator->isValid());
         $this->restore();
     }
 
     public function testIgnoreProxyByDefault()
     {
         $this->backup();
-        $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
+        $_SERVER['REMOTE_ADDR']    = '0.1.2.3';
         $_SERVER['HTTP_CLIENT_IP'] = '1.1.2.3';
-        $validator = new RemoteAddr();
-        $this->assertEquals('0.1.2.3', $validator->getData());
+        $validator                 = new RemoteAddr();
+        self::assertEquals('0.1.2.3', $validator->getData());
         $this->restore();
     }
 
@@ -87,7 +87,7 @@ public function testHttpXForwardedFor()
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setTrustedProxies(['0.1.2.3']);
         $validator = new RemoteAddr();
-        $this->assertEquals('1.1.2.3', $validator->getData());
+        self::assertEquals('1.1.2.3', $validator->getData());
         $this->restore();
     }
 
@@ -100,7 +100,7 @@ public function testHttpClientIp()
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setTrustedProxies(['0.1.2.3']);
         $validator = new RemoteAddr();
-        $this->assertEquals('2.1.2.3', $validator->getData());
+        self::assertEquals('2.1.2.3', $validator->getData());
         $this->restore();
     }
 
@@ -112,7 +112,7 @@ public function testUsesRightMostAddressWhenMultipleHttpXForwardedForAddressesPr
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setTrustedProxies(['0.1.2.3']);
         $validator = new RemoteAddr();
-        $this->assertEquals('1.1.2.3', $validator->getData());
+        self::assertEquals('1.1.2.3', $validator->getData());
         $this->restore();
     }
 
@@ -124,7 +124,7 @@ public function testShouldNotUseClientIpHeaderToTestProxyCapabilitiesByDefault()
         $_SERVER['HTTP_CLIENT_IP'] = '0.1.2.4';
         RemoteAddr::setUseProxy(true);
         $validator = new RemoteAddr();
-        $this->assertEquals('0.1.2.3', $validator->getData());
+        self::assertEquals('0.1.2.3', $validator->getData());
         $this->restore();
     }
 
@@ -136,7 +136,7 @@ public function testWillOmitTrustedProxyIpsFromXForwardedForMatching()
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setTrustedProxies(['1.1.2.3']);
         $validator = new RemoteAddr();
-        $this->assertEquals('2.1.2.3', $validator->getData());
+        self::assertEquals('2.1.2.3', $validator->getData());
         $this->restore();
     }
 
@@ -149,7 +149,7 @@ public function testCanSpecifyWhichHeaderToUseStatically()
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setProxyHeader('Client-Ip');
         $validator = new RemoteAddr();
-        $this->assertEquals('0.1.2.3', $validator->getData());
+        self::assertEquals('0.1.2.3', $validator->getData());
         $this->restore();
     }
 }

From ead206e9ef75fb712277c4860f8d35cd7b228102 Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 11:33:37 +0200
Subject: [PATCH 04/18] qa: tests: add return types

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/AbstractContainerTest.php                |   2 +-
 test/Config/SessionConfigTest.php             | 278 +++++++++---------
 test/Config/StandardConfigTest.php            | 144 ++++-----
 test/ContainerTest.php                        | 100 ++++---
 test/SaveHandler/CacheTest.php                |  61 ++--
 .../SaveHandler/DbTableGatewayOptionsTest.php |  16 +-
 test/SaveHandler/DbTableGatewayTest.php       |  18 +-
 test/SaveHandler/MongoDBOptionsTest.php       |  20 +-
 test/SaveHandler/MongoDBTest.php              |  14 +-
 .../ContainerAbstractServiceFactoryTest.php   |  12 +-
 test/Service/SessionConfigFactoryTest.php     |  24 +-
 test/Service/SessionManagerFactoryTest.php    |  48 +--
 test/Service/StorageFactoryTest.php           |  48 +--
 test/SessionArrayStorageTest.php              |  44 +--
 test/SessionManagerTest.php                   | 138 ++++-----
 test/SessionStorageTest.php                   |  20 +-
 test/StorageTest.php                          |  46 +--
 .../TestDbTableGatewaySaveHandler.php         |   4 +-
 test/TestAsset/TestManager.php                |   2 +-
 test/Validator/IdTest.php                     |  12 +-
 test/Validator/RemoteAddrTest.php             |  42 +--
 21 files changed, 559 insertions(+), 534 deletions(-)

diff --git a/test/AbstractContainerTest.php b/test/AbstractContainerTest.php
index 2b739b4a..4791c1e6 100644
--- a/test/AbstractContainerTest.php
+++ b/test/AbstractContainerTest.php
@@ -61,7 +61,7 @@ protected function tearDown(): void
      * This test case fails on laminas-session 2.8.0 with the php error below and works fine on 2.7.*.
      * "Only variable references should be returned by reference"
      */
-    public function testOffsetGetMissingKey()
+    public function testOffsetGetMissingKey(): void
     {
         self::assertNull($this->container->offsetGet('this key does not exist in the container'));
     }
diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php
index 0cfbf6e7..9ddb9818 100644
--- a/test/Config/SessionConfigTest.php
+++ b/test/Config/SessionConfigTest.php
@@ -41,7 +41,7 @@ protected function tearDown(): void
         $this->config = null;
     }
 
-    public function assertPhpLessThan71($message = 'This test requires a PHP version less than 7.1.0')
+    public function assertPhpLessThan71($message = 'This test requires a PHP version less than 7.1.0'): ?bool
     {
         if (PHP_VERSION_ID < 70100) {
             return true;
@@ -51,31 +51,31 @@ public function assertPhpLessThan71($message = 'This test requires a PHP version
 
     // session.save_path
 
-    public function testSetSavePathErrorsOnInvalidPath()
+    public function testSetSavePathErrorsOnInvalidPath(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid save_path provided');
         $this->config->setSavePath(__DIR__ . '/foobarboguspath');
     }
 
-    public function testSavePathDefaultsToIniSettings()
+    public function testSavePathDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.save_path'), $this->config->getSavePath());
     }
 
-    public function testSavePathIsMutable()
+    public function testSavePathIsMutable(): void
     {
         $this->config->setSavePath(__DIR__);
         self::assertEquals(__DIR__, $this->config->getSavePath());
     }
 
-    public function testSavePathAltersIniSetting()
+    public function testSavePathAltersIniSetting(): void
     {
         $this->config->setSavePath(__DIR__);
         self::assertEquals(__DIR__, ini_get('session.save_path'));
     }
 
-    public function testSavePathCanBeNonDirectoryWhenSaveHandlerNotFiles()
+    public function testSavePathCanBeNonDirectoryWhenSaveHandlerNotFiles(): void
     {
         $this->config->setPhpSaveHandler(TestSaveHandler::class);
         $this->config->setSavePath('/tmp/sessions.db');
@@ -84,24 +84,24 @@ public function testSavePathCanBeNonDirectoryWhenSaveHandlerNotFiles()
 
     // session.name
 
-    public function testNameDefaultsToIniSettings()
+    public function testNameDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.name'), $this->config->getName());
     }
 
-    public function testNameIsMutable()
+    public function testNameIsMutable(): void
     {
         $this->config->setName('FOOBAR');
         self::assertEquals('FOOBAR', $this->config->getName());
     }
 
-    public function testNameAltersIniSetting()
+    public function testNameAltersIniSetting(): void
     {
         $this->config->setName('FOOBAR');
         self::assertEquals('FOOBAR', ini_get('session.name'));
     }
 
-    public function testNameAltersIniSettingAfterSessionStart()
+    public function testNameAltersIniSettingAfterSessionStart(): void
     {
         session_start();
 
@@ -109,7 +109,7 @@ public function testNameAltersIniSettingAfterSessionStart()
         self::assertEquals('FOOBAR', ini_get('session.name'));
     }
 
-    public function testIdempotentNameAltersIniSettingWithSameValueAfterSessionStart()
+    public function testIdempotentNameAltersIniSettingWithSameValueAfterSessionStart(): void
     {
         $this->config->setName('FOOBAR');
         session_start();
@@ -120,7 +120,7 @@ public function testIdempotentNameAltersIniSettingWithSameValueAfterSessionStart
 
     // session.save_handler
 
-    public function testSaveHandlerDefaultsToIniSettings()
+    public function testSaveHandlerDefaultsToIniSettings(): void
     {
         self::assertSame(
             ini_get('session.save_handler'),
@@ -129,19 +129,19 @@ public function testSaveHandlerDefaultsToIniSettings()
         );
     }
 
-    public function testSaveHandlerIsMutable()
+    public function testSaveHandlerIsMutable(): void
     {
         $this->config->setSaveHandler(TestSaveHandler::class);
         self::assertSame(TestSaveHandler::class, $this->config->getSaveHandler());
     }
 
-    public function testSaveHandlerDoesNotAlterIniSetting()
+    public function testSaveHandlerDoesNotAlterIniSetting(): void
     {
         $this->config->setSaveHandler(TestSaveHandler::class);
         self::assertNotSame(TestSaveHandler::class, ini_get('session.save_handler'));
     }
 
-    public function testSettingInvalidSaveHandlerRaisesException()
+    public function testSettingInvalidSaveHandlerRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid save handler specified');
@@ -150,38 +150,38 @@ public function testSettingInvalidSaveHandlerRaisesException()
 
     // session.gc_probability
 
-    public function testGcProbabilityDefaultsToIniSettings()
+    public function testGcProbabilityDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.gc_probability'), $this->config->getGcProbability());
     }
 
-    public function testGcProbabilityIsMutable()
+    public function testGcProbabilityIsMutable(): void
     {
         $this->config->setGcProbability(20);
         self::assertEquals(20, $this->config->getGcProbability());
     }
 
-    public function testGcProbabilityAltersIniSetting()
+    public function testGcProbabilityAltersIniSetting(): void
     {
         $this->config->setGcProbability(24);
         self::assertEquals(24, ini_get('session.gc_probability'));
     }
 
-    public function testSettingInvalidGcProbabilityRaisesException()
+    public function testSettingInvalidGcProbabilityRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_probability; must be numeric');
         $this->config->setGcProbability('foobar_bogus');
     }
 
-    public function testSettingInvalidGcProbabilityRaisesException2()
+    public function testSettingInvalidGcProbabilityRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_probability; must be a percentage');
         $this->config->setGcProbability(-1);
     }
 
-    public function testSettingInvalidGcProbabilityRaisesException3()
+    public function testSettingInvalidGcProbabilityRaisesException3(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_probability; must be a percentage');
@@ -190,31 +190,31 @@ public function testSettingInvalidGcProbabilityRaisesException3()
 
     // session.gc_divisor
 
-    public function testGcDivisorDefaultsToIniSettings()
+    public function testGcDivisorDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.gc_divisor'), $this->config->getGcDivisor());
     }
 
-    public function testGcDivisorIsMutable()
+    public function testGcDivisorIsMutable(): void
     {
         $this->config->setGcDivisor(20);
         self::assertEquals(20, $this->config->getGcDivisor());
     }
 
-    public function testGcDivisorAltersIniSetting()
+    public function testGcDivisorAltersIniSetting(): void
     {
         $this->config->setGcDivisor(24);
         self::assertEquals(24, ini_get('session.gc_divisor'));
     }
 
-    public function testSettingInvalidGcDivisorRaisesException()
+    public function testSettingInvalidGcDivisorRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_divisor; must be numeric');
         $this->config->setGcDivisor('foobar_bogus');
     }
 
-    public function testSettingInvalidGcDivisorRaisesException2()
+    public function testSettingInvalidGcDivisorRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_divisor; must be a positive integer');
@@ -223,31 +223,31 @@ public function testSettingInvalidGcDivisorRaisesException2()
 
     // session.gc_maxlifetime
 
-    public function testGcMaxlifetimeDefaultsToIniSettings()
+    public function testGcMaxlifetimeDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.gc_maxlifetime'), $this->config->getGcMaxlifetime());
     }
 
-    public function testGcMaxlifetimeIsMutable()
+    public function testGcMaxlifetimeIsMutable(): void
     {
         $this->config->setGcMaxlifetime(20);
         self::assertEquals(20, $this->config->getGcMaxlifetime());
     }
 
-    public function testGcMaxlifetimeAltersIniSetting()
+    public function testGcMaxlifetimeAltersIniSetting(): void
     {
         $this->config->setGcMaxlifetime(24);
         self::assertEquals(24, ini_get('session.gc_maxlifetime'));
     }
 
-    public function testSettingInvalidGcMaxlifetimeRaisesException()
+    public function testSettingInvalidGcMaxlifetimeRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_maxlifetime; must be numeric');
         $this->config->setGcMaxlifetime('foobar_bogus');
     }
 
-    public function testSettingInvalidGcMaxlifetimeRaisesException2()
+    public function testSettingInvalidGcMaxlifetimeRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_maxlifetime; must be a positive integer');
@@ -256,26 +256,26 @@ public function testSettingInvalidGcMaxlifetimeRaisesException2()
 
     // session.serialize_handler
 
-    public function testSerializeHandlerDefaultsToIniSettings()
+    public function testSerializeHandlerDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.serialize_handler'), $this->config->getSerializeHandler());
     }
 
-    public function testSerializeHandlerIsMutable()
+    public function testSerializeHandlerIsMutable(): void
     {
         $value = extension_loaded('wddx') ? 'wddx' : 'php_binary';
         $this->config->setSerializeHandler($value);
         self::assertEquals($value, $this->config->getSerializeHandler());
     }
 
-    public function testSerializeHandlerAltersIniSetting()
+    public function testSerializeHandlerAltersIniSetting(): void
     {
         $value = extension_loaded('wddx') ? 'wddx' : 'php_binary';
         $this->config->setSerializeHandler($value);
         self::assertEquals($value, ini_get('session.serialize_handler'));
     }
 
-    public function testSettingInvalidSerializeHandlerRaisesException()
+    public function testSettingInvalidSerializeHandlerRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid serialize handler specified');
@@ -284,37 +284,37 @@ public function testSettingInvalidSerializeHandlerRaisesException()
 
     // session.cookie_lifetime
 
-    public function testCookieLifetimeDefaultsToIniSettings()
+    public function testCookieLifetimeDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.cookie_lifetime'), $this->config->getCookieLifetime());
     }
 
-    public function testCookieLifetimeIsMutable()
+    public function testCookieLifetimeIsMutable(): void
     {
         $this->config->setCookieLifetime(20);
         self::assertEquals(20, $this->config->getCookieLifetime());
     }
 
-    public function testCookieLifetimeAltersIniSetting()
+    public function testCookieLifetimeAltersIniSetting(): void
     {
         $this->config->setCookieLifetime(24);
         self::assertEquals(24, ini_get('session.cookie_lifetime'));
     }
 
-    public function testCookieLifetimeCanBeZero()
+    public function testCookieLifetimeCanBeZero(): void
     {
         $this->config->setCookieLifetime(0);
         self::assertEquals(0, ini_get('session.cookie_lifetime'));
     }
 
-    public function testSettingInvalidCookieLifetimeRaisesException()
+    public function testSettingInvalidCookieLifetimeRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie_lifetime; must be numeric');
         $this->config->setCookieLifetime('foobar_bogus');
     }
 
-    public function testSettingInvalidCookieLifetimeRaisesException2()
+    public function testSettingInvalidCookieLifetimeRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie_lifetime; must be a positive integer or zero');
@@ -323,38 +323,38 @@ public function testSettingInvalidCookieLifetimeRaisesException2()
 
     // session.cookie_path
 
-    public function testCookiePathDefaultsToIniSettings()
+    public function testCookiePathDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.cookie_path'), $this->config->getCookiePath());
     }
 
-    public function testCookiePathIsMutable()
+    public function testCookiePathIsMutable(): void
     {
         $this->config->setCookiePath('/foo');
         self::assertEquals('/foo', $this->config->getCookiePath());
     }
 
-    public function testCookiePathAltersIniSetting()
+    public function testCookiePathAltersIniSetting(): void
     {
         $this->config->setCookiePath('/bar');
         self::assertEquals('/bar', ini_get('session.cookie_path'));
     }
 
-    public function testSettingInvalidCookiePathRaisesException()
+    public function testSettingInvalidCookiePathRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie path');
         $this->config->setCookiePath(24);
     }
 
-    public function testSettingInvalidCookiePathRaisesException2()
+    public function testSettingInvalidCookiePathRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie path');
         $this->config->setCookiePath('foo');
     }
 
-    public function testSettingInvalidCookiePathRaisesException3()
+    public function testSettingInvalidCookiePathRaisesException3(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie path');
@@ -363,37 +363,37 @@ public function testSettingInvalidCookiePathRaisesException3()
 
     // session.cookie_domain
 
-    public function testCookieDomainDefaultsToIniSettings()
+    public function testCookieDomainDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.cookie_domain'), $this->config->getCookieDomain());
     }
 
-    public function testCookieDomainIsMutable()
+    public function testCookieDomainIsMutable(): void
     {
         $this->config->setCookieDomain('example.com');
         self::assertEquals('example.com', $this->config->getCookieDomain());
     }
 
-    public function testCookieDomainCanBeEmpty()
+    public function testCookieDomainCanBeEmpty(): void
     {
         $this->config->setCookieDomain('');
         self::assertEquals('', $this->config->getCookieDomain());
     }
 
-    public function testCookieDomainAltersIniSetting()
+    public function testCookieDomainAltersIniSetting(): void
     {
         $this->config->setCookieDomain('localhost');
         self::assertEquals('localhost', ini_get('session.cookie_domain'));
     }
 
-    public function testSettingInvalidCookieDomainRaisesException()
+    public function testSettingInvalidCookieDomainRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie domain: must be a string');
         $this->config->setCookieDomain(24);
     }
 
-    public function testSettingInvalidCookieDomainRaisesException2()
+    public function testSettingInvalidCookieDomainRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('does not match the expected structure for a DNS hostname');
@@ -402,19 +402,19 @@ public function testSettingInvalidCookieDomainRaisesException2()
 
     // session.cookie_secure
 
-    public function testCookieSecureDefaultsToIniSettings()
+    public function testCookieSecureDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.cookie_secure'), $this->config->getCookieSecure());
     }
 
-    public function testCookieSecureIsMutable()
+    public function testCookieSecureIsMutable(): void
     {
         $value = ! ini_get('session.cookie_secure');
         $this->config->setCookieSecure($value);
         self::assertEquals($value, $this->config->getCookieSecure());
     }
 
-    public function testCookieSecureAltersIniSetting()
+    public function testCookieSecureAltersIniSetting(): void
     {
         $value = ! ini_get('session.cookie_secure');
         $this->config->setCookieSecure($value);
@@ -423,19 +423,19 @@ public function testCookieSecureAltersIniSetting()
 
     // session.cookie_httponly
 
-    public function testCookieHttpOnlyDefaultsToIniSettings()
+    public function testCookieHttpOnlyDefaultsToIniSettings(): void
     {
         self::assertSame((bool)ini_get('session.cookie_httponly'), $this->config->getCookieHttpOnly());
     }
 
-    public function testCookieHttpOnlyIsMutable()
+    public function testCookieHttpOnlyIsMutable(): void
     {
         $value = ! ini_get('session.cookie_httponly');
         $this->config->setCookieHttpOnly($value);
         self::assertEquals($value, $this->config->getCookieHttpOnly());
     }
 
-    public function testCookieHttpOnlyAltersIniSetting()
+    public function testCookieHttpOnlyAltersIniSetting(): void
     {
         $value = ! ini_get('session.cookie_httponly');
         $this->config->setCookieHttpOnly($value);
@@ -444,19 +444,19 @@ public function testCookieHttpOnlyAltersIniSetting()
 
     // session.use_cookies
 
-    public function testUseCookiesDefaultsToIniSettings()
+    public function testUseCookiesDefaultsToIniSettings(): void
     {
         self::assertSame((bool)ini_get('session.use_cookies'), $this->config->getUseCookies());
     }
 
-    public function testUseCookiesIsMutable()
+    public function testUseCookiesIsMutable(): void
     {
         $value = ! ini_get('session.use_cookies');
         $this->config->setUseCookies($value);
         self::assertEquals($value, $this->config->getUseCookies());
     }
 
-    public function testUseCookiesAltersIniSetting()
+    public function testUseCookiesAltersIniSetting(): void
     {
         $value = ! ini_get('session.use_cookies');
         $this->config->setUseCookies($value);
@@ -465,19 +465,19 @@ public function testUseCookiesAltersIniSetting()
 
     // session.use_only_cookies
 
-    public function testUseOnlyCookiesDefaultsToIniSettings()
+    public function testUseOnlyCookiesDefaultsToIniSettings(): void
     {
         self::assertSame((bool)ini_get('session.use_only_cookies'), $this->config->getUseOnlyCookies());
     }
 
-    public function testUseOnlyCookiesIsMutable()
+    public function testUseOnlyCookiesIsMutable(): void
     {
         $value = ! ini_get('session.use_only_cookies');
         $this->config->setOption('use_only_cookies', $value);
         self::assertEquals($value, (bool)$this->config->getOption('use_only_cookies'));
     }
 
-    public function testUseOnlyCookiesAltersIniSetting()
+    public function testUseOnlyCookiesAltersIniSetting(): void
     {
         $value = ! ini_get('session.use_only_cookies');
         $this->config->setOption('use_only_cookies', $value);
@@ -486,24 +486,24 @@ public function testUseOnlyCookiesAltersIniSetting()
 
     // session.referer_check
 
-    public function testRefererCheckDefaultsToIniSettings()
+    public function testRefererCheckDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.referer_check'), $this->config->getRefererCheck());
     }
 
-    public function testRefererCheckIsMutable()
+    public function testRefererCheckIsMutable(): void
     {
         $this->config->setOption('referer_check', 'FOOBAR');
         self::assertEquals('FOOBAR', $this->config->getOption('referer_check'));
     }
 
-    public function testRefererCheckMayBeEmpty()
+    public function testRefererCheckMayBeEmpty(): void
     {
         $this->config->setOption('referer_check', '');
         self::assertEquals('', $this->config->getOption('referer_check'));
     }
 
-    public function testRefererCheckAltersIniSetting()
+    public function testRefererCheckAltersIniSetting(): void
     {
         $this->config->setOption('referer_check', 'BARBAZ');
         self::assertEquals('BARBAZ', ini_get('session.referer_check'));
@@ -511,7 +511,7 @@ public function testRefererCheckAltersIniSetting()
 
     // session.entropy_file
 
-    public function testSetEntropyFileErrorsOnInvalidPath()
+    public function testSetEntropyFileErrorsOnInvalidPath(): void
     {
         $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -519,20 +519,20 @@ public function testSetEntropyFileErrorsOnInvalidPath()
         $this->config->setEntropyFile(__DIR__ . '/foobarboguspath');
     }
 
-    public function testEntropyFileDefaultsToIniSettings()
+    public function testEntropyFileDefaultsToIniSettings(): void
     {
         $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
         self::assertSame(ini_get('session.entropy_file'), $this->config->getEntropyFile());
     }
 
-    public function testEntropyFileIsMutable()
+    public function testEntropyFileIsMutable(): void
     {
         $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
         $this->config->setEntropyFile(__FILE__);
         self::assertEquals(__FILE__, $this->config->getEntropyFile());
     }
 
-    public function testEntropyFileAltersIniSetting()
+    public function testEntropyFileAltersIniSetting(): void
     {
         $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
         $this->config->setEntropyFile(__FILE__);
@@ -542,7 +542,7 @@ public function testEntropyFileAltersIniSetting()
     /**
      * @requires PHP 7.1
      */
-    public function testSetEntropyFileError()
+    public function testSetEntropyFileError(): void
     {
         $this->expectDeprecation();
         $this->config->getEntropyFile();
@@ -551,7 +551,7 @@ public function testSetEntropyFileError()
     /**
      * @requires PHP 7.1
      */
-    public function testGetEntropyFileError()
+    public function testGetEntropyFileError(): void
     {
         $this->expectDeprecation();
         $this->config->setEntropyFile(__FILE__);
@@ -559,34 +559,34 @@ public function testGetEntropyFileError()
 
     // session.entropy_length
 
-    public function testEntropyLengthDefaultsToIniSettings()
+    public function testEntropyLengthDefaultsToIniSettings(): void
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         self::assertSame(ini_get('session.entropy_length'), $this->config->getEntropyLength());
     }
 
-    public function testEntropyLengthIsMutable()
+    public function testEntropyLengthIsMutable(): void
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         $this->config->setEntropyLength(20);
         self::assertEquals(20, $this->config->getEntropyLength());
     }
 
-    public function testEntropyLengthAltersIniSetting()
+    public function testEntropyLengthAltersIniSetting(): void
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         $this->config->setEntropyLength(24);
         self::assertEquals(24, ini_get('session.entropy_length'));
     }
 
-    public function testEntropyLengthCanBeZero()
+    public function testEntropyLengthCanBeZero(): void
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         $this->config->setEntropyLength(0);
         self::assertEquals(0, ini_get('session.entropy_length'));
     }
 
-    public function testSettingInvalidEntropyLengthRaisesException()
+    public function testSettingInvalidEntropyLengthRaisesException(): void
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -594,7 +594,7 @@ public function testSettingInvalidEntropyLengthRaisesException()
         $this->config->setEntropyLength('foobar_bogus');
     }
 
-    public function testSettingInvalidEntropyLengthRaisesException2()
+    public function testSettingInvalidEntropyLengthRaisesException2(): void
     {
         $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -605,7 +605,7 @@ public function testSettingInvalidEntropyLengthRaisesException2()
     /**
      * @requires PHP 7.1
      */
-    public function testGetEntropyLengthError()
+    public function testGetEntropyLengthError(): void
     {
         $this->expectDeprecation();
         $this->config->getEntropyLength();
@@ -614,7 +614,7 @@ public function testGetEntropyLengthError()
     /**
      * @requires PHP 7.1
      */
-    public function testSetEntropyLengthError()
+    public function testSetEntropyLengthError(): void
     {
         $this->expectDeprecation();
         $this->config->setEntropyLength(0);
@@ -622,7 +622,7 @@ public function testSetEntropyLengthError()
 
     // session.cache_limiter
 
-    public function cacheLimiters()
+    public function cacheLimiters(): array
     {
         return [
             [''],
@@ -633,7 +633,7 @@ public function cacheLimiters()
         ];
     }
 
-    public function testCacheLimiterDefaultsToIniSettings()
+    public function testCacheLimiterDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.cache_limiter'), $this->config->getCacheLimiter());
     }
@@ -641,7 +641,7 @@ public function testCacheLimiterDefaultsToIniSettings()
     /**
      * @dataProvider cacheLimiters
      */
-    public function testCacheLimiterIsMutable($cacheLimiter)
+    public function testCacheLimiterIsMutable($cacheLimiter): void
     {
         $this->config->setCacheLimiter($cacheLimiter);
         self::assertEquals($cacheLimiter, $this->config->getCacheLimiter());
@@ -650,13 +650,13 @@ public function testCacheLimiterIsMutable($cacheLimiter)
     /**
      * @dataProvider cacheLimiters
      */
-    public function testCacheLimiterAltersIniSetting($cacheLimiter)
+    public function testCacheLimiterAltersIniSetting($cacheLimiter): void
     {
         $this->config->setCacheLimiter($cacheLimiter);
         self::assertEquals($cacheLimiter, ini_get('session.cache_limiter'));
     }
 
-    public function testSettingInvalidCacheLimiterRaisesException()
+    public function testSettingInvalidCacheLimiterRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cache limiter provided');
@@ -665,31 +665,31 @@ public function testSettingInvalidCacheLimiterRaisesException()
 
     // session.cache_expire
 
-    public function testCacheExpireDefaultsToIniSettings()
+    public function testCacheExpireDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.cache_expire'), $this->config->getCacheExpire());
     }
 
-    public function testCacheExpireIsMutable()
+    public function testCacheExpireIsMutable(): void
     {
         $this->config->setCacheExpire(20);
         self::assertEquals(20, $this->config->getCacheExpire());
     }
 
-    public function testCacheExpireAltersIniSetting()
+    public function testCacheExpireAltersIniSetting(): void
     {
         $this->config->setCacheExpire(24);
         self::assertEquals(24, ini_get('session.cache_expire'));
     }
 
-    public function testSettingInvalidCacheExpireRaisesException()
+    public function testSettingInvalidCacheExpireRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cache_expire; must be numeric');
         $this->config->setCacheExpire('foobar_bogus');
     }
 
-    public function testSettingInvalidCacheExpireRaisesException2()
+    public function testSettingInvalidCacheExpireRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cache_expire; must be a positive integer');
@@ -698,19 +698,19 @@ public function testSettingInvalidCacheExpireRaisesException2()
 
     // session.use_trans_sid
 
-    public function testUseTransSidDefaultsToIniSettings()
+    public function testUseTransSidDefaultsToIniSettings(): void
     {
         self::assertSame((bool)ini_get('session.use_trans_sid'), $this->config->getUseTransSid());
     }
 
-    public function testUseTransSidIsMutable()
+    public function testUseTransSidIsMutable(): void
     {
         $value = ! ini_get('session.use_trans_sid');
         $this->config->setOption('use_trans_sid', $value);
         self::assertEquals($value, (bool)$this->config->getOption('use_trans_sid'));
     }
 
-    public function testUseTransSidAltersIniSetting()
+    public function testUseTransSidAltersIniSetting(): void
     {
         $value = ! ini_get('session.use_trans_sid');
         $this->config->setOption('use_trans_sid', $value);
@@ -719,7 +719,7 @@ public function testUseTransSidAltersIniSetting()
 
     // session.hash_function
 
-    public function hashFunctions()
+    public function hashFunctions(): array
     {
         $hashFunctions = array_merge([0, 1], hash_algos());
         $provider      = [];
@@ -729,7 +729,7 @@ public function hashFunctions()
         return $provider;
     }
 
-    public function testHashFunctionDefaultsToIniSettings()
+    public function testHashFunctionDefaultsToIniSettings(): void
     {
         $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
         self::assertSame(ini_get('session.hash_function'), $this->config->getHashFunction());
@@ -738,7 +738,7 @@ public function testHashFunctionDefaultsToIniSettings()
     /**
      * @dataProvider hashFunctions
      */
-    public function testHashFunctionIsMutable($hashFunction)
+    public function testHashFunctionIsMutable($hashFunction): void
     {
         $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
         $this->config->setHashFunction($hashFunction);
@@ -748,14 +748,14 @@ public function testHashFunctionIsMutable($hashFunction)
     /**
      * @dataProvider hashFunctions
      */
-    public function testHashFunctionAltersIniSetting($hashFunction)
+    public function testHashFunctionAltersIniSetting($hashFunction): void
     {
         $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
         $this->config->setHashFunction($hashFunction);
         self::assertEquals($hashFunction, ini_get('session.hash_function'));
     }
 
-    public function testSettingInvalidHashFunctionRaisesException()
+    public function testSettingInvalidHashFunctionRaisesException(): void
     {
         $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -766,7 +766,7 @@ public function testSettingInvalidHashFunctionRaisesException()
     /**
      * @requires PHP 7.1
      */
-    public function testGetHashFunctionError()
+    public function testGetHashFunctionError(): void
     {
         $this->expectDeprecation();
         $this->config->getHashFunction();
@@ -775,7 +775,7 @@ public function testGetHashFunctionError()
     /**
      * @requires PHP 7.1
      */
-    public function testSetHashFunctionError()
+    public function testSetHashFunctionError(): void
     {
         $this->expectDeprecation();
         $this->config->setHashFunction('foobar_bogus');
@@ -783,7 +783,7 @@ public function testSetHashFunctionError()
 
     // session.hash_bits_per_character
 
-    public function hashBitsPerCharacters()
+    public function hashBitsPerCharacters(): array
     {
         return [
             [4],
@@ -792,7 +792,7 @@ public function hashBitsPerCharacters()
         ];
     }
 
-    public function testHashBitsPerCharacterDefaultsToIniSettings()
+    public function testHashBitsPerCharacterDefaultsToIniSettings(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
@@ -804,7 +804,7 @@ public function testHashBitsPerCharacterDefaultsToIniSettings()
     /**
      * @dataProvider hashBitsPerCharacters
      */
-    public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter)
+    public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter): void
     {
         $this->assertPhpLessThan71('session.hash_bits_per_character directive removed in PHP 7.1');
         $this->config->setHashBitsPerCharacter($hashBitsPerCharacter);
@@ -814,14 +814,14 @@ public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter)
     /**
      * @dataProvider hashBitsPerCharacters
      */
-    public function testHashBitsPerCharacterAltersIniSetting($hashBitsPerCharacter)
+    public function testHashBitsPerCharacterAltersIniSetting($hashBitsPerCharacter): void
     {
         $this->assertPhpLessThan71('session.hash_bits_per_character directive removed in PHP 7.1');
         $this->config->setHashBitsPerCharacter($hashBitsPerCharacter);
         self::assertEquals($hashBitsPerCharacter, ini_get('session.hash_bits_per_character'));
     }
 
-    public function testSettingInvalidHashBitsPerCharacterRaisesException()
+    public function testSettingInvalidHashBitsPerCharacterRaisesException(): void
     {
         $this->assertPhpLessThan71('session.hash_bits_per_character directive removed in PHP 7.1');
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -832,7 +832,7 @@ public function testSettingInvalidHashBitsPerCharacterRaisesException()
     /**
      * @requires PHP 7.1
      */
-    public function testGetHashBitsPerCharacterError()
+    public function testGetHashBitsPerCharacterError(): void
     {
         $this->expectDeprecation();
         $this->config->getHashBitsPerCharacter();
@@ -841,7 +841,7 @@ public function testGetHashBitsPerCharacterError()
     /**
      * @requires PHP 7.1
      */
-    public function testSetHashBitsPerCharacterError()
+    public function testSetHashBitsPerCharacterError(): void
     {
         $this->expectDeprecation();
         $this->config->setHashBitsPerCharacter(5);
@@ -852,7 +852,7 @@ public function testSetHashBitsPerCharacterError()
     /**
      * @requires PHP 7.1
      */
-    public function testSidLengthDefaultsToIniSettings()
+    public function testSidLengthDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.sid_length'), $this->config->getSidLength());
     }
@@ -860,7 +860,7 @@ public function testSidLengthDefaultsToIniSettings()
     /**
      * @requires PHP 7.1
      */
-    public function testSidLengthIsMutable()
+    public function testSidLengthIsMutable(): void
     {
         $this->config->setSidLength(40);
         self::assertEquals(40, $this->config->getSidLength());
@@ -869,7 +869,7 @@ public function testSidLengthIsMutable()
     /**
      * @requires PHP 7.1
      */
-    public function testSidLengthAltersIniSetting()
+    public function testSidLengthAltersIniSetting(): void
     {
         $this->config->setSidLength(40);
         self::assertEquals(40, ini_get('session.sid_length'));
@@ -878,7 +878,7 @@ public function testSidLengthAltersIniSetting()
     /**
      * @requires PHP 7.1
      */
-    public function testSettingInvalidSidLengthRaisesException()
+    public function testSettingInvalidSidLengthRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid length provided');
@@ -888,7 +888,7 @@ public function testSettingInvalidSidLengthRaisesException()
     /**
      * @requires PHP 7.1
      */
-    public function testSettingOutOfRangeSidLengthRaisesException()
+    public function testSettingOutOfRangeSidLengthRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid length provided');
@@ -897,7 +897,7 @@ public function testSettingOutOfRangeSidLengthRaisesException()
 
     // session.sid_bits_per_character
 
-    public function sidSidPerCharacters()
+    public function sidSidPerCharacters(): array
     {
         return [
             [4],
@@ -909,7 +909,7 @@ public function sidSidPerCharacters()
     /**
      * @requires PHP 7.1
      */
-    public function testSidBitsPerCharacterDefaultsToIniSettings()
+    public function testSidBitsPerCharacterDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.sid_bits_per_character'), $this->config->getSidBitsPerCharacter());
     }
@@ -918,7 +918,7 @@ public function testSidBitsPerCharacterDefaultsToIniSettings()
      * @requires PHP 7.1
      * @dataProvider sidSidPerCharacters
      */
-    public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter)
+    public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter): void
     {
         $this->config->setSidBitsPerCharacter($sidBitsPerCharacter);
         self::assertEquals($sidBitsPerCharacter, $this->config->getSidBitsPerCharacter());
@@ -928,7 +928,7 @@ public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter)
      * @requires PHP 7.1
      * @dataProvider sidSidPerCharacters
      */
-    public function testSidBitsPerCharacterAltersIniSetting($sidBitsPerCharacter)
+    public function testSidBitsPerCharacterAltersIniSetting($sidBitsPerCharacter): void
     {
         $this->config->setSidBitsPerCharacter($sidBitsPerCharacter);
         self::assertEquals($sidBitsPerCharacter, ini_get('session.sid_bits_per_character'));
@@ -937,7 +937,7 @@ public function testSidBitsPerCharacterAltersIniSetting($sidBitsPerCharacter)
     /**
      * @requires PHP 7.1
      */
-    public function testSettingInvalidSidBitsPerCharacterRaisesException()
+    public function testSettingInvalidSidBitsPerCharacterRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid sid bits per character provided');
@@ -947,7 +947,7 @@ public function testSettingInvalidSidBitsPerCharacterRaisesException()
     /**
      * @requires PHP 7.1
      */
-    public function testSettingOutOfBoundSidBitsPerCharacterRaisesException()
+    public function testSettingOutOfBoundSidBitsPerCharacterRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid sid bits per character provided');
@@ -956,18 +956,18 @@ public function testSettingOutOfBoundSidBitsPerCharacterRaisesException()
 
     // url_rewriter.tags
 
-    public function testUrlRewriterTagsDefaultsToIniSettings()
+    public function testUrlRewriterTagsDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('url_rewriter.tags'), $this->config->getUrlRewriterTags());
     }
 
-    public function testUrlRewriterTagsIsMutable()
+    public function testUrlRewriterTagsIsMutable(): void
     {
         $this->config->setUrlRewriterTags('a=href,form=action');
         self::assertEquals('a=href,form=action', $this->config->getUrlRewriterTags());
     }
 
-    public function testUrlRewriterTagsAltersIniSetting()
+    public function testUrlRewriterTagsAltersIniSetting(): void
     {
         $this->config->setUrlRewriterTags('a=href,fieldset=');
         self::assertEquals('a=href,fieldset=', ini_get('url_rewriter.tags'));
@@ -975,12 +975,12 @@ public function testUrlRewriterTagsAltersIniSetting()
 
     // remember_me_seconds
 
-    public function testRememberMeSecondsDefaultsToTwoWeeks()
+    public function testRememberMeSecondsDefaultsToTwoWeeks(): void
     {
         self::assertEquals(1209600, $this->config->getRememberMeSeconds());
     }
 
-    public function testRememberMeSecondsIsMutable()
+    public function testRememberMeSecondsIsMutable(): void
     {
         $this->config->setRememberMeSeconds(604800);
         self::assertEquals(604800, $this->config->getRememberMeSeconds());
@@ -991,7 +991,7 @@ public function testRememberMeSecondsIsMutable()
     /**
      * @dataProvider optionsProvider
      */
-    public function testSetOptionSetsIniSetting($option, $getter, $value)
+    public function testSetOptionSetsIniSetting($option, $getter, $value): void
     {
         // Leaving out special cases.
         if ($option == 'remember_me_seconds' || $option == 'url_rewriter_tags') {
@@ -1002,22 +1002,22 @@ public function testSetOptionSetsIniSetting($option, $getter, $value)
         self::assertEquals(ini_get('session.' . $option), $value);
     }
 
-    public function testSetOptionUrlRewriterTagsGetsMunged()
+    public function testSetOptionUrlRewriterTagsGetsMunged(): void
     {
         $value = 'a=href';
         $this->config->setStorageOption('url_rewriter_tags', $value);
         self::assertEquals(ini_get('url_rewriter.tags'), $value);
     }
 
-    public function testSetOptionRememberMeSecondsDoesNothing()
+    public function testSetOptionRememberMeSecondsDoesNothing(): void
     {
         self::markTestIncomplete('I have no idea how to test this.');
     }
 
-    public function testSetOptionsThrowsExceptionOnInvalidKey()
+    public function testSetOptionsThrowsExceptionOnInvalidKey(): void
     {
         $badKey = 'snarfblat';
-        $value = 'foobar';
+        $value  = 'foobar';
 
         $this->expectException('InvalidArgumentException');
         $this->config->setStorageOption($badKey, $value);
@@ -1028,7 +1028,7 @@ public function testSetOptionsThrowsExceptionOnInvalidKey()
     /**
      * @dataProvider optionsProvider
      */
-    public function testSetOptionsTranslatesUnderscoreSeparatedKeys($option, $getter, $value)
+    public function testSetOptionsTranslatesUnderscoreSeparatedKeys($option, $getter, $value): void
     {
         $options = [$option => $value];
         $this->config->setOptions($options);
@@ -1039,7 +1039,7 @@ public function testSetOptionsTranslatesUnderscoreSeparatedKeys($option, $getter
         }
     }
 
-    public function optionsProvider()
+    public function optionsProvider(): array
     {
         $commonOptions = [
             [
@@ -1186,14 +1186,14 @@ public function optionsProvider()
         return $commonOptions;
     }
 
-    public function testSetPhpSaveHandlerRaisesExceptionForAttemptsToSetUserModule()
+    public function testSetPhpSaveHandlerRaisesExceptionForAttemptsToSetUserModule(): void
     {
         $this->expectException(Exception\InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid save handler specified ("user")');
         $this->config->setPhpSaveHandler('user');
     }
 
-    public function testErrorSettingKnownSaveHandlerResultsInException()
+    public function testErrorSettingKnownSaveHandlerResultsInException(): void
     {
         $r = new ReflectionProperty($this->config, 'knownSaveHandlers');
         $r->setAccessible(true);
@@ -1204,7 +1204,7 @@ public function testErrorSettingKnownSaveHandlerResultsInException()
         $this->config->setPhpSaveHandler('notreallyredis');
     }
 
-    public function testProvidingNonSessionHandlerToSetPhpSaveHandlerResultsInException()
+    public function testProvidingNonSessionHandlerToSetPhpSaveHandlerResultsInException(): void
     {
         $handler = new stdClass();
 
@@ -1213,7 +1213,7 @@ public function testProvidingNonSessionHandlerToSetPhpSaveHandlerResultsInExcept
         $this->config->setPhpSaveHandler($handler);
     }
 
-    public function testProvidingValidKnownSessionHandlerToSetPhpSaveHandlerResultsInNoErrors()
+    public function testProvidingValidKnownSessionHandlerToSetPhpSaveHandlerResultsInNoErrors(): void
     {
         $phpinfo = $this->getFunctionMock('Laminas\Session\Config', 'phpinfo');
         $phpinfo
@@ -1233,7 +1233,7 @@ function () {
         self::assertEquals('unittest', $this->config->getOption('save_handler'));
     }
 
-    public function testCanProvidePathWhenUsingRedisSaveHandler()
+    public function testCanProvidePathWhenUsingRedisSaveHandler(): void
     {
         $phpinfo = $this->getFunctionMock('Laminas\Session\Config', 'phpinfo');
         $phpinfo
@@ -1259,7 +1259,7 @@ function () {
         self::assertSame($url, $this->config->getOption('save_path'));
     }
 
-    public function testNotCallLocateRegisteredSaveHandlersMethodIfSessionHandlerInterfaceWasPassed()
+    public function testNotCallLocateRegisteredSaveHandlersMethodIfSessionHandlerInterfaceWasPassed(): void
     {
         $phpinfo = $this->getFunctionMock('Laminas\Session\Config', 'phpinfo');
         $phpinfo
diff --git a/test/Config/StandardConfigTest.php b/test/Config/StandardConfigTest.php
index e74b4282..b7f7cf4f 100644
--- a/test/Config/StandardConfigTest.php
+++ b/test/Config/StandardConfigTest.php
@@ -28,21 +28,21 @@ protected function setUp(): void
 
     // session.save_path
 
-    public function testSetSavePathErrorsOnInvalidPath()
+    public function testSetSavePathErrorsOnInvalidPath(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid save_path provided');
         $this->config->setSavePath(__DIR__ . '/foobarboguspath');
     }
 
-    public function testSavePathIsMutable()
+    public function testSavePathIsMutable(): void
     {
         $this->config->setSavePath(__DIR__);
         self::assertEquals(__DIR__, $this->config->getSavePath());
     }
     // session.name
 
-    public function testNameIsMutable()
+    public function testNameIsMutable(): void
     {
         $this->config->setName('FOOBAR');
         self::assertEquals('FOOBAR', $this->config->getName());
@@ -50,7 +50,7 @@ public function testNameIsMutable()
 
     // session.save_handler
 
-    public function testSaveHandlerIsMutable()
+    public function testSaveHandlerIsMutable(): void
     {
         $this->config->setSaveHandler('user');
         self::assertEquals('user', $this->config->getSaveHandler());
@@ -58,33 +58,33 @@ public function testSaveHandlerIsMutable()
 
     // session.gc_probability
 
-    public function testGcProbabilityIsMutable()
+    public function testGcProbabilityIsMutable(): void
     {
         $this->config->setGcProbability(20);
         self::assertEquals(20, $this->config->getGcProbability());
     }
 
-    public function testGcProbabilityCanBeSetToZero()
+    public function testGcProbabilityCanBeSetToZero(): void
     {
         $this->config->setGcProbability(0);
         self::assertEquals(0, $this->config->getGcProbability());
     }
 
-    public function testSettingInvalidGcProbabilityRaisesException()
+    public function testSettingInvalidGcProbabilityRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_probability; must be numeric');
         $this->config->setGcProbability('foobar_bogus');
     }
 
-    public function testSettingInvalidGcProbabilityRaisesException2()
+    public function testSettingInvalidGcProbabilityRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_probability; must be a percentage');
         $this->config->setGcProbability(-1);
     }
 
-    public function testSettingInvalidGcProbabilityRaisesException3()
+    public function testSettingInvalidGcProbabilityRaisesException3(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_probability; must be a percentage');
@@ -93,20 +93,20 @@ public function testSettingInvalidGcProbabilityRaisesException3()
 
     // session.gc_divisor
 
-    public function testGcDivisorIsMutable()
+    public function testGcDivisorIsMutable(): void
     {
         $this->config->setGcDivisor(20);
         self::assertEquals(20, $this->config->getGcDivisor());
     }
 
-    public function testSettingInvalidGcDivisorRaisesException()
+    public function testSettingInvalidGcDivisorRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_divisor; must be numeric');
         $this->config->setGcDivisor('foobar_bogus');
     }
 
-    public function testSettingInvalidGcDivisorRaisesException2()
+    public function testSettingInvalidGcDivisorRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_divisor; must be a positive integer');
@@ -115,20 +115,20 @@ public function testSettingInvalidGcDivisorRaisesException2()
 
     // session.gc_maxlifetime
 
-    public function testGcMaxlifetimeIsMutable()
+    public function testGcMaxlifetimeIsMutable(): void
     {
         $this->config->setGcMaxlifetime(20);
         self::assertEquals(20, $this->config->getGcMaxlifetime());
     }
 
-    public function testSettingInvalidGcMaxlifetimeRaisesException()
+    public function testSettingInvalidGcMaxlifetimeRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_maxlifetime; must be numeric');
         $this->config->setGcMaxlifetime('foobar_bogus');
     }
 
-    public function testSettingInvalidGcMaxlifetimeRaisesException2()
+    public function testSettingInvalidGcMaxlifetimeRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid gc_maxlifetime; must be a positive integer');
@@ -137,7 +137,7 @@ public function testSettingInvalidGcMaxlifetimeRaisesException2()
 
     // session.serialize_handler
 
-    public function testSerializeHandlerIsMutable()
+    public function testSerializeHandlerIsMutable(): void
     {
         $value = extension_loaded('wddx') ? 'wddx' : 'php_binary';
         $this->config->setSerializeHandler($value);
@@ -146,26 +146,26 @@ public function testSerializeHandlerIsMutable()
 
     // session.cookie_lifetime
 
-    public function testCookieLifetimeIsMutable()
+    public function testCookieLifetimeIsMutable(): void
     {
         $this->config->setCookieLifetime(20);
         self::assertEquals(20, $this->config->getCookieLifetime());
     }
 
-    public function testCookieLifetimeCanBeZero()
+    public function testCookieLifetimeCanBeZero(): void
     {
         $this->config->setCookieLifetime(0);
         self::assertEquals(0, $this->config->getCookieLifetime());
     }
 
-    public function testSettingInvalidCookieLifetimeRaisesException()
+    public function testSettingInvalidCookieLifetimeRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie_lifetime; must be numeric');
         $this->config->setCookieLifetime('foobar_bogus');
     }
 
-    public function testSettingInvalidCookieLifetimeRaisesException2()
+    public function testSettingInvalidCookieLifetimeRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie_lifetime; must be a positive integer or zero');
@@ -174,27 +174,27 @@ public function testSettingInvalidCookieLifetimeRaisesException2()
 
     // session.cookie_path
 
-    public function testCookiePathIsMutable()
+    public function testCookiePathIsMutable(): void
     {
         $this->config->setCookiePath('/foo');
         self::assertEquals('/foo', $this->config->getCookiePath());
     }
 
-    public function testSettingInvalidCookiePathRaisesException()
+    public function testSettingInvalidCookiePathRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie path');
         $this->config->setCookiePath(24);
     }
 
-    public function testSettingInvalidCookiePathRaisesException2()
+    public function testSettingInvalidCookiePathRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie path');
         $this->config->setCookiePath('foo');
     }
 
-    public function testSettingInvalidCookiePathRaisesException3()
+    public function testSettingInvalidCookiePathRaisesException3(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie path');
@@ -203,26 +203,26 @@ public function testSettingInvalidCookiePathRaisesException3()
 
     // session.cookie_domain
 
-    public function testCookieDomainIsMutable()
+    public function testCookieDomainIsMutable(): void
     {
         $this->config->setCookieDomain('example.com');
         self::assertEquals('example.com', $this->config->getCookieDomain());
     }
 
-    public function testCookieDomainCanBeEmpty()
+    public function testCookieDomainCanBeEmpty(): void
     {
         $this->config->setCookieDomain('');
         self::assertEquals('', $this->config->getCookieDomain());
     }
 
-    public function testSettingInvalidCookieDomainRaisesException()
+    public function testSettingInvalidCookieDomainRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cookie domain: must be a string');
         $this->config->setCookieDomain(24);
     }
 
-    public function testSettingInvalidCookieDomainRaisesException2()
+    public function testSettingInvalidCookieDomainRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('does not match the expected structure for a DNS hostname');
@@ -231,7 +231,7 @@ public function testSettingInvalidCookieDomainRaisesException2()
 
     // session.cookie_secure
 
-    public function testCookieSecureIsMutable()
+    public function testCookieSecureIsMutable(): void
     {
         $this->config->setCookieSecure(true);
         self::assertEquals(true, $this->config->getCookieSecure());
@@ -239,7 +239,7 @@ public function testCookieSecureIsMutable()
 
     // session.cookie_httponly
 
-    public function testCookieHttpOnlyIsMutable()
+    public function testCookieHttpOnlyIsMutable(): void
     {
         $this->config->setCookieHttpOnly(true);
         self::assertEquals(true, $this->config->getCookieHttpOnly());
@@ -247,7 +247,7 @@ public function testCookieHttpOnlyIsMutable()
 
     // session.use_cookies
 
-    public function testUseCookiesIsMutable()
+    public function testUseCookiesIsMutable(): void
     {
         $this->config->setUseCookies(true);
         self::assertEquals(true, (bool)$this->config->getUseCookies());
@@ -255,7 +255,7 @@ public function testUseCookiesIsMutable()
 
     // session.use_only_cookies
 
-    public function testUseOnlyCookiesIsMutable()
+    public function testUseOnlyCookiesIsMutable(): void
     {
         $this->config->setUseOnlyCookies(true);
         self::assertEquals(true, (bool)$this->config->getUseOnlyCookies());
@@ -263,13 +263,13 @@ public function testUseOnlyCookiesIsMutable()
 
     // session.referer_check
 
-    public function testRefererCheckIsMutable()
+    public function testRefererCheckIsMutable(): void
     {
         $this->config->setRefererCheck('FOOBAR');
         self::assertEquals('FOOBAR', $this->config->getRefererCheck());
     }
 
-    public function testRefererCheckMayBeEmpty()
+    public function testRefererCheckMayBeEmpty(): void
     {
         $this->config->setRefererCheck('');
         self::assertEquals('', $this->config->getRefererCheck());
@@ -277,7 +277,7 @@ public function testRefererCheckMayBeEmpty()
 
     // session.entropy_file
 
-    public function testSetEntropyFileErrorsOnInvalidPath()
+    public function testSetEntropyFileErrorsOnInvalidPath(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
@@ -288,7 +288,7 @@ public function testSetEntropyFileErrorsOnInvalidPath()
         $this->config->setEntropyFile(__DIR__ . '/foobarboguspath');
     }
 
-    public function testEntropyFileIsMutable()
+    public function testEntropyFileIsMutable(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
@@ -301,7 +301,7 @@ public function testEntropyFileIsMutable()
     /**
      * @requires PHP 7.1
      */
-    public function testSetEntropyFileError()
+    public function testSetEntropyFileError(): void
     {
         $this->expectDeprecation();
         $this->config->getEntropyFile();
@@ -310,7 +310,7 @@ public function testSetEntropyFileError()
     /**
      * @requires PHP 7.1
      */
-    public function testGetEntropyFileError()
+    public function testGetEntropyFileError(): void
     {
         $this->expectDeprecation();
         $this->config->setEntropyFile(__FILE__);
@@ -318,7 +318,7 @@ public function testGetEntropyFileError()
 
     // session.entropy_length
 
-    public function testEntropyLengthIsMutable()
+    public function testEntropyLengthIsMutable(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
@@ -328,7 +328,7 @@ public function testEntropyLengthIsMutable()
         self::assertEquals(20, $this->config->getEntropyLength());
     }
 
-    public function testEntropyLengthCanBeZero()
+    public function testEntropyLengthCanBeZero(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
@@ -338,7 +338,7 @@ public function testEntropyLengthCanBeZero()
         self::assertEquals(0, $this->config->getEntropyLength());
     }
 
-    public function testSettingInvalidEntropyLengthRaisesException()
+    public function testSettingInvalidEntropyLengthRaisesException(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
@@ -349,7 +349,7 @@ public function testSettingInvalidEntropyLengthRaisesException()
         $this->config->setEntropyLength('foobar_bogus');
     }
 
-    public function testSettingInvalidEntropyLengthRaisesException2()
+    public function testSettingInvalidEntropyLengthRaisesException2(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
@@ -363,7 +363,7 @@ public function testSettingInvalidEntropyLengthRaisesException2()
     /**
      * @requires PHP 7.1
      */
-    public function testGetEntropyLengthError()
+    public function testGetEntropyLengthError(): void
     {
         $this->expectDeprecation();
         $this->config->getEntropyLength();
@@ -372,7 +372,7 @@ public function testGetEntropyLengthError()
     /**
      * @requires PHP 7.1
      */
-    public function testSetEntropyLengthError()
+    public function testSetEntropyLengthError(): void
     {
         $this->expectDeprecation();
         $this->config->setEntropyLength(0);
@@ -380,7 +380,7 @@ public function testSetEntropyLengthError()
 
     // session.cache_limiter
 
-    public function cacheLimiters()
+    public function cacheLimiters(): array
     {
         return [
             ['nocache'],
@@ -393,7 +393,7 @@ public function cacheLimiters()
     /**
      * @dataProvider cacheLimiters
      */
-    public function testCacheLimiterIsMutable($cacheLimiter)
+    public function testCacheLimiterIsMutable($cacheLimiter): void
     {
         $this->config->setCacheLimiter($cacheLimiter);
         self::assertEquals($cacheLimiter, $this->config->getCacheLimiter());
@@ -401,20 +401,20 @@ public function testCacheLimiterIsMutable($cacheLimiter)
 
     // session.cache_expire
 
-    public function testCacheExpireIsMutable()
+    public function testCacheExpireIsMutable(): void
     {
         $this->config->setCacheExpire(20);
         self::assertEquals(20, $this->config->getCacheExpire());
     }
 
-    public function testSettingInvalidCacheExpireRaisesException()
+    public function testSettingInvalidCacheExpireRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cache_expire; must be numeric');
         $this->config->setCacheExpire('foobar_bogus');
     }
 
-    public function testSettingInvalidCacheExpireRaisesException2()
+    public function testSettingInvalidCacheExpireRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid cache_expire; must be a positive integer');
@@ -423,7 +423,7 @@ public function testSettingInvalidCacheExpireRaisesException2()
 
     // session.use_trans_sid
 
-    public function testUseTransSidIsMutable()
+    public function testUseTransSidIsMutable(): void
     {
         $this->config->setUseTransSid(true);
         self::assertEquals(true, (bool)$this->config->getUseTransSid());
@@ -431,7 +431,7 @@ public function testUseTransSidIsMutable()
 
     // session.hash_function
 
-    public function hashFunctions()
+    public function hashFunctions(): array
     {
         $hashFunctions = array_merge([0, 1], hash_algos());
         $provider      = [];
@@ -444,7 +444,7 @@ public function hashFunctions()
     /**
      * @dataProvider hashFunctions
      */
-    public function testHashFunctionIsMutable($hashFunction)
+    public function testHashFunctionIsMutable($hashFunction): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.hash_function directive removed in PHP 7.1');
@@ -457,7 +457,7 @@ public function testHashFunctionIsMutable($hashFunction)
     /**
      * @requires PHP 7.1
      */
-    public function testGetHashFunctionError()
+    public function testGetHashFunctionError(): void
     {
         $this->expectDeprecation();
         $this->config->getHashFunction();
@@ -466,7 +466,7 @@ public function testGetHashFunctionError()
     /**
      * @requires PHP 7.1
      */
-    public function testSetHashFunctionError()
+    public function testSetHashFunctionError(): void
     {
         $this->expectDeprecation();
         $this->config->setHashFunction('foobar_bogus');
@@ -474,7 +474,7 @@ public function testSetHashFunctionError()
 
     // session.hash_bits_per_character
 
-    public function hashBitsPerCharacters()
+    public function hashBitsPerCharacters(): array
     {
         return [
             [4],
@@ -486,7 +486,7 @@ public function hashBitsPerCharacters()
     /**
      * @dataProvider hashBitsPerCharacters
      */
-    public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter)
+    public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
@@ -496,7 +496,7 @@ public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter)
         self::assertEquals($hashBitsPerCharacter, $this->config->getHashBitsPerCharacter());
     }
 
-    public function testSettingInvalidHashBitsPerCharacterRaisesException()
+    public function testSettingInvalidHashBitsPerCharacterRaisesException(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
@@ -510,7 +510,7 @@ public function testSettingInvalidHashBitsPerCharacterRaisesException()
     /**
      * @requires PHP 7.1
      */
-    public function testGetHashBitsPerCharacterError()
+    public function testGetHashBitsPerCharacterError(): void
     {
         $this->expectDeprecation();
         $this->config->getHashBitsPerCharacter();
@@ -519,7 +519,7 @@ public function testGetHashBitsPerCharacterError()
     /**
      * @requires PHP 7.1
      */
-    public function testSetHashBitsPerCharacterError()
+    public function testSetHashBitsPerCharacterError(): void
     {
         $this->expectDeprecation();
         $this->config->setHashBitsPerCharacter(5);
@@ -530,7 +530,7 @@ public function testSetHashBitsPerCharacterError()
     /**
      * @requires PHP 7.1
      */
-    public function testSidLengthIsMutable()
+    public function testSidLengthIsMutable(): void
     {
         $this->config->setSidLength(40);
         self::assertEquals(40, $this->config->getSidLength());
@@ -539,7 +539,7 @@ public function testSidLengthIsMutable()
     /**
      * @requires PHP 7.1
      */
-    public function testSettingInvalidSidLengthRaisesException()
+    public function testSettingInvalidSidLengthRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid length provided');
@@ -549,7 +549,7 @@ public function testSettingInvalidSidLengthRaisesException()
     /**
      * @requires PHP 7.1
      */
-    public function testSettingOutOfRangeSidLengthRaisesException()
+    public function testSettingOutOfRangeSidLengthRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid length provided');
@@ -558,7 +558,7 @@ public function testSettingOutOfRangeSidLengthRaisesException()
 
     // session.sid_bits_per_character
 
-    public function sidBitsPerCharacters()
+    public function sidBitsPerCharacters(): array
     {
         return [
             [4],
@@ -571,7 +571,7 @@ public function sidBitsPerCharacters()
      * @requires PHP 7.1
      * @dataProvider sidBitsPerCharacters
      */
-    public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter)
+    public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter): void
     {
         $this->config->setSidBitsPerCharacter($sidBitsPerCharacter);
         self::assertEquals($sidBitsPerCharacter, $this->config->getSidBitsPerCharacter());
@@ -580,7 +580,7 @@ public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter)
     /**
      * @requires PHP 7.1
      */
-    public function testSettingInvalidSidBitsPerCharacterRaisesException()
+    public function testSettingInvalidSidBitsPerCharacterRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid sid bits per character provided');
@@ -589,7 +589,7 @@ public function testSettingInvalidSidBitsPerCharacterRaisesException()
 
     // url_rewriter.tags
 
-    public function testUrlRewriterTagsIsMutable()
+    public function testUrlRewriterTagsIsMutable(): void
     {
         $this->config->setUrlRewriterTags('a=href,form=action');
         self::assertEquals('a=href,form=action', $this->config->getUrlRewriterTags());
@@ -597,20 +597,20 @@ public function testUrlRewriterTagsIsMutable()
 
     // remember_me_seconds
 
-    public function testRememberMeSecondsIsMutable()
+    public function testRememberMeSecondsIsMutable(): void
     {
         $this->config->setRememberMeSeconds(20);
         self::assertEquals(20, $this->config->getRememberMeSeconds());
     }
 
-    public function testSettingInvalidRememberMeSecondsRaisesException()
+    public function testSettingInvalidRememberMeSecondsRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid remember_me_seconds; must be numeric');
         $this->config->setRememberMeSeconds('foobar_bogus');
     }
 
-    public function testSettingInvalidRememberMeSecondsRaisesException2()
+    public function testSettingInvalidRememberMeSecondsRaisesException2(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Invalid remember_me_seconds; must be a positive integer');
@@ -622,14 +622,14 @@ public function testSettingInvalidRememberMeSecondsRaisesException2()
     /**
      * @dataProvider optionsProvider
      */
-    public function testSetOptionsTranslatesUnderscoreSeparatedKeys($option, $getter, $value)
+    public function testSetOptionsTranslatesUnderscoreSeparatedKeys($option, $getter, $value): void
     {
         $options = [$option => $value];
         $this->config->setOptions($options);
         self::assertSame($value, $this->config->$getter());
     }
 
-    public function optionsProvider()
+    public function optionsProvider(): array
     {
         $commonOptions = [
             [
@@ -771,7 +771,7 @@ public function optionsProvider()
      *
      * @link https://github.com/zendframework/zf2/issues/3046
      */
-    public function testSetEntropyDevUrandom()
+    public function testSetEntropyDevUrandom(): void
     {
         if (PHP_VERSION_ID >= 70100) {
             self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
diff --git a/test/ContainerTest.php b/test/ContainerTest.php
index 0b215958..e5432d6c 100644
--- a/test/ContainerTest.php
+++ b/test/ContainerTest.php
@@ -58,43 +58,43 @@ protected function tearDown(): void
         Container::setDefaultManager(null);
     }
 
-    public function testInstantiationStartsSession()
+    public function testInstantiationStartsSession(): void
     {
         $this->manager->destroy();
         $container = new Container('Default', $this->manager);
         self::assertTrue($this->manager->started);
     }
 
-    public function testInstantiatingContainerWithoutNameUsesDefaultAsName()
+    public function testInstantiatingContainerWithoutNameUsesDefaultAsName(): void
     {
         self::assertEquals('Default', $this->container->getName());
     }
 
-    public function testPassingNameToConstructorInstantiatesContainerWithThatName()
+    public function testPassingNameToConstructorInstantiatesContainerWithThatName(): void
     {
         $container = new Container('foo', $this->manager);
         self::assertEquals('foo', $container->getName());
     }
 
-    public function testPassingNameStartingWithDigitToConstructorInstantiatesContainerWithThatName()
+    public function testPassingNameStartingWithDigitToConstructorInstantiatesContainerWithThatName(): void
     {
         $container = new Container('0foo', $this->manager);
         self::assertEquals('0foo', $container->getName());
     }
 
-    public function testUsingOldLaminas1NameIsStillValid()
+    public function testUsingOldLaminas1NameIsStillValid(): void
     {
         $container = new Container('Laminas_Foo', $this->manager);
         self::assertEquals('Laminas_Foo', $container->getName());
     }
 
-    public function testUsingNewLaminasNamespaceIsValid()
+    public function testUsingNewLaminasNamespaceIsValid(): void
     {
         $container = new Container('Laminas\Foo', $this->manager);
         self::assertEquals('Laminas\Foo', $container->getName());
     }
 
-    public function testPassingInvalidNameToConstructorRaisesException()
+    public function testPassingInvalidNameToConstructorRaisesException(): void
     {
         $tries = [
             'f!',
@@ -102,7 +102,7 @@ public function testPassingInvalidNameToConstructorRaisesException()
             '_foo',
             '__foo',
             '\foo',
-            '\\foo'
+            '\\foo',
         ];
         foreach ($tries as $try) {
             try {
@@ -114,7 +114,7 @@ public function testPassingInvalidNameToConstructorRaisesException()
         }
     }
 
-    public function testContainerActsAsArray()
+    public function testContainerActsAsArray(): void
     {
         $this->container['foo'] = 'bar';
         self::assertTrue(isset($this->container['foo']));
@@ -123,7 +123,7 @@ public function testContainerActsAsArray()
         self::assertFalse(isset($this->container['foo']));
     }
 
-    public function testContainerActsAsObject()
+    public function testContainerActsAsObject(): void
     {
         $this->container->foo = 'bar';
         self::assertTrue(isset($this->container->foo));
@@ -132,20 +132,20 @@ public function testContainerActsAsObject()
         self::assertFalse(isset($this->container->foo));
     }
 
-    public function testDefaultManagerIsAlwaysPopulated()
+    public function testDefaultManagerIsAlwaysPopulated(): void
     {
         $manager = Container::getDefaultManager();
         self::assertInstanceOf('Laminas\Session\ManagerInterface', $manager);
     }
 
-    public function testCanSetDefaultManager()
+    public function testCanSetDefaultManager(): void
     {
         $manager = new TestAsset\TestManager();
         Container::setDefaultManager($manager);
         self::assertSame($manager, Container::getDefaultManager());
     }
 
-    public function testCanSetDefaultManagerToNull()
+    public function testCanSetDefaultManagerToNull(): void
     {
         $manager = new TestAsset\TestManager();
         Container::setDefaultManager($manager);
@@ -153,14 +153,14 @@ public function testCanSetDefaultManagerToNull()
         self::assertNotSame($manager, Container::getDefaultManager());
     }
 
-    public function testDefaultManagerUsedWhenNoManagerProvided()
+    public function testDefaultManagerUsedWhenNoManagerProvided(): void
     {
         $manager   = Container::getDefaultManager();
         $container = new Container();
         self::assertSame($manager, $container->getManager());
     }
 
-    public function testContainerInstantiatesManagerWithDefaultsWhenNotInjected()
+    public function testContainerInstantiatesManagerWithDefaultsWhenNotInjected(): void
     {
         $container = new Container();
         $manager   = $container->getManager();
@@ -171,17 +171,19 @@ public function testContainerInstantiatesManagerWithDefaultsWhenNotInjected()
         self::assertInstanceOf('Laminas\Session\Storage\SessionArrayStorage', $storage);
     }
 
-    public function testContainerAllowsInjectingManagerViaConstructor()
+    public function testContainerAllowsInjectingManagerViaConstructor(): void
     {
-        $config    = new StandardConfig([
-            'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
-        ]);
+        $config    = new StandardConfig(
+            [
+                'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
+            ]
+        );
         $manager   = new TestAsset\TestManager($config);
         $container = new Container('Foo', $manager);
         self::assertSame($manager, $container->getManager());
     }
 
-    public function testContainerWritesToStorage()
+    public function testContainerWritesToStorage(): void
     {
         $this->container->foo = 'bar';
         $storage              = $this->manager->getStorage();
@@ -193,7 +195,7 @@ public function testContainerWritesToStorage()
         self::assertFalse(isset($storage['Default']['foo']));
     }
 
-    public function testSettingExpirationSecondsUpdatesStorageMetadataForFullContainer()
+    public function testSettingExpirationSecondsUpdatesStorageMetadataForFullContainer(): void
     {
         $currentTimestamp = time();
         $this->container->setExpirationSeconds(3600);
@@ -203,7 +205,7 @@ public function testSettingExpirationSecondsUpdatesStorageMetadataForFullContain
         self::assertEquals($currentTimestamp + 3600, $metadata['EXPIRE']);
     }
 
-    public function testSettingExpirationSecondsForIndividualKeyUpdatesStorageMetadataForThatKey()
+    public function testSettingExpirationSecondsForIndividualKeyUpdatesStorageMetadataForThatKey(): void
     {
         $this->container->foo = 'bar';
         $currentTimestamp     = time();
@@ -215,7 +217,7 @@ public function testSettingExpirationSecondsForIndividualKeyUpdatesStorageMetada
         self::assertEquals($currentTimestamp + 3600, $metadata['EXPIRE_KEYS']['foo']);
     }
 
-    public function testMultipleCallsToExpirationSecondsAggregates()
+    public function testMultipleCallsToExpirationSecondsAggregates(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -233,7 +235,7 @@ public function testMultipleCallsToExpirationSecondsAggregates()
         self::assertEquals($currentTimestamp + 3600, $metadata['EXPIRE']);
     }
 
-    public function testSettingExpirationSecondsUsesCurrentTime()
+    public function testSettingExpirationSecondsUsesCurrentTime(): void
     {
         sleep(3);
         $this->container->setExpirationSeconds(2);
@@ -246,7 +248,7 @@ public function testSettingExpirationSecondsUsesCurrentTime()
         self::assertEquals('bar', $this->container->foo);
     }
 
-    public function testPassingUnsetKeyToSetExpirationSecondsDoesNothing()
+    public function testPassingUnsetKeyToSetExpirationSecondsDoesNothing(): void
     {
         $this->container->setExpirationSeconds(3600, 'foo');
         $storage  = $this->manager->getStorage();
@@ -254,7 +256,7 @@ public function testPassingUnsetKeyToSetExpirationSecondsDoesNothing()
         self::assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
     }
 
-    public function testPassingUnsetKeyInArrayToSetExpirationSecondsDoesNothing()
+    public function testPassingUnsetKeyInArrayToSetExpirationSecondsDoesNothing(): void
     {
         $this->container->setExpirationSeconds(3600, ['foo']);
         $storage  = $this->manager->getStorage();
@@ -262,7 +264,7 @@ public function testPassingUnsetKeyInArrayToSetExpirationSecondsDoesNothing()
         self::assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
     }
 
-    public function testGetKeyWithContainerExpirationInPastResetsToNull()
+    public function testGetKeyWithContainerExpirationInPastResetsToNull(): void
     {
         $this->container->foo = 'bar';
         $storage              = $this->manager->getStorage();
@@ -270,7 +272,7 @@ public function testGetKeyWithContainerExpirationInPastResetsToNull()
         self::assertNull($this->container->foo);
     }
 
-    public function testGetKeyWithExpirationInPastResetsToNull()
+    public function testGetKeyWithExpirationInPastResetsToNull(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -280,7 +282,7 @@ public function testGetKeyWithExpirationInPastResetsToNull()
         self::assertEquals('baz', $this->container->bar);
     }
 
-    public function testKeyExistsWithContainerExpirationInPastReturnsFalse()
+    public function testKeyExistsWithContainerExpirationInPastReturnsFalse(): void
     {
         $this->container->foo = 'bar';
         $storage              = $this->manager->getStorage();
@@ -288,7 +290,7 @@ public function testKeyExistsWithContainerExpirationInPastReturnsFalse()
         self::assertFalse(isset($this->container->foo));
     }
 
-    public function testKeyExistsWithExpirationInPastReturnsFalse()
+    public function testKeyExistsWithExpirationInPastReturnsFalse(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -298,7 +300,7 @@ public function testKeyExistsWithExpirationInPastReturnsFalse()
         self::assertTrue(isset($this->container->bar));
     }
 
-    public function testKeyExistsWithContainerExpirationInPastWithSetExpirationSecondsReturnsFalse()
+    public function testKeyExistsWithContainerExpirationInPastWithSetExpirationSecondsReturnsFalse(): void
     {
         $this->container->foo = 'bar';
         $storage              = $this->manager->getStorage();
@@ -307,7 +309,7 @@ public function testKeyExistsWithContainerExpirationInPastWithSetExpirationSecon
         self::assertFalse(isset($this->container->foo));
     }
 
-    public function testSettingExpiredKeyOverwritesExpiryMetadataForThatKey()
+    public function testSettingExpiredKeyOverwritesExpiryMetadataForThatKey(): void
     {
         $this->container->foo = 'bar';
         $storage              = $this->manager->getStorage();
@@ -319,7 +321,7 @@ public function testSettingExpiredKeyOverwritesExpiryMetadataForThatKey()
         self::assertFalse(isset($metadata['EXPIRE_KEYS']['foo']));
     }
 
-    public function testSettingExpirationHopsWithNoVariablesMarksContainerByWritingToStorage()
+    public function testSettingExpirationHopsWithNoVariablesMarksContainerByWritingToStorage(): void
     {
         $this->container->setExpirationHops(2);
         $storage  = $this->manager->getStorage();
@@ -331,7 +333,7 @@ public function testSettingExpirationHopsWithNoVariablesMarksContainerByWritingT
         );
     }
 
-    public function testSettingExpirationHopsWithSingleKeyMarksContainerByWritingToStorage()
+    public function testSettingExpirationHopsWithSingleKeyMarksContainerByWritingToStorage(): void
     {
         $this->container->foo = 'bar';
         $this->container->setExpirationHops(2, 'foo');
@@ -345,7 +347,7 @@ public function testSettingExpirationHopsWithSingleKeyMarksContainerByWritingToS
         );
     }
 
-    public function testSettingExpirationHopsWithMultipleKeysMarksContainerByWritingToStorage()
+    public function testSettingExpirationHopsWithMultipleKeysMarksContainerByWritingToStorage(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -370,7 +372,7 @@ public function testSettingExpirationHopsWithMultipleKeysMarksContainerByWriting
         self::assertEquals($expected, $hops);
     }
 
-    public function testContainerExpiresAfterSpecifiedHops()
+    public function testContainerExpiresAfterSpecifiedHops(): void
     {
         $this->container->foo = 'bar';
         $this->container->setExpirationHops(1);
@@ -385,7 +387,7 @@ public function testContainerExpiresAfterSpecifiedHops()
         self::assertNull($this->container->foo);
     }
 
-    public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExtraHops()
+    public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExtraHops(): void
     {
         $this->container->foo = 'bar';
         $this->container->setExpirationHops(1);
@@ -395,7 +397,7 @@ public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExt
         self::assertEquals('bar', $this->container->foo);
     }
 
-    public function testKeyExpiresAfterSpecifiedHops()
+    public function testKeyExpiresAfterSpecifiedHops(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -413,7 +415,7 @@ public function testKeyExpiresAfterSpecifiedHops()
         self::assertEquals('baz', $this->container->bar);
     }
 
-    public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExtraKeyHops()
+    public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExtraKeyHops(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -426,7 +428,7 @@ public function testInstantiatingMultipleContainersInSameRequestDoesNotCreateExt
         self::assertEquals('baz', $this->container->bar);
     }
 
-    public function testKeysExpireAfterSpecifiedHops()
+    public function testKeysExpireAfterSpecifiedHops(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -447,7 +449,7 @@ public function testKeysExpireAfterSpecifiedHops()
         self::assertNull($this->container->baz);
     }
 
-    public function testCanIterateOverContainer()
+    public function testCanIterateOverContainer(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -464,7 +466,7 @@ public function testCanIterateOverContainer()
         self::assertSame($expected, $test);
     }
 
-    public function testIterationHonorsExpirationHops()
+    public function testIterationHonorsExpirationHops(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -497,7 +499,7 @@ public function testIterationHonorsExpirationHops()
         self::assertSame($expected, $test);
     }
 
-    public function testIterationHonorsExpirationTimestamps()
+    public function testIterationHonorsExpirationTimestamps(): void
     {
         $this->container->foo = 'bar';
         $this->container->bar = 'baz';
@@ -511,14 +513,14 @@ public function testIterationHonorsExpirationTimestamps()
         self::assertSame($expected, $test);
     }
 
-    public function testValidationShouldNotRaiseErrorForMissingResponseObject()
+    public function testValidationShouldNotRaiseErrorForMissingResponseObject(): void
     {
         $session       = new Container('test');
         $session->test = 42;
         self::assertEquals(42, $session->test);
     }
 
-    public function testExchangeArray()
+    public function testExchangeArray(): void
     {
         $this->container->offsetSet('old', 'old');
         self::assertTrue($this->container->offsetExists('old'));
@@ -529,7 +531,7 @@ public function testExchangeArray()
         self::assertTrue($this->container->offsetExists('new'), "'exchangeArray' doesn't add the new array items");
     }
 
-    public function testExchangeArrayObject()
+    public function testExchangeArrayObject(): void
     {
         $this->container->offsetSet('old', 'old');
         self::assertTrue($this->container->offsetExists('old'));
@@ -540,14 +542,14 @@ public function testExchangeArrayObject()
         self::assertTrue($this->container->offsetExists('new'), "'exchangeArray' doesn't add the new array items");
     }
 
-    public function testMultiDimensionalUnset()
+    public function testMultiDimensionalUnset(): void
     {
         $this->container->foo = ['bar' => 'baz'];
         unset($this->container['foo']['bar']);
         self::assertSame([], $this->container->foo);
     }
 
-    public function testUpgradeBehaviors()
+    public function testUpgradeBehaviors(): void
     {
         $storage        = $this->manager->getStorage();
         $storage['foo'] = new ArrayObject(['bar' => 'baz']);
@@ -558,7 +560,7 @@ public function testUpgradeBehaviors()
         self::assertEquals('boo', $storage['foo']['baz']);
     }
 
-    public function testGetArrayCopyAfterExchangeArray()
+    public function testGetArrayCopyAfterExchangeArray(): void
     {
         $this->container->exchangeArray(['foo' => 'bar']);
 
diff --git a/test/SaveHandler/CacheTest.php b/test/SaveHandler/CacheTest.php
index 1a4aa436..3fc9f449 100644
--- a/test/SaveHandler/CacheTest.php
+++ b/test/SaveHandler/CacheTest.php
@@ -46,14 +46,16 @@ protected function setUp(): void
         $this->testArray = ['foo' => 'bar', 'bar' => ['foo' => 'bar']];
     }
 
-    public function testReadWrite()
+    public function testReadWrite(): void
     {
         $cacheStorage = $this->prophesize('Laminas\Cache\Storage\StorageInterface');
         $cacheStorage->setItem('242', Argument::type('string'))
-            ->will(function ($args) {
-                $this->getItem('242')->willReturn($args[1]);
-                return true;
-            });
+            ->will(
+                function ($args) {
+                    $this->getItem('242')->willReturn($args[1]);
+                    return true;
+                }
+            );
         $this->usedSaveHandlers[] = $saveHandler = new Cache($cacheStorage->reveal());
 
         $id = '242';
@@ -68,14 +70,16 @@ public function testReadWrite()
         );
     }
 
-    public function testReadWriteComplex()
+    public function testReadWriteComplex(): void
     {
         $cacheStorage = $this->prophesize('Laminas\Cache\Storage\StorageInterface');
         $cacheStorage->setItem('242', Argument::type('string'))
-            ->will(function ($args) {
-                $this->getItem('242')->willReturn($args[1]);
-                return true;
-            });
+            ->will(
+                function ($args) {
+                    $this->getItem('242')->willReturn($args[1]);
+                    return true;
+                }
+            );
         $this->usedSaveHandlers[] = $saveHandler = new Cache($cacheStorage->reveal());
         $saveHandler->open('savepath', 'sessionname');
 
@@ -86,14 +90,16 @@ public function testReadWriteComplex()
         self::assertEquals($this->testArray, unserialize($saveHandler->read($id)));
     }
 
-    public function testReadWriteTwice()
+    public function testReadWriteTwice(): void
     {
         $cacheStorage = $this->prophesize('Laminas\Cache\Storage\StorageInterface');
         $cacheStorage->setItem('242', Argument::type('string'))
-            ->will(function ($args) {
-                $this->getItem('242')->willReturn($args[1])->shouldBeCalledTimes(2);
-                return true;
-            })
+            ->will(
+                function ($args) {
+                    $this->getItem('242')->willReturn($args[1])->shouldBeCalledTimes(2);
+                    return true;
+                }
+            )
             ->shouldBeCalledTimes(2);
         $this->usedSaveHandlers[] = $saveHandler = new Cache($cacheStorage->reveal());
 
@@ -108,7 +114,7 @@ public function testReadWriteTwice()
         self::assertEquals($this->testArray, unserialize($saveHandler->read($id)));
     }
 
-    public function testReadShouldAlwaysReturnString()
+    public function testReadShouldAlwaysReturnString(): void
     {
         $cacheStorage = $this->prophesize('Laminas\Cache\Storage\StorageInterface');
         $cacheStorage->getItem('242')->willReturn(null);
@@ -121,9 +127,9 @@ public function testReadShouldAlwaysReturnString()
         self::assertTrue(is_string($data));
     }
 
-    public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist()
+    public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist(): void
     {
-        $cacheStorage = $this->prophesize('Laminas\Cache\Storage\StorageInterface');
+        $cacheStorage             = $this->prophesize('Laminas\Cache\Storage\StorageInterface');
         $this->usedSaveHandlers[] = $saveHandler = new Cache($cacheStorage->reveal());
 
         $id = '242';
@@ -133,17 +139,20 @@ public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist()
         self::assertTrue($result);
     }
 
-    public function testDestroyReturnsTrueWhenSessionIsDeleted()
+    public function testDestroyReturnsTrueWhenSessionIsDeleted(): void
     {
         $cacheStorage = $this->prophesize('Laminas\Cache\Storage\StorageInterface');
         $cacheStorage->setItem('242', Argument::type('string'))
-            ->will(function ($args) {
-                $this->getItem('242', Argument::any())
-                    ->will(function ($args) {
-                        $return =& $args[1];
-                        return $return;
-                    });
-                return true;
+            ->will(
+                function ($args) {
+                    $this->getItem('242', Argument::any())
+                        ->will(
+                            function ($args) {
+                                $return =& $args[1];
+                                return $return;
+                            }
+                        );
+                    return true;
             });
         $this->usedSaveHandlers[] = $saveHandler = new Cache($cacheStorage->reveal());
 
diff --git a/test/SaveHandler/DbTableGatewayOptionsTest.php b/test/SaveHandler/DbTableGatewayOptionsTest.php
index 1944dca5..f979567b 100644
--- a/test/SaveHandler/DbTableGatewayOptionsTest.php
+++ b/test/SaveHandler/DbTableGatewayOptionsTest.php
@@ -19,7 +19,7 @@
  */
 class DbTableGatewayOptionsTest extends TestCase
 {
-    public function testDefaults()
+    public function testDefaults(): void
     {
         $options = new DbTableGatewayOptions();
         self::assertEquals('id', $options->getIdColumn());
@@ -29,7 +29,7 @@ public function testDefaults()
         self::assertEquals('data', $options->getDataColumn());
     }
 
-    public function testSetConstructor()
+    public function testSetConstructor(): void
     {
         $options = new DbTableGatewayOptions(
             [
@@ -48,7 +48,7 @@ public function testSetConstructor()
         self::assertEquals('testData', $options->getDataColumn());
     }
 
-    public function testSetters()
+    public function testSetters(): void
     {
         $options = new DbTableGatewayOptions();
         $options->setIdColumn('testId')
@@ -64,7 +64,7 @@ public function testSetters()
         self::assertEquals('testData', $options->getDataColumn());
     }
 
-    public function testInvalidIdColumn()
+    public function testInvalidIdColumn(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
@@ -74,7 +74,7 @@ public function testInvalidIdColumn()
         );
     }
 
-    public function testInvalidNameColumn()
+    public function testInvalidNameColumn(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
@@ -84,7 +84,7 @@ public function testInvalidNameColumn()
         );
     }
 
-    public function testInvalidModifiedColumn()
+    public function testInvalidModifiedColumn(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
@@ -94,7 +94,7 @@ public function testInvalidModifiedColumn()
         );
     }
 
-    public function testInvalidLifetimeColumn()
+    public function testInvalidLifetimeColumn(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
@@ -104,7 +104,7 @@ public function testInvalidLifetimeColumn()
         );
     }
 
-    public function testInvalidDataColumn()
+    public function testInvalidDataColumn(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new DbTableGatewayOptions(
diff --git a/test/SaveHandler/DbTableGatewayTest.php b/test/SaveHandler/DbTableGatewayTest.php
index 14fc667f..f84a759a 100644
--- a/test/SaveHandler/DbTableGatewayTest.php
+++ b/test/SaveHandler/DbTableGatewayTest.php
@@ -93,7 +93,7 @@ protected function tearDown(): void
         }
     }
 
-    public function testReadWrite()
+    public function testReadWrite(): void
     {
         $this->usedSaveHandlers[] = $saveHandler = new DbTableGateway($this->tableGateway, $this->options);
         $saveHandler->open('savepath', 'sessionname');
@@ -110,7 +110,7 @@ public function testReadWrite()
         );
     }
 
-    public function testReadWriteComplex()
+    public function testReadWriteComplex(): void
     {
         $this->usedSaveHandlers[] = $saveHandler = new DbTableGateway($this->tableGateway, $this->options);
         $saveHandler->open('savepath', 'sessionname');
@@ -122,7 +122,7 @@ public function testReadWriteComplex()
         self::assertEquals($this->testArray, unserialize($saveHandler->read($id)));
     }
 
-    public function testReadWriteTwice()
+    public function testReadWriteTwice(): void
     {
         $this->usedSaveHandlers[] = $saveHandler = new DbTableGateway($this->tableGateway, $this->options);
         $saveHandler->open('savepath', 'sessionname');
@@ -139,7 +139,7 @@ public function testReadWriteTwice()
         self::assertEquals($updateData, unserialize($saveHandler->read($id)));
     }
 
-    public function testReadShouldAlwaysReturnString()
+    public function testReadShouldAlwaysReturnString(): void
     {
         $this->usedSaveHandlers[] = $saveHandler = new DbTableGateway($this->tableGateway, $this->options);
         $saveHandler->open('savepath', 'sessionname');
@@ -151,7 +151,7 @@ public function testReadShouldAlwaysReturnString()
         self::assertTrue(is_string($data));
     }
 
-    public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist()
+    public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist(): void
     {
         $this->usedSaveHandlers[] = $saveHandler = new DbTableGateway($this->tableGateway, $this->options);
         $saveHandler->open('savepath', 'sessionname');
@@ -163,7 +163,7 @@ public function testDestroyReturnsTrueEvenWhenSessionDoesNotExist()
         self::assertTrue($result);
     }
 
-    public function testDestroyReturnsTrueWhenSessionIsDeleted()
+    public function testDestroyReturnsTrueWhenSessionIsDeleted(): void
     {
         $this->usedSaveHandlers[] = $saveHandler = new DbTableGateway($this->tableGateway, $this->options);
         $saveHandler->open('savepath', 'sessionname');
@@ -177,7 +177,7 @@ public function testDestroyReturnsTrueWhenSessionIsDeleted()
         self::assertTrue($result);
     }
 
-    public function testReadDestroysExpiredSession()
+    public function testReadDestroysExpiredSession(): void
     {
         $this->usedSaveHandlers[] = $saveHandler = new DbTableGateway($this->tableGateway, $this->options);
         $saveHandler->open('savepath', 'sessionname');
@@ -225,7 +225,7 @@ public function testReadDestroysExpiredSession()
      * @param DbTableGatewayOptions $options
      * @return void
      */
-    protected function setupDb(DbTableGatewayOptions $options)
+    protected function setupDb(DbTableGatewayOptions $options): void
     {
         $query = <<<EOD
 CREATE TABLE sessions (
@@ -246,7 +246,7 @@ protected function setupDb(DbTableGatewayOptions $options)
      *
      * @return void
      */
-    protected function dropTable()
+    protected function dropTable(): void
     {
         if (! $this->adapter) {
             return;
diff --git a/test/SaveHandler/MongoDBOptionsTest.php b/test/SaveHandler/MongoDBOptionsTest.php
index 0d9341d6..2b829a01 100644
--- a/test/SaveHandler/MongoDBOptionsTest.php
+++ b/test/SaveHandler/MongoDBOptionsTest.php
@@ -17,7 +17,7 @@
  */
 class MongoDBOptionsTest extends TestCase
 {
-    public function testDefaults()
+    public function testDefaults(): void
     {
         $options = new MongoDBOptions();
         self::assertNull($options->getDatabase());
@@ -31,7 +31,7 @@ public function testDefaults()
         self::assertEquals('modified', $options->getModifiedField());
     }
 
-    public function testSetConstructor()
+    public function testSetConstructor(): void
     {
         $options = new MongoDBOptions(
             [
@@ -54,7 +54,7 @@ public function testSetConstructor()
         self::assertEquals('testModified', $options->getModifiedField());
     }
 
-    public function testSetters()
+    public function testSetters(): void
     {
         $options = new MongoDBOptions();
         $options->setDatabase('testDatabase')
@@ -74,7 +74,7 @@ public function testSetters()
         self::assertEquals('testModified', $options->getModifiedField());
     }
 
-    public function testInvalidDatabase()
+    public function testInvalidDatabase(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
@@ -84,7 +84,7 @@ public function testInvalidDatabase()
         );
     }
 
-    public function testInvalidCollection()
+    public function testInvalidCollection(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
@@ -94,7 +94,7 @@ public function testInvalidCollection()
         );
     }
 
-    public function testInvalidSaveOptions()
+    public function testInvalidSaveOptions(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
@@ -104,7 +104,7 @@ public function testInvalidSaveOptions()
         );
     }
 
-    public function testInvalidNameField()
+    public function testInvalidNameField(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
@@ -114,7 +114,7 @@ public function testInvalidNameField()
         );
     }
 
-    public function testInvalidModifiedField()
+    public function testInvalidModifiedField(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
@@ -124,7 +124,7 @@ public function testInvalidModifiedField()
         );
     }
 
-    public function testInvalidLifetimeField()
+    public function testInvalidLifetimeField(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
@@ -134,7 +134,7 @@ public function testInvalidLifetimeField()
         );
     }
 
-    public function testInvalidDataField()
+    public function testInvalidDataField(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $options = new MongoDBOptions(
diff --git a/test/SaveHandler/MongoDBTest.php b/test/SaveHandler/MongoDBTest.php
index e6676a9f..500df1ba 100644
--- a/test/SaveHandler/MongoDBTest.php
+++ b/test/SaveHandler/MongoDBTest.php
@@ -71,7 +71,7 @@ protected function tearDown(): void
         }
     }
 
-    public function testReadWrite()
+    public function testReadWrite(): void
     {
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
         self::assertTrue($saveHandler->open('savepath', 'sessionname'));
@@ -91,7 +91,7 @@ public function testReadWrite()
     /**
      * @runInSeparateProcess
      */
-    public function testReadDestroysExpiredSession()
+    public function testReadDestroysExpiredSession(): void
     {
         /* Note: due to the session save handler's open() method reading the
          * "session.gc_maxlifetime" INI value directly, it's necessary to set
@@ -116,7 +116,7 @@ public function testReadDestroysExpiredSession()
         ini_set('session.gc_maxlifetime', $oldMaxlifetime);
     }
 
-    public function testGarbageCollection()
+    public function testGarbageCollection(): void
     {
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
         self::assertTrue($saveHandler->open('savepath', 'sessionname'));
@@ -137,7 +137,7 @@ public function testGarbageCollection()
         self::assertEquals(0, $this->mongoCollection->count());
     }
 
-    public function testGarbageCollectionMaxlifetimeIsInSeconds()
+    public function testGarbageCollectionMaxlifetimeIsInSeconds(): void
     {
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
         self::assertTrue($saveHandler->open('savepath', 'sessionname'));
@@ -157,13 +157,13 @@ public function testGarbageCollectionMaxlifetimeIsInSeconds()
         self::assertNotEmpty($saveHandler->read(456));
     }
 
-    public function testWriteExceptionEdgeCaseForChangedSessionName()
+    public function testWriteExceptionEdgeCaseForChangedSessionName(): void
     {
         $this->expectException(RuntimeException::class);
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
         self::assertTrue($saveHandler->open('savepath', 'sessionname'));
 
-        $id = '242';
+        $id   = '242';
         $data = ['foo' => 'bar'];
 
         /* Note: a MongoCursorException will be thrown if a record with this ID
@@ -177,7 +177,7 @@ public function testWriteExceptionEdgeCaseForChangedSessionName()
         $saveHandler->write($id, serialize($data));
     }
 
-    public function testReadShouldAlwaysReturnString()
+    public function testReadShouldAlwaysReturnString(): void
     {
         $saveHandler = new MongoDB($this->mongoClient, $this->options);
         self::assertTrue($saveHandler->open('savepath', 'sessionname'));
diff --git a/test/Service/ContainerAbstractServiceFactoryTest.php b/test/Service/ContainerAbstractServiceFactoryTest.php
index 7d1745c2..9f824b53 100644
--- a/test/Service/ContainerAbstractServiceFactoryTest.php
+++ b/test/Service/ContainerAbstractServiceFactoryTest.php
@@ -53,7 +53,7 @@ protected function setUp(): void
         $config->configureServiceManager($this->services);
     }
 
-    public function validContainers()
+    public function validContainers(): array
     {
         $containers = [];
         $config     = $this->config;
@@ -67,7 +67,7 @@ public function validContainers()
     /**
      * @dataProvider validContainers
      */
-    public function testCanRetrieveNamedContainers($serviceName, $containerName)
+    public function testCanRetrieveNamedContainers($serviceName, $containerName): void
     {
         self::assertTrue($this->services->has($serviceName), "Container does not have service by name '$serviceName'");
         $container = $this->services->get($serviceName);
@@ -78,17 +78,17 @@ public function testCanRetrieveNamedContainers($serviceName, $containerName)
     /**
      * @dataProvider validContainers
      */
-    public function testContainersAreInjectedWithSessionManagerService($serviceName, $containerName)
+    public function testContainersAreInjectedWithSessionManagerService($serviceName, $containerName): void
     {
         self::assertTrue($this->services->has($serviceName), "Container does not have service by name '$serviceName'");
         $container = $this->services->get($serviceName);
         self::assertSame($this->services->get(ManagerInterface::class), $container->getManager());
     }
 
-    public function invalidContainers()
+    public function invalidContainers(): array
     {
         $containers = [];
-        $config = $this->config;
+        $config     = $this->config;
         foreach ($config['session_containers'] as $name) {
             $containers[] = ['SomePrefix\\' . $name];
         }
@@ -100,7 +100,7 @@ public function invalidContainers()
     /**
      * @dataProvider invalidContainers
      */
-    public function testInvalidContainerNamesAreNotMatchedByAbstractFactory($name)
+    public function testInvalidContainerNamesAreNotMatchedByAbstractFactory($name): void
     {
         self::assertFalse($this->services->has($name));
     }
diff --git a/test/Service/SessionConfigFactoryTest.php b/test/Service/SessionConfigFactoryTest.php
index b3f512d0..e9d4cc08 100644
--- a/test/Service/SessionConfigFactoryTest.php
+++ b/test/Service/SessionConfigFactoryTest.php
@@ -34,36 +34,42 @@ protected function setUp(): void
         $config->configureServiceManager($this->services);
     }
 
-    public function testCreatesSessionConfigByDefault()
+    public function testCreatesSessionConfigByDefault(): void
     {
-        $this->services->setService('config', [
+        $this->services->setService(
+            'config', [
             'session_config' => [],
-        ]);
+        ]
+        );
         $config = $this->services->get(ConfigInterface::class);
         self::assertInstanceOf(SessionConfig::class, $config);
     }
 
-    public function testCanCreateAlternateSessionConfigTypeViaConfigClassKey()
+    public function testCanCreateAlternateSessionConfigTypeViaConfigClassKey(): void
     {
-        $this->services->setService('config', [
+        $this->services->setService(
+            'config', [
             'session_config' => [
                 'config_class' => StandardConfig::class,
             ],
-        ]);
+        ]
+        );
         $config = $this->services->get(ConfigInterface::class);
         self::assertInstanceOf(StandardConfig::class, $config);
         // Since SessionConfig extends StandardConfig, need to assert not SessionConfig
         self::assertNotInstanceOf(SessionConfig::class, $config);
     }
 
-    public function testServiceReceivesConfiguration()
+    public function testServiceReceivesConfiguration(): void
     {
-        $this->services->setService('config', [
+        $this->services->setService(
+            'config', [
             'session_config' => [
                 'config_class' => StandardConfig::class,
                 'name'         => 'laminas',
             ],
-        ]);
+        ]
+        );
         $config = $this->services->get(ConfigInterface::class);
         self::assertEquals('laminas', $config->getName());
     }
diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php
index 002b2ee0..1ea50ec3 100644
--- a/test/Service/SessionManagerFactoryTest.php
+++ b/test/Service/SessionManagerFactoryTest.php
@@ -52,13 +52,13 @@ protected function setUp(): void
         $config->configureServiceManager($this->services);
     }
 
-    public function testCreatesSessionManager()
+    public function testCreatesSessionManager(): void
     {
         $manager = $this->services->get(ManagerInterface::class);
         self::assertInstanceOf(SessionManager::class, $manager);
     }
 
-    public function testConfigObjectIsInjectedIfPresentInServices()
+    public function testConfigObjectIsInjectedIfPresentInServices(): void
     {
         $config = $this->createMock(ConfigInterface::class);
         $this->services->setService(ConfigInterface::class, $config);
@@ -67,7 +67,7 @@ public function testConfigObjectIsInjectedIfPresentInServices()
         self::assertSame($config, $test);
     }
 
-    public function testFactoryWillInjectStorageIfPresentInServices()
+    public function testFactoryWillInjectStorageIfPresentInServices(): void
     {
         // Using concrete version here as mocking was too complex
         $storage = new ArrayStorage();
@@ -77,7 +77,7 @@ public function testFactoryWillInjectStorageIfPresentInServices()
         self::assertSame($storage, $test);
     }
 
-    public function testFactoryWillInjectSaveHandlerIfPresentInServices()
+    public function testFactoryWillInjectSaveHandlerIfPresentInServices(): void
     {
         $saveHandler = $this->createMock(SaveHandlerInterface::class);
         $this->services->setService(SaveHandlerInterface::class, $saveHandler);
@@ -86,13 +86,13 @@ public function testFactoryWillInjectSaveHandlerIfPresentInServices()
         self::assertSame($saveHandler, $test);
     }
 
-    public function testFactoryWillMarkManagerAsContainerDefaultByDefault()
+    public function testFactoryWillMarkManagerAsContainerDefaultByDefault(): void
     {
         $manager = $this->services->get(ManagerInterface::class);
         self::assertSame($manager, Container::getDefaultManager());
     }
 
-    public function testCanDisableContainerDefaultManagerInjectionViaConfiguration()
+    public function testCanDisableContainerDefaultManagerInjectionViaConfiguration(): void
     {
         $config = ['session_manager' => [
             'enable_default_container_manager' => false,
@@ -105,7 +105,7 @@ public function testCanDisableContainerDefaultManagerInjectionViaConfiguration()
     /**
      * @runInSeparateProcess
      */
-    public function testFactoryWillAddValidatorViaConfiguration()
+    public function testFactoryWillAddValidatorViaConfiguration(): void
     {
         $config = ['session_manager' => [
             'validators' => [
@@ -125,7 +125,7 @@ public function testFactoryWillAddValidatorViaConfiguration()
     /**
      * @runInSeparateProcess
      */
-    public function testStartingSessionManagerFromFactoryDoesNotTriggerUndefinedVariable()
+    public function testStartingSessionManagerFromFactoryDoesNotTriggerUndefinedVariable(): void
     {
         $storage = new ArrayStorage();
         $this->services->setService(StorageInterface::class, $storage);
@@ -139,17 +139,20 @@ public function testStartingSessionManagerFromFactoryDoesNotTriggerUndefinedVari
     /**
      * @runInSeparateProcess
      */
-    public function testFactoryDoesNotOverwriteValidatorStorageValues()
+    public function testFactoryDoesNotOverwriteValidatorStorageValues(): void
     {
         $storage = new ArrayStorage();
-        $storage->setMetadata('_VALID', [
+        $storage->setMetadata(
+            '_VALID', [
             Validator\HttpUserAgent::class => 'Foo',
             Validator\RemoteAddr::class    => '1.2.3.4',
-        ]);
+        ]
+        );
         $this->services->setService(StorageInterface::class, $storage);
-        $this->services->setService('config', [
-            'session_manager' => [
-                'validators' => [
+        $this->services->setService(
+            'config', [
+                'session_manager' => [
+                    'validators' => [
                     Validator\HttpUserAgent::class,
                     Validator\RemoteAddr::class,
                 ],
@@ -168,14 +171,17 @@ public function testFactoryDoesNotOverwriteValidatorStorageValues()
     /**
      * @runInSeparateProcess
      */
-    public function testFactoryDoesNotAttachValidatorTwoTimes()
+    public function testFactoryDoesNotAttachValidatorTwoTimes(): void
     {
         $storage = new ArrayStorage();
-        $storage->setMetadata('_VALID', [
+        $storage->setMetadata(
+            '_VALID', [
             Validator\RemoteAddr::class => '1.2.3.4',
-        ]);
+        ]
+        );
         $this->services->setService(StorageInterface::class, $storage);
-        $this->services->setService('config', [
+        $this->services->setService(
+            'config', [
             'session_manager' => [
                 'validators' => [
                     Validator\RemoteAddr::class,
@@ -205,7 +211,7 @@ public function testFactoryDoesNotAttachValidatorTwoTimes()
         self::assertTrue($found, 'Did not find RemoteAddr validator in listeners');
     }
 
-    public function testFactoryAllowsOverridingOptions()
+    public function testFactoryAllowsOverridingOptions(): void
     {
         $storage = new ArrayStorage();
         $this->services->setService(StorageInterface::class, $storage);
@@ -225,13 +231,13 @@ public function testFactoryAllowsOverridingOptions()
         self::assertSame([], $containedValidators);
     }
 
-    public function testFactoryWillUseRequestedNameAsSessionManagerIfItImplementsManagerInterface()
+    public function testFactoryWillUseRequestedNameAsSessionManagerIfItImplementsManagerInterface(): void
     {
         $manager = $this->services->get(TestManager::class);
         self::assertInstanceOf(TestManager::class, $manager);
     }
 
-    public function testFactoryWillRaiseServiceNotCreatedExceptionIfRequestedNameIsNotAManagerInterfaceSubclass()
+    public function testFactoryWillRaiseServiceNotCreatedExceptionIfRequestedNameIsNotAManagerInterfaceSubclass(): void
     {
         $this->expectException(ServiceNotCreatedException::class);
         $manager = $this->services->get(TestSaveHandler::class);
diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php
index b8af49c5..98ad430b 100644
--- a/test/Service/StorageFactoryTest.php
+++ b/test/Service/StorageFactoryTest.php
@@ -36,17 +36,17 @@ protected function setUp(): void
         $config->configureServiceManager($this->services);
     }
 
-    public function sessionStorageConfig()
+    public function sessionStorageConfig(): array
     {
         return [
             'array-storage-short' => [[
-                'session_storage' => [
-                    'type' => 'ArrayStorage',
-                    'options' => [
-                        'input' => [
-                            'foo' => 'bar',
-                        ],
-                    ],
+                                          'session_storage' => [
+                                              'type'    => 'ArrayStorage',
+                                              'options' => [
+                                                  'input' => [
+                                                      'foo' => 'bar',
+                                                  ],
+                                              ],
                 ],
             ], ArrayStorage::class],
             'array-storage-fqcn' => [[
@@ -95,7 +95,7 @@ public function sessionStorageConfig()
     /**
      * @dataProvider sessionStorageConfig
      */
-    public function testUsesConfigurationToCreateStorage($config, $class)
+    public function testUsesConfigurationToCreateStorage($config, $class): void
     {
         $this->services->setService('config', $config);
         $storage = $this->services->get(StorageInterface::class);
@@ -104,15 +104,15 @@ public function testUsesConfigurationToCreateStorage($config, $class)
         self::assertEquals($config['session_storage']['options']['input'], $test);
     }
 
-    public function testConfigurationWithoutInputIsValid()
+    public function testConfigurationWithoutInputIsValid(): void
     {
         $this->services->setService(
             'config', [
-            'session_storage' => [
-                'type'    => ArrayStorage::class,
-                'options' => [],
-            ],
-        ]
+                'session_storage' => [
+                    'type'    => ArrayStorage::class,
+                    'options' => [],
+                ],
+            ]
         );
 
         $storage = $this->services->get(StorageInterface::class);
@@ -121,17 +121,17 @@ public function testConfigurationWithoutInputIsValid()
         self::assertSame([], $storage->toArray());
     }
 
-    public function invalidSessionStorageConfig()
+    public function invalidSessionStorageConfig(): array
     {
         return [
             'unknown-class-short' => [[
-                'session_storage' => [
-                    'type' => 'FooStorage',
-                    'options' => [],
-                ],
-            ]],
-            'unknown-class-fqcn' => [[
-                'session_storage' => [
+                                          'session_storage' => [
+                                              'type'    => 'FooStorage',
+                                              'options' => [],
+                                          ],
+                                      ]],
+            'unknown-class-fqcn'  => [[
+                                          'session_storage' => [
                     'type' => 'Foo\Bar\Baz\Bat',
                     'options' => [],
                 ],
@@ -156,7 +156,7 @@ public function invalidSessionStorageConfig()
     /**
      * @dataProvider invalidSessionStorageConfig
      */
-    public function testInvalidConfigurationRaisesServiceNotCreatedException($config)
+    public function testInvalidConfigurationRaisesServiceNotCreatedException($config): void
     {
         $this->services->setService('config', $config);
         $this->expectException(ServiceNotCreatedException::class);
diff --git a/test/SessionArrayStorageTest.php b/test/SessionArrayStorageTest.php
index d7e901f9..9a4f1914 100644
--- a/test/SessionArrayStorageTest.php
+++ b/test/SessionArrayStorageTest.php
@@ -29,7 +29,7 @@ protected function tearDown(): void
         $_SESSION = [];
     }
 
-    public function testStorageWritesToSessionSuperglobal()
+    public function testStorageWritesToSessionSuperglobal(): void
     {
         $this->storage['foo'] = 'bar';
         self::assertSame($_SESSION['foo'], $this->storage->foo);
@@ -37,7 +37,7 @@ public function testStorageWritesToSessionSuperglobal()
         self::assertArrayNotHasKey('foo', $_SESSION);
     }
 
-    public function testPassingArrayToConstructorOverwritesSessionSuperglobal()
+    public function testPassingArrayToConstructorOverwritesSessionSuperglobal(): void
     {
         $_SESSION['foo'] = 'bar';
         $array           = ['foo' => 'FOO'];
@@ -51,26 +51,26 @@ public function testPassingArrayToConstructorOverwritesSessionSuperglobal()
         self::assertSame($expected, $_SESSION);
     }
 
-    public function testModifyingSessionSuperglobalDirectlyUpdatesStorage()
+    public function testModifyingSessionSuperglobalDirectlyUpdatesStorage(): void
     {
         $_SESSION['foo'] = 'bar';
         self::assertTrue(isset($this->storage['foo']));
     }
 
-    public function testDestructorSetsSessionToArray()
+    public function testDestructorSetsSessionToArray(): void
     {
         $this->storage->foo = 'bar';
-        $expected = [
+        $expected           = [
             '__Laminas' => [
                 '_REQUEST_ACCESS_TIME' => $this->storage->getRequestAccessTime(),
             ],
-            'foo' => 'bar',
+            'foo'       => 'bar',
         ];
         $this->storage->__destruct();
         self::assertSame($expected, $_SESSION);
     }
 
-    public function testModifyingOneSessionObjectModifiesTheOther()
+    public function testModifyingOneSessionObjectModifiesTheOther(): void
     {
         $this->storage->foo = 'bar';
         $storage            = new SessionArrayStorage();
@@ -78,7 +78,7 @@ public function testModifyingOneSessionObjectModifiesTheOther()
         self::assertEquals('foo', $this->storage->bar);
     }
 
-    public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmutable()
+    public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmutable(): void
     {
         $this->storage->foo = 'bar';
         $storage            = new SessionArrayStorage();
@@ -87,26 +87,26 @@ public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmu
         self::assertTrue($storage->isImmutable(), var_export($_SESSION, 1));
     }
 
-    public function testAssignment()
+    public function testAssignment(): void
     {
         $_SESSION['foo'] = 'bar';
         self::assertEquals('bar', $this->storage['foo']);
     }
 
-    public function testMultiDimensionalAssignment()
+    public function testMultiDimensionalAssignment(): void
     {
         $_SESSION['foo']['bar'] = 'baz';
         self::assertEquals('baz', $this->storage['foo']['bar']);
     }
 
-    public function testUnset()
+    public function testUnset(): void
     {
         $_SESSION['foo'] = 'bar';
         unset($_SESSION['foo']);
         self::assertFalse(isset($this->storage['foo']));
     }
 
-    public function testMultiDimensionalUnset()
+    public function testMultiDimensionalUnset(): void
     {
         $this->storage['foo'] = ['bar' => ['baz' => 'boo']];
         unset($this->storage['foo']['bar']['baz']);
@@ -115,10 +115,10 @@ public function testMultiDimensionalUnset()
         self::assertFalse(isset($this->storage['foo']['bar']));
     }
 
-    public function testSessionWorksWithContainer()
+    public function testSessionWorksWithContainer(): void
     {
         // Run without any validators; session ID is often invalid in CLI
-        $container = new Container(
+        $container      = new Container(
             'test',
             new SessionManager(null, null, null, [], ['attach_default_validators' => false])
         );
@@ -127,7 +127,7 @@ public function testSessionWorksWithContainer()
         self::assertSame($container->foo, $_SESSION['test']['foo']);
     }
 
-    public function testToArrayWithMetaData()
+    public function testToArrayWithMetaData(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -143,10 +143,10 @@ public function testToArrayWithMetaData()
         self::assertSame($expected, $this->storage->toArray(true));
     }
 
-    public function testUndefinedSessionManipulation()
+    public function testUndefinedSessionManipulation(): void
     {
-        $this->storage['foo'] = 'bar';
-        $this->storage['bar'][] = 'bar';
+        $this->storage['foo']        = 'bar';
+        $this->storage['bar'][]      = 'bar';
         $this->storage['baz']['foo'] = 'bar';
 
         $expected = [
@@ -163,7 +163,7 @@ public function testUndefinedSessionManipulation()
     /**
      * @runInSeparateProcess
      */
-    public function testExpirationHops()
+    public function testExpirationHops(): void
     {
         // since we cannot explicitly test reinitializing the session
         // we will act in how session manager would in this case.
@@ -171,7 +171,7 @@ public function testExpirationHops()
         $manager = new SessionManager(null, $storage);
         $manager->start();
 
-        $container = new Container('test');
+        $container      = new Container('test');
         $container->foo = 'bar';
         $container->setExpirationHops(1);
 
@@ -189,7 +189,7 @@ public function testExpirationHops()
     /**
      * @runInSeparateProcess
      */
-    public function testPreserveRequestAccessTimeAfterStart()
+    public function testPreserveRequestAccessTimeAfterStart(): void
     {
         $manager = new SessionManager(null, $this->storage);
         self::assertGreaterThan(0, $this->storage->getRequestAccessTime());
@@ -197,7 +197,7 @@ public function testPreserveRequestAccessTimeAfterStart()
         self::assertGreaterThan(0, $this->storage->getRequestAccessTime());
     }
 
-    public function testGetArrayCopyFromContainer()
+    public function testGetArrayCopyFromContainer(): void
     {
         $container      = new Container('test');
         $container->foo = 'bar';
diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
index f6d0e630..7fea150d 100644
--- a/test/SessionManagerTest.php
+++ b/test/SessionManagerTest.php
@@ -46,7 +46,7 @@ protected function setUp(): void
         $this->error = false;
     }
 
-    public function handleErrors($errno, $errstr)
+    public function handleErrors($errno, $errstr): void
     {
         $this->error = $errstr;
     }
@@ -60,14 +60,14 @@ public function getTimestampFromCookie($cookie)
         return false;
     }
 
-    public function testManagerUsesSessionConfigByDefault()
+    public function testManagerUsesSessionConfigByDefault(): void
     {
         $this->manager = new SessionManager();
         $config        = $this->manager->getConfig();
         self::assertInstanceOf(SessionConfig::class, $config);
     }
 
-    public function testCanPassConfigurationToConstructor()
+    public function testCanPassConfigurationToConstructor(): void
     {
         $this->manager = new SessionManager();
         $config        = new StandardConfig();
@@ -75,59 +75,59 @@ public function testCanPassConfigurationToConstructor()
         self::assertSame($config, $manager->getConfig());
     }
 
-    public function testManagerUsesSessionStorageByDefault()
+    public function testManagerUsesSessionStorageByDefault(): void
     {
         $this->manager = new SessionManager();
         $storage       = $this->manager->getStorage();
         self::assertInstanceOf(SessionArrayStorage::class, $storage);
     }
 
-    public function testCanPassStorageToConstructor()
+    public function testCanPassStorageToConstructor(): void
     {
         $storage = new ArrayStorage();
         $manager = new SessionManager(null, $storage);
         self::assertSame($storage, $manager->getStorage());
     }
 
-    public function testCanPassSaveHandlerToConstructor()
+    public function testCanPassSaveHandlerToConstructor(): void
     {
         $saveHandler = new TestAsset\TestSaveHandler();
         $manager     = new SessionManager(null, null, $saveHandler);
         self::assertSame($saveHandler, $manager->getSaveHandler());
     }
 
-    public function testCanPassValidatorsToConstructor()
+    public function testCanPassValidatorsToConstructor(): void
     {
         $validators = [
             'foo',
             'bar',
         ];
-        $manager = new SessionManager(null, null, null, $validators);
+        $manager    = new SessionManager(null, null, null, $validators);
         foreach ($validators as $validator) {
             $this->assertAttributeContains($validator, 'validators', $manager);
         }
     }
 
-    public function testAttachDefaultValidatorsByDefault()
+    public function testAttachDefaultValidatorsByDefault(): void
     {
         $manager = new SessionManager();
         $this->assertAttributeEquals([Id::class], 'validators', $manager);
     }
 
-    public function testCanMergeValidatorsWithDefault()
+    public function testCanMergeValidatorsWithDefault(): void
     {
         $defaultValidators = [
             Id::class,
         ];
-        $validators = [
+        $validators        = [
             'foo',
             'bar',
         ];
-        $manager = new SessionManager(null, null, null, $validators);
+        $manager           = new SessionManager(null, null, null, $validators);
         $this->assertAttributeEquals(array_merge($defaultValidators, $validators), 'validators', $manager);
     }
 
-    public function testCanDisableAttachDefaultValidators()
+    public function testCanDisableAttachDefaultValidators(): void
     {
         $options = [
             'attach_default_validators' => false,
@@ -141,7 +141,7 @@ public function testCanDisableAttachDefaultValidators()
     /**
      * @runInSeparateProcess
      */
-    public function testSessionExistsReturnsFalseWhenNoSessionStarted()
+    public function testSessionExistsReturnsFalseWhenNoSessionStarted(): void
     {
         $this->manager = new SessionManager();
         self::assertFalse($this->manager->sessionExists());
@@ -150,7 +150,7 @@ public function testSessionExistsReturnsFalseWhenNoSessionStarted()
     /**
      * @runInSeparateProcess
      */
-    public function testSessionExistsReturnsTrueWhenSessionStarted()
+    public function testSessionExistsReturnsTrueWhenSessionStarted(): void
     {
         $this->manager = new SessionManager();
         session_start();
@@ -160,7 +160,7 @@ public function testSessionExistsReturnsTrueWhenSessionStarted()
     /**
      * @runInSeparateProcess
      */
-    public function testSessionExistsReturnsTrueWhenSessionStartedThenWritten()
+    public function testSessionExistsReturnsTrueWhenSessionStartedThenWritten(): void
     {
         $this->manager = new SessionManager();
         session_start();
@@ -171,7 +171,7 @@ public function testSessionExistsReturnsTrueWhenSessionStartedThenWritten()
     /**
      * @runInSeparateProcess
      */
-    public function testSessionExistsReturnsFalseWhenSessionStartedThenDestroyed()
+    public function testSessionExistsReturnsFalseWhenSessionStartedThenDestroyed(): void
     {
         $this->manager = new SessionManager();
         session_start();
@@ -182,7 +182,7 @@ public function testSessionExistsReturnsFalseWhenSessionStartedThenDestroyed()
     /**
      * @runInSeparateProcess
      */
-    public function testSessionIsStartedAfterCallingStart()
+    public function testSessionIsStartedAfterCallingStart(): void
     {
         $this->manager = new SessionManager();
         self::assertFalse($this->manager->sessionExists());
@@ -193,7 +193,7 @@ public function testSessionIsStartedAfterCallingStart()
     /**
      * @runInSeparateProcess
      */
-    public function testStartDoesNothingWhenCalledAfterWriteCloseOperation()
+    public function testStartDoesNothingWhenCalledAfterWriteCloseOperation(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
@@ -208,7 +208,7 @@ public function testStartDoesNothingWhenCalledAfterWriteCloseOperation()
     /**
      * @runInSeparateProcess
      */
-    public function testStartWithOldTraversableSessionData()
+    public function testStartWithOldTraversableSessionData(): void
     {
         // pre-populate session with data
         $_SESSION['key1'] = 'value1';
@@ -227,7 +227,7 @@ public function testStartWithOldTraversableSessionData()
     /**
      * @runInSeparateProcess
      */
-    public function testStorageContentIsPreservedByWriteCloseOperation()
+    public function testStorageContentIsPreservedByWriteCloseOperation(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
@@ -241,7 +241,7 @@ public function testStorageContentIsPreservedByWriteCloseOperation()
     /**
      * @runInSeparateProcess
      */
-    public function testStartCreatesNewSessionIfPreviousSessionHasBeenDestroyed()
+    public function testStartCreatesNewSessionIfPreviousSessionHasBeenDestroyed(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
@@ -256,7 +256,7 @@ public function testStartCreatesNewSessionIfPreviousSessionHasBeenDestroyed()
     /**
      * @runInSeparateProcess
      */
-    public function testStartConvertsSessionDataFromStorageInterfaceToArrayBeforeMerging()
+    public function testStartConvertsSessionDataFromStorageInterfaceToArrayBeforeMerging(): void
     {
         $this->manager = new SessionManager();
 
@@ -276,7 +276,7 @@ public function testStartConvertsSessionDataFromStorageInterfaceToArrayBeforeMer
     /**
      * @runInSeparateProcess
      */
-    public function testStartConvertsSessionDataFromTraversableToArrayBeforeMerging()
+    public function testStartConvertsSessionDataFromTraversableToArrayBeforeMerging(): void
     {
         $this->manager = new SessionManager();
 
@@ -294,7 +294,7 @@ public function testStartConvertsSessionDataFromTraversableToArrayBeforeMerging(
     /**
      * @outputBuffering disabled
      */
-    public function testStartWillNotBlockHeaderSentNotices()
+    public function testStartWillNotBlockHeaderSentNotices(): void
     {
         $this->manager = new SessionManager();
         if ('cli' == PHP_SAPI) {
@@ -312,7 +312,7 @@ public function testStartWillNotBlockHeaderSentNotices()
     /**
      * @runInSeparateProcess
      */
-    public function testGetNameReturnsSessionName()
+    public function testGetNameReturnsSessionName(): void
     {
         $this->manager = new SessionManager();
         $ini           = ini_get('session.name');
@@ -322,7 +322,7 @@ public function testGetNameReturnsSessionName()
     /**
      * @runInSeparateProcess
      */
-    public function testSetNameRaisesExceptionOnInvalidName()
+    public function testSetNameRaisesExceptionOnInvalidName(): void
     {
         $this->manager = new SessionManager();
         $this->expectException(InvalidArgumentException::class);
@@ -333,7 +333,7 @@ public function testSetNameRaisesExceptionOnInvalidName()
     /**
      * @runInSeparateProcess
      */
-    public function testSetNameSetsSessionNameOnSuccess()
+    public function testSetNameSetsSessionNameOnSuccess(): void
     {
         $this->manager = new SessionManager();
         $this->manager->setName('foobar');
@@ -344,7 +344,7 @@ public function testSetNameSetsSessionNameOnSuccess()
     /**
      * @runInSeparateProcess
      */
-    public function testCanSetNewSessionNameAfterSessionDestroyed()
+    public function testCanSetNewSessionNameAfterSessionDestroyed(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
@@ -357,7 +357,7 @@ public function testCanSetNewSessionNameAfterSessionDestroyed()
     /**
      * @runInSeparateProcess
      */
-    public function testSettingNameWhenAnActiveSessionExistsRaisesException()
+    public function testSettingNameWhenAnActiveSessionExistsRaisesException(): void
     {
         $this->manager = new SessionManager();
         $this->expectException(InvalidArgumentException::class);
@@ -369,14 +369,14 @@ public function testSettingNameWhenAnActiveSessionExistsRaisesException()
     /**
      * @runInSeparateProcess
      */
-    public function testDestroyByDefaultSendsAnExpireCookie()
+    public function testDestroyByDefaultSendsAnExpireCookie(): void
     {
         if (! extension_loaded('xdebug')) {
             self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
-        $config = $this->manager->getConfig();
+        $config        = $this->manager->getConfig();
         $config->setUseCookies(true);
         $this->manager->start();
         $this->manager->destroy();
@@ -399,14 +399,14 @@ public function testDestroyByDefaultSendsAnExpireCookie()
     /**
      * @runInSeparateProcess
      */
-    public function testSendingFalseToSendExpireCookieWhenCallingDestroyShouldNotSendCookie()
+    public function testSendingFalseToSendExpireCookieWhenCallingDestroyShouldNotSendCookie(): void
     {
         if (! extension_loaded('xdebug')) {
             self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
-        $config = $this->manager->getConfig();
+        $config        = $this->manager->getConfig();
         $config->setUseCookies(true);
         $this->manager->start();
         $this->manager->destroy(['send_expire_cookie' => false]);
@@ -433,7 +433,7 @@ public function testSendingFalseToSendExpireCookieWhenCallingDestroyShouldNotSen
     /**
      * @runInSeparateProcess
      */
-    public function testDestroyDoesNotClearSessionStorageByDefault()
+    public function testDestroyDoesNotClearSessionStorageByDefault(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
@@ -447,11 +447,11 @@ public function testDestroyDoesNotClearSessionStorageByDefault()
     /**
      * @runInSeparateProcess
      */
-    public function testPassingClearStorageOptionWhenCallingDestroyClearsStorage()
+    public function testPassingClearStorageOptionWhenCallingDestroyClearsStorage(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
-        $storage = $this->manager->getStorage();
+        $storage        = $this->manager->getStorage();
         $storage['foo'] = 'bar';
         $this->manager->destroy(['clear_storage' => true]);
         self::assertFalse(isset($storage['foo']));
@@ -460,11 +460,11 @@ public function testPassingClearStorageOptionWhenCallingDestroyClearsStorage()
     /**
      * @runInSeparateProcess
      */
-    public function testCallingWriteCloseMarksStorageAsImmutable()
+    public function testCallingWriteCloseMarksStorageAsImmutable(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
-        $storage = $this->manager->getStorage();
+        $storage        = $this->manager->getStorage();
         $storage['foo'] = 'bar';
         $this->manager->writeClose();
         self::assertTrue($storage->isImmutable());
@@ -473,7 +473,7 @@ public function testCallingWriteCloseMarksStorageAsImmutable()
     /**
      * @runInSeparateProcess
      */
-    public function testCallingWriteCloseShouldNotAlterSessionExistsStatus()
+    public function testCallingWriteCloseShouldNotAlterSessionExistsStatus(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
@@ -484,7 +484,7 @@ public function testCallingWriteCloseShouldNotAlterSessionExistsStatus()
     /**
      * @runInSeparateProcess
      */
-    public function testIdShouldBeEmptyPriorToCallingStart()
+    public function testIdShouldBeEmptyPriorToCallingStart(): void
     {
         $this->manager = new SessionManager();
         self::assertSame('', $this->manager->getId());
@@ -493,7 +493,7 @@ public function testIdShouldBeEmptyPriorToCallingStart()
     /**
      * @runInSeparateProcess
      */
-    public function testIdShouldBeMutablePriorToCallingStart()
+    public function testIdShouldBeMutablePriorToCallingStart(): void
     {
         $this->manager = new SessionManager();
         $this->manager->setId(__CLASS__);
@@ -504,11 +504,13 @@ public function testIdShouldBeMutablePriorToCallingStart()
     /**
      * @runInSeparateProcess
      */
-    public function testIdShouldNotBeMutableAfterSessionStarted()
+    public function testIdShouldNotBeMutableAfterSessionStarted(): void
     {
         $this->manager = new SessionManager();
-        $this->expectException(RuntimeException::class, 'Session has already been started);
-        $this->expectExceptionMessage(to change the session ID call regenerateId()');
+        $this->expectException(
+            RuntimeException::class, 'Session has already been started);
+        $this->expectExceptionMessage(to change the session ID call regenerateId()'
+        );
         $this->manager->start();
         $origId = $this->manager->getId();
         $this->manager->setId(__METHOD__);
@@ -517,7 +519,7 @@ public function testIdShouldNotBeMutableAfterSessionStarted()
     /**
      * @runInSeparateProcess
      */
-    public function testRegenerateIdShouldWorkAfterSessionStarted()
+    public function testRegenerateIdShouldWorkAfterSessionStarted(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
@@ -529,7 +531,7 @@ public function testRegenerateIdShouldWorkAfterSessionStarted()
     /**
      * @runInSeparateProcess
      */
-    public function testRegenerateIdDoesNothingWhenSessioIsNotStarted()
+    public function testRegenerateIdDoesNothingWhenSessioIsNotStarted(): void
     {
         $this->manager = new SessionManager();
         $origId        = $this->manager->getId();
@@ -541,14 +543,14 @@ public function testRegenerateIdDoesNothingWhenSessioIsNotStarted()
     /**
      * @runInSeparateProcess
      */
-    public function testRegeneratingIdAfterSessionStartedShouldSendExpireCookie()
+    public function testRegeneratingIdAfterSessionStartedShouldSendExpireCookie(): void
     {
         if (! extension_loaded('xdebug')) {
             self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
-        $config = $this->manager->getConfig();
+        $config        = $this->manager->getConfig();
         $config->setUseCookies(true);
         $this->manager->start();
         $origId = $this->manager->getId();
@@ -570,14 +572,14 @@ public function testRegeneratingIdAfterSessionStartedShouldSendExpireCookie()
     /**
      * @runInSeparateProcess
      */
-    public function testRememberMeShouldSendNewSessionCookieWithUpdatedTimestamp()
+    public function testRememberMeShouldSendNewSessionCookieWithUpdatedTimestamp(): void
     {
         if (! extension_loaded('xdebug')) {
             self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
-        $config = $this->manager->getConfig();
+        $config        = $this->manager->getConfig();
         $config->setUseCookies(true);
         $this->manager->start();
         $this->manager->rememberMe(18600);
@@ -611,14 +613,14 @@ public function testRememberMeShouldSendNewSessionCookieWithUpdatedTimestamp()
     /**
      * @runInSeparateProcess
      */
-    public function testRememberMeShouldSetTimestampBasedOnConfigurationByDefault()
+    public function testRememberMeShouldSetTimestampBasedOnConfigurationByDefault(): void
     {
         if (! extension_loaded('xdebug')) {
             self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
-        $config = $this->manager->getConfig();
+        $config        = $this->manager->getConfig();
         $config->setUseCookies(true);
         $config->setRememberMeSeconds(3600);
         $ttl = $config->getRememberMeSeconds();
@@ -652,14 +654,14 @@ public function testRememberMeShouldSetTimestampBasedOnConfigurationByDefault()
     /**
      * @runInSeparateProcess
      */
-    public function testForgetMeShouldSendCookieWithZeroTimestamp()
+    public function testForgetMeShouldSendCookieWithZeroTimestamp(): void
     {
         if (! extension_loaded('xdebug')) {
             self::markTestSkipped('Xdebug required for this test');
         }
 
         $this->manager = new SessionManager();
-        $config = $this->manager->getConfig();
+        $config        = $this->manager->getConfig();
         $config->setUseCookies(true);
         $this->manager->start();
         $this->manager->forgetMe();
@@ -681,10 +683,10 @@ public function testForgetMeShouldSendCookieWithZeroTimestamp()
     /**
      * @runInSeparateProcess
      */
-    public function testStartingSessionThatFailsAValidatorShouldRaiseException()
+    public function testStartingSessionThatFailsAValidatorShouldRaiseException(): void
     {
         $this->manager = new SessionManager();
-        $chain = $this->manager->getValidatorChain();
+        $chain         = $this->manager->getValidatorChain();
         $chain->attach('session.validate', [new TestAsset\TestFailingValidator(), 'isValid']);
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('failed');
@@ -694,7 +696,7 @@ public function testStartingSessionThatFailsAValidatorShouldRaiseException()
     /**
      * @runInSeparateProcess
      */
-    public function testResumeSessionThatFailsAValidatorShouldRaiseException()
+    public function testResumeSessionThatFailsAValidatorShouldRaiseException(): void
     {
         $this->manager = new SessionManager();
         $this->manager->setSaveHandler(new TestAsset\TestSaveHandlerWithValidator());
@@ -706,7 +708,7 @@ public function testResumeSessionThatFailsAValidatorShouldRaiseException()
     /**
      * @runInSeparateProcess
      */
-    public function testSessionWriteCloseStoresMetadata()
+    public function testSessionWriteCloseStoresMetadata(): void
     {
         $this->manager = new SessionManager();
         $this->manager->start();
@@ -720,7 +722,7 @@ public function testSessionWriteCloseStoresMetadata()
     /**
      * @runInSeparateProcess
      */
-    public function testSessionValidationDoesNotHaltOnNoopListener()
+    public function testSessionValidationDoesNotHaltOnNoopListener(): void
     {
         $this->manager   = new SessionManager();
         $validatorCalled = false;
@@ -737,7 +739,7 @@ public function testSessionValidationDoesNotHaltOnNoopListener()
     /**
      * @runInSeparateProcess
      */
-    public function testProducedSessionManagerWillNotReplaceSessionSuperGlobalValues()
+    public function testProducedSessionManagerWillNotReplaceSessionSuperGlobalValues(): void
     {
         $this->manager   = new SessionManager();
         $_SESSION['foo'] = 'bar';
@@ -751,7 +753,7 @@ public function testProducedSessionManagerWillNotReplaceSessionSuperGlobalValues
     /**
      * @runInSeparateProcess
      */
-    public function testValidatorChainSessionMetadataIsPreserved()
+    public function testValidatorChainSessionMetadataIsPreserved(): void
     {
         $this->manager = new SessionManager();
         $this->manager->getValidatorChain()
@@ -769,7 +771,7 @@ public function testValidatorChainSessionMetadataIsPreserved()
     /**
      * @runInSeparateProcess
      */
-    public function testRemoteAddressValidationWillFailOnInvalidAddress()
+    public function testRemoteAddressValidationWillFailOnInvalidAddress(): void
     {
         $this->manager = new SessionManager();
         $this->manager->getValidatorChain()
@@ -783,10 +785,10 @@ public function testRemoteAddressValidationWillFailOnInvalidAddress()
     /**
      * @runInSeparateProcess
      */
-    public function testRemoteAddressValidationWillSucceedWithValidPreSetData()
+    public function testRemoteAddressValidationWillSucceedWithValidPreSetData(): void
     {
         $this->manager = new SessionManager();
-        $_SESSION = [
+        $_SESSION      = [
             '__Laminas' => [
                 '_VALID' => [
                     RemoteAddr::class => '',
@@ -802,10 +804,10 @@ public function testRemoteAddressValidationWillSucceedWithValidPreSetData()
     /**
      * @runInSeparateProcess
      */
-    public function testRemoteAddressValidationWillFailWithInvalidPreSetData()
+    public function testRemoteAddressValidationWillFailWithInvalidPreSetData(): void
     {
         $this->manager = new SessionManager();
-        $_SESSION = [
+        $_SESSION      = [
             '__Laminas' => [
                 '_VALID' => [
                     RemoteAddr::class => '123.123.123.123',
@@ -821,7 +823,7 @@ public function testRemoteAddressValidationWillFailWithInvalidPreSetData()
     /**
      * @runInSeparateProcess
      */
-    public function testIdValidationWillFailOnInvalidData()
+    public function testIdValidationWillFailOnInvalidData(): void
     {
         $this->manager = new SessionManager();
         $this->manager->getValidatorChain()
diff --git a/test/SessionStorageTest.php b/test/SessionStorageTest.php
index cc345218..c2259ebe 100644
--- a/test/SessionStorageTest.php
+++ b/test/SessionStorageTest.php
@@ -27,13 +27,13 @@ protected function tearDown(): void
         $_SESSION = [];
     }
 
-    public function testSessionStorageInheritsFromArrayStorage()
+    public function testSessionStorageInheritsFromArrayStorage(): void
     {
         self::assertInstanceOf('Laminas\Session\Storage\SessionStorage', $this->storage);
         self::assertInstanceOf('Laminas\Session\Storage\ArrayStorage', $this->storage);
     }
 
-    public function testStorageWritesToSessionSuperglobal()
+    public function testStorageWritesToSessionSuperglobal(): void
     {
         $this->storage['foo'] = 'bar';
         self::assertSame($_SESSION, $this->storage);
@@ -41,7 +41,7 @@ public function testStorageWritesToSessionSuperglobal()
         self::assertArrayNotHasKey('foo', $_SESSION);
     }
 
-    public function testPassingArrayToConstructorOverwritesSessionSuperglobal()
+    public function testPassingArrayToConstructorOverwritesSessionSuperglobal(): void
     {
         $_SESSION['foo'] = 'bar';
         $array           = ['foo' => 'FOO'];
@@ -55,26 +55,26 @@ public function testPassingArrayToConstructorOverwritesSessionSuperglobal()
         self::assertSame($expected, $_SESSION->getArrayCopy());
     }
 
-    public function testModifyingSessionSuperglobalDirectlyUpdatesStorage()
+    public function testModifyingSessionSuperglobalDirectlyUpdatesStorage(): void
     {
         $_SESSION['foo'] = 'bar';
         self::assertTrue(isset($this->storage['foo']));
     }
 
-    public function testDestructorSetsSessionToArray()
+    public function testDestructorSetsSessionToArray(): void
     {
         $this->storage->foo = 'bar';
-        $expected = [
+        $expected           = [
             '__Laminas' => [
                 '_REQUEST_ACCESS_TIME' => $this->storage->getRequestAccessTime(),
             ],
-            'foo' => 'bar',
+            'foo'       => 'bar',
         ];
         $this->storage->__destruct();
         self::assertSame($expected, $_SESSION);
     }
 
-    public function testModifyingOneSessionObjectModifiesTheOther()
+    public function testModifyingOneSessionObjectModifiesTheOther(): void
     {
         $this->storage->foo = 'bar';
         $storage            = new SessionStorage();
@@ -82,7 +82,7 @@ public function testModifyingOneSessionObjectModifiesTheOther()
         self::assertEquals('foo', $this->storage->bar);
     }
 
-    public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmutable()
+    public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmutable(): void
     {
         $this->storage->foo = 'bar';
         $storage            = new SessionStorage();
@@ -91,7 +91,7 @@ public function testMarkingOneSessionObjectImmutableShouldMarkOtherInstancesImmu
         self::assertTrue($storage->isImmutable(), var_export($_SESSION, 1));
     }
 
-    public function testMultiDimensionalUnset()
+    public function testMultiDimensionalUnset(): void
     {
         $this->storage['foo'] = ['bar' => ['baz' => 'boo']];
         unset($this->storage['foo']['bar']['baz']);
diff --git a/test/StorageTest.php b/test/StorageTest.php
index e9ad94d9..156c8364 100644
--- a/test/StorageTest.php
+++ b/test/StorageTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         $this->storage = new ArrayStorage();
     }
 
-    public function testStorageAllowsArrayAccess()
+    public function testStorageAllowsArrayAccess(): void
     {
         $this->storage['foo'] = 'bar';
         self::assertTrue(isset($this->storage['foo']));
@@ -35,7 +35,7 @@ public function testStorageAllowsArrayAccess()
         self::assertFalse(isset($this->storage['foo']));
     }
 
-    public function testStorageAllowsPropertyAccess()
+    public function testStorageAllowsPropertyAccess(): void
     {
         $this->storage->foo = 'bar';
         self::assertTrue(isset($this->storage->foo));
@@ -44,13 +44,13 @@ public function testStorageAllowsPropertyAccess()
         self::assertFalse(isset($this->storage->foo));
     }
 
-    public function testStorageAllowsSettingMetadata()
+    public function testStorageAllowsSettingMetadata(): void
     {
         $this->storage->setMetadata('TEST', 'foo');
         self::assertEquals('foo', $this->storage->getMetadata('TEST'));
     }
 
-    public function testSettingArrayMetadataMergesOnSubsequentRequests()
+    public function testSettingArrayMetadataMergesOnSubsequentRequests(): void
     {
         $this->storage->setMetadata('TEST', ['foo' => 'bar', 'bar' => 'baz']);
         $this->storage->setMetadata('TEST', ['foo' => 'baz', 'baz' => 'bat', 'lonesome']);
@@ -58,7 +58,7 @@ public function testSettingArrayMetadataMergesOnSubsequentRequests()
         self::assertEquals($expected, $this->storage->getMetadata('TEST'));
     }
 
-    public function testSettingArrayMetadataWithOverwriteFlagOverwritesExistingData()
+    public function testSettingArrayMetadataWithOverwriteFlagOverwritesExistingData(): void
     {
         $this->storage->setMetadata('TEST', ['foo' => 'bar', 'bar' => 'baz']);
         $this->storage->setMetadata('TEST', ['foo' => 'baz', 'baz' => 'bat', 'lonesome'], true);
@@ -66,7 +66,7 @@ public function testSettingArrayMetadataWithOverwriteFlagOverwritesExistingData(
         self::assertEquals($expected, $this->storage->getMetadata('TEST'));
     }
 
-    public function testLockWithNoKeyMakesStorageReadOnly()
+    public function testLockWithNoKeyMakesStorageReadOnly(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->lock();
@@ -75,7 +75,7 @@ public function testLockWithNoKeyMakesStorageReadOnly()
         $this->storage->foo = 'baz';
     }
 
-    public function testLockWithNoKeyMarksEntireStorageLocked()
+    public function testLockWithNoKeyMarksEntireStorageLocked(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -85,7 +85,7 @@ public function testLockWithNoKeyMarksEntireStorageLocked()
         self::assertTrue($this->storage->isLocked('bar'));
     }
 
-    public function testLockWithKeyMakesOnlyThatKeyReadOnly()
+    public function testLockWithKeyMakesOnlyThatKeyReadOnly(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->lock('foo');
@@ -98,7 +98,7 @@ public function testLockWithKeyMakesOnlyThatKeyReadOnly()
         $this->storage->foo = 'baz';
     }
 
-    public function testLockWithKeyMarksOnlyThatKeyLocked()
+    public function testLockWithKeyMarksOnlyThatKeyLocked(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -107,7 +107,7 @@ public function testLockWithKeyMarksOnlyThatKeyLocked()
         self::assertFalse($this->storage->isLocked('bar'));
     }
 
-    public function testLockWithNoKeyShouldWriteToMetadata()
+    public function testLockWithNoKeyShouldWriteToMetadata(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->lock();
@@ -115,7 +115,7 @@ public function testLockWithNoKeyShouldWriteToMetadata()
         self::assertTrue($locked);
     }
 
-    public function testLockWithKeyShouldWriteToMetadata()
+    public function testLockWithKeyShouldWriteToMetadata(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->lock('foo');
@@ -124,7 +124,7 @@ public function testLockWithKeyShouldWriteToMetadata()
         self::assertArrayHasKey('foo', $locks);
     }
 
-    public function testUnlockShouldUnlockEntireObject()
+    public function testUnlockShouldUnlockEntireObject(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -134,7 +134,7 @@ public function testUnlockShouldUnlockEntireObject()
         self::assertFalse($this->storage->isLocked('bar'));
     }
 
-    public function testUnlockShouldUnlockSelectivelyLockedKeys()
+    public function testUnlockShouldUnlockSelectivelyLockedKeys(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -144,7 +144,7 @@ public function testUnlockShouldUnlockSelectivelyLockedKeys()
         self::assertFalse($this->storage->isLocked('bar'));
     }
 
-    public function testUnlockWithKeyShouldUnlockOnlyThatKey()
+    public function testUnlockWithKeyShouldUnlockOnlyThatKey(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -154,7 +154,7 @@ public function testUnlockWithKeyShouldUnlockOnlyThatKey()
         self::assertTrue($this->storage->isLocked('bar'));
     }
 
-    public function testUnlockWithKeyOfSelectiveLockShouldUnlockThatKey()
+    public function testUnlockWithKeyOfSelectiveLockShouldUnlockThatKey(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->lock('foo');
@@ -162,7 +162,7 @@ public function testUnlockWithKeyOfSelectiveLockShouldUnlockThatKey()
         self::assertFalse($this->storage->isLocked('foo'));
     }
 
-    public function testClearWithNoArgumentsRemovesExistingData()
+    public function testClearWithNoArgumentsRemovesExistingData(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -172,7 +172,7 @@ public function testClearWithNoArgumentsRemovesExistingData()
         self::assertSame([], $data);
     }
 
-    public function testClearWithNoArgumentsRemovesExistingMetadata()
+    public function testClearWithNoArgumentsRemovesExistingMetadata(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->lock('foo');
@@ -183,7 +183,7 @@ public function testClearWithNoArgumentsRemovesExistingMetadata()
         self::assertFalse($this->storage->getMetadata('FOO'));
     }
 
-    public function testClearWithArgumentRemovesExistingDataForThatKeyOnly()
+    public function testClearWithArgumentRemovesExistingDataForThatKeyOnly(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -193,7 +193,7 @@ public function testClearWithArgumentRemovesExistingDataForThatKeyOnly()
         self::assertSame(['bar' => 'baz'], $data);
     }
 
-    public function testClearWithArgumentRemovesExistingMetadataForThatKeyOnly()
+    public function testClearWithArgumentRemovesExistingMetadataForThatKeyOnly(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -209,7 +209,7 @@ public function testClearWithArgumentRemovesExistingMetadataForThatKeyOnly()
         self::assertEquals('baz', $this->storage->getMetadata('bar'));
     }
 
-    public function testClearWhenStorageMarkedImmutableRaisesException()
+    public function testClearWhenStorageMarkedImmutableRaisesException(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -219,14 +219,14 @@ public function testClearWhenStorageMarkedImmutableRaisesException()
         $this->storage->clear();
     }
 
-    public function testRequestAccessTimeIsPreservedEvenInFactoryMethod()
+    public function testRequestAccessTimeIsPreservedEvenInFactoryMethod(): void
     {
         self::assertNotEmpty($this->storage->getRequestAccessTime());
         $this->storage->fromArray([]);
         self::assertNotEmpty($this->storage->getRequestAccessTime());
     }
 
-    public function testToArrayWithMetaData()
+    public function testToArrayWithMetaData(): void
     {
         $this->storage->foo = 'bar';
         $this->storage->bar = 'baz';
@@ -242,7 +242,7 @@ public function testToArrayWithMetaData()
         self::assertSame($expected, $this->storage->toArray(true));
     }
 
-    public function testUnsetMultidimensional()
+    public function testUnsetMultidimensional(): void
     {
         $this->storage['foo'] = ['bar' => ['baz' => 'boo']];
         unset($this->storage['foo']['bar']['baz']);
diff --git a/test/TestAsset/TestDbTableGatewaySaveHandler.php b/test/TestAsset/TestDbTableGatewaySaveHandler.php
index 2524212e..4beccf7e 100644
--- a/test/TestAsset/TestDbTableGatewaySaveHandler.php
+++ b/test/TestAsset/TestDbTableGatewaySaveHandler.php
@@ -16,12 +16,12 @@ class TestDbTableGatewaySaveHandler extends DbTableGateway
 
     protected $numDestroyCalls = 0;
 
-    public function getNumReadCalls()
+    public function getNumReadCalls(): int
     {
         return $this->numReadCalls;
     }
 
-    public function getNumDestroyCalls()
+    public function getNumDestroyCalls(): int
     {
         return $this->numDestroyCalls;
     }
diff --git a/test/TestAsset/TestManager.php b/test/TestAsset/TestManager.php
index 1a7d90f9..cd77aae7 100644
--- a/test/TestAsset/TestManager.php
+++ b/test/TestAsset/TestManager.php
@@ -30,7 +30,7 @@ public function destroy()
         $this->started = false;
     }
 
-    public function stop()
+    public function stop(): void
     {
     }
 
diff --git a/test/Validator/IdTest.php b/test/Validator/IdTest.php
index 93865ab2..3625d6be 100644
--- a/test/Validator/IdTest.php
+++ b/test/Validator/IdTest.php
@@ -17,7 +17,7 @@ class IdTest extends TestCase
     /**
      * @return Generator
      */
-    public function id()
+    public function id(): ?Generator
     {
         yield '4, valid' => [4, '0123456789abcdef', true];
         yield '4, invalid (out of the range)' => [4, '0123456789abcdefg', false];
@@ -41,7 +41,7 @@ public function id()
      * @param string $id
      * @param bool   $isValid
      */
-    public function testIsValidPhp71($bitsPerCharacter, $id, $isValid)
+    public function testIsValidPhp71($bitsPerCharacter, $id, $isValid): void
     {
         ini_set('session.sid_bits_per_character', $bitsPerCharacter);
 
@@ -59,7 +59,7 @@ public function testIsValidPhp71($bitsPerCharacter, $id, $isValid)
      * @param string $id
      * @param bool   $isValid
      */
-    public function testIsValidPhpPriorTo71($bitsPerCharacter, $id, $isValid)
+    public function testIsValidPhpPriorTo71($bitsPerCharacter, $id, $isValid): void
     {
         ini_set('session.hash_bits_per_character', $bitsPerCharacter);
 
@@ -67,7 +67,7 @@ public function testIsValidPhpPriorTo71($bitsPerCharacter, $id, $isValid)
         self::assertSame($isValid, $validator->isValid());
     }
 
-    public function testConstructorSetId()
+    public function testConstructorSetId(): void
     {
         $id = new Id('1234');
 
@@ -77,7 +77,7 @@ public function testConstructorSetId()
     /**
      * @runInSeparateProcess
      */
-    public function testInitializedWithSessionIdWhenIdIsNotPassed()
+    public function testInitializedWithSessionIdWhenIdIsNotPassed(): void
     {
         session_start();
         $sessionId = session_id();
@@ -87,7 +87,7 @@ public function testInitializedWithSessionIdWhenIdIsNotPassed()
         self::assertSame($sessionId, $id->getData());
     }
 
-    public function testValidatorName()
+    public function testValidatorName(): void
     {
         $id = new Id();
 
diff --git a/test/Validator/RemoteAddrTest.php b/test/Validator/RemoteAddrTest.php
index 9efdc301..12350f91 100644
--- a/test/Validator/RemoteAddrTest.php
+++ b/test/Validator/RemoteAddrTest.php
@@ -18,7 +18,7 @@ class RemoteAddrTest extends TestCase
 {
     protected $backup;
 
-    protected function backup()
+    protected function backup(): void
     {
         $this->backup = $_SERVER;
         unset(
@@ -31,7 +31,7 @@ protected function backup()
         RemoteAddr::setProxyHeader();
     }
 
-    protected function restore()
+    protected function restore(): void
     {
         $_SERVER = $this->backup;
         RemoteAddr::setUseProxy(false);
@@ -39,18 +39,18 @@ protected function restore()
         RemoteAddr::setProxyHeader();
     }
 
-    public function testGetData()
+    public function testGetData(): void
     {
         $validator = new RemoteAddr('0.1.2.3');
         self::assertEquals('0.1.2.3', $validator->getData());
     }
 
-    public function testDefaultUseProxy()
+    public function testDefaultUseProxy(): void
     {
         self::assertFalse(RemoteAddr::getUseProxy());
     }
 
-    public function testRemoteAddrWithoutProxy()
+    public function testRemoteAddrWithoutProxy(): void
     {
         $this->backup();
         $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
@@ -59,7 +59,7 @@ public function testRemoteAddrWithoutProxy()
         $this->restore();
     }
 
-    public function testIsValid()
+    public function testIsValid(): void
     {
         $this->backup();
         $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
@@ -69,7 +69,7 @@ public function testIsValid()
         $this->restore();
     }
 
-    public function testIgnoreProxyByDefault()
+    public function testIgnoreProxyByDefault(): void
     {
         $this->backup();
         $_SERVER['REMOTE_ADDR']    = '0.1.2.3';
@@ -79,10 +79,10 @@ public function testIgnoreProxyByDefault()
         $this->restore();
     }
 
-    public function testHttpXForwardedFor()
+    public function testHttpXForwardedFor(): void
     {
         $this->backup();
-        $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
+        $_SERVER['REMOTE_ADDR']          = '0.1.2.3';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = '1.1.2.3';
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setTrustedProxies(['0.1.2.3']);
@@ -91,10 +91,10 @@ public function testHttpXForwardedFor()
         $this->restore();
     }
 
-    public function testHttpClientIp()
+    public function testHttpClientIp(): void
     {
         $this->backup();
-        $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
+        $_SERVER['REMOTE_ADDR']          = '0.1.2.3';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = '1.1.2.3';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.2.3';
         RemoteAddr::setUseProxy(true);
@@ -104,10 +104,10 @@ public function testHttpClientIp()
         $this->restore();
     }
 
-    public function testUsesRightMostAddressWhenMultipleHttpXForwardedForAddressesPresent()
+    public function testUsesRightMostAddressWhenMultipleHttpXForwardedForAddressesPresent(): void
     {
         $this->backup();
-        $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
+        $_SERVER['REMOTE_ADDR']          = '0.1.2.3';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.2.3, 1.1.2.3';
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setTrustedProxies(['0.1.2.3']);
@@ -116,22 +116,22 @@ public function testUsesRightMostAddressWhenMultipleHttpXForwardedForAddressesPr
         $this->restore();
     }
 
-    public function testShouldNotUseClientIpHeaderToTestProxyCapabilitiesByDefault()
+    public function testShouldNotUseClientIpHeaderToTestProxyCapabilitiesByDefault(): void
     {
         $this->backup();
-        $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
+        $_SERVER['REMOTE_ADDR']          = '0.1.2.3';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.2.3, 1.1.2.3';
-        $_SERVER['HTTP_CLIENT_IP'] = '0.1.2.4';
+        $_SERVER['HTTP_CLIENT_IP']       = '0.1.2.4';
         RemoteAddr::setUseProxy(true);
         $validator = new RemoteAddr();
         self::assertEquals('0.1.2.3', $validator->getData());
         $this->restore();
     }
 
-    public function testWillOmitTrustedProxyIpsFromXForwardedForMatching()
+    public function testWillOmitTrustedProxyIpsFromXForwardedForMatching(): void
     {
         $this->backup();
-        $_SERVER['REMOTE_ADDR'] = '1.1.2.3';
+        $_SERVER['REMOTE_ADDR']          = '1.1.2.3';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.2.3, 1.1.2.3';
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setTrustedProxies(['1.1.2.3']);
@@ -140,12 +140,12 @@ public function testWillOmitTrustedProxyIpsFromXForwardedForMatching()
         $this->restore();
     }
 
-    public function testCanSpecifyWhichHeaderToUseStatically()
+    public function testCanSpecifyWhichHeaderToUseStatically(): void
     {
         $this->backup();
-        $_SERVER['REMOTE_ADDR'] = '0.1.2.3';
+        $_SERVER['REMOTE_ADDR']          = '0.1.2.3';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = '2.1.2.3, 1.1.2.3';
-        $_SERVER['HTTP_CLIENT_IP'] = '0.1.2.4';
+        $_SERVER['HTTP_CLIENT_IP']       = '0.1.2.4';
         RemoteAddr::setUseProxy(true);
         RemoteAddr::setProxyHeader('Client-Ip');
         $validator = new RemoteAddr();

From 41e9266d27c32d624d98d9e9321873b178a6c6cf Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 14:22:42 +0200
Subject: [PATCH 05/18] qa: fix code style

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/SaveHandler/CacheTest.php             |  3 +-
 test/Service/SessionConfigFactoryTest.php  | 34 ++++++++++-------
 test/Service/SessionManagerFactoryTest.php | 44 ++++++++++++----------
 test/Service/StorageFactoryTest.php        | 18 +++++----
 test/SessionManagerTest.php                |  3 +-
 5 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/test/SaveHandler/CacheTest.php b/test/SaveHandler/CacheTest.php
index 3fc9f449..6ebfe640 100644
--- a/test/SaveHandler/CacheTest.php
+++ b/test/SaveHandler/CacheTest.php
@@ -153,7 +153,8 @@ function ($args) {
                             }
                         );
                     return true;
-            });
+                }
+            );
         $this->usedSaveHandlers[] = $saveHandler = new Cache($cacheStorage->reveal());
 
         $id = '242';
diff --git a/test/Service/SessionConfigFactoryTest.php b/test/Service/SessionConfigFactoryTest.php
index e9d4cc08..c378e534 100644
--- a/test/Service/SessionConfigFactoryTest.php
+++ b/test/Service/SessionConfigFactoryTest.php
@@ -21,6 +21,9 @@
  */
 class SessionConfigFactoryTest extends TestCase
 {
+    /** @var ServiceManager */
+    private $services;
+
     protected function setUp(): void
     {
         $config         = new Config(
@@ -37,9 +40,10 @@ protected function setUp(): void
     public function testCreatesSessionConfigByDefault(): void
     {
         $this->services->setService(
-            'config', [
-            'session_config' => [],
-        ]
+            'config',
+            [
+                'session_config' => [],
+            ]
         );
         $config = $this->services->get(ConfigInterface::class);
         self::assertInstanceOf(SessionConfig::class, $config);
@@ -48,11 +52,12 @@ public function testCreatesSessionConfigByDefault(): void
     public function testCanCreateAlternateSessionConfigTypeViaConfigClassKey(): void
     {
         $this->services->setService(
-            'config', [
-            'session_config' => [
-                'config_class' => StandardConfig::class,
-            ],
-        ]
+            'config',
+            [
+                'session_config' => [
+                    'config_class' => StandardConfig::class,
+                ],
+            ]
         );
         $config = $this->services->get(ConfigInterface::class);
         self::assertInstanceOf(StandardConfig::class, $config);
@@ -63,12 +68,13 @@ public function testCanCreateAlternateSessionConfigTypeViaConfigClassKey(): void
     public function testServiceReceivesConfiguration(): void
     {
         $this->services->setService(
-            'config', [
-            'session_config' => [
-                'config_class' => StandardConfig::class,
-                'name'         => 'laminas',
-            ],
-        ]
+            'config',
+            [
+                'session_config' => [
+                    'config_class' => StandardConfig::class,
+                    'name'         => 'laminas',
+                ],
+            ]
         );
         $config = $this->services->get(ConfigInterface::class);
         self::assertEquals('laminas', $config->getName());
diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php
index 1ea50ec3..75faac50 100644
--- a/test/Service/SessionManagerFactoryTest.php
+++ b/test/Service/SessionManagerFactoryTest.php
@@ -143,21 +143,23 @@ public function testFactoryDoesNotOverwriteValidatorStorageValues(): void
     {
         $storage = new ArrayStorage();
         $storage->setMetadata(
-            '_VALID', [
-            Validator\HttpUserAgent::class => 'Foo',
-            Validator\RemoteAddr::class    => '1.2.3.4',
-        ]
+            '_VALID',
+            [
+                Validator\HttpUserAgent::class => 'Foo',
+                Validator\RemoteAddr::class    => '1.2.3.4',
+            ]
         );
         $this->services->setService(StorageInterface::class, $storage);
         $this->services->setService(
-            'config', [
+            'config',
+            [
                 'session_manager' => [
                     'validators' => [
-                    Validator\HttpUserAgent::class,
-                    Validator\RemoteAddr::class,
+                        Validator\HttpUserAgent::class,
+                        Validator\RemoteAddr::class,
+                    ],
                 ],
-            ],
-        ]
+            ]
         );
 
         // This call is needed to make sure session storage data is not overwritten by the factory
@@ -175,19 +177,22 @@ public function testFactoryDoesNotAttachValidatorTwoTimes(): void
     {
         $storage = new ArrayStorage();
         $storage->setMetadata(
-            '_VALID', [
-            Validator\RemoteAddr::class => '1.2.3.4',
-        ]
+            '_VALID',
+            [
+                Validator\RemoteAddr::class => '1.2.3.4',
+            ]
         );
         $this->services->setService(StorageInterface::class, $storage);
         $this->services->setService(
-            'config', [
-            'session_manager' => [
-                'validators' => [
-                    Validator\RemoteAddr::class,
+            'config',
+            [
+                'session_manager' => [
+                    'validators' => [
+                        Validator\RemoteAddr::class,
+                    ],
                 ],
-            ],
-        ]);
+            ]
+        );
 
         $manager = $this->services->get(ManagerInterface::class);
         try {
@@ -216,7 +221,8 @@ public function testFactoryAllowsOverridingOptions(): void
         $storage = new ArrayStorage();
         $this->services->setService(StorageInterface::class, $storage);
         $this->services->setService(
-            'config', [
+            'config',
+            [
                 'session_manager' => [
                     'options' => [
                         'attach_default_validators' => false,
diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php
index 98ad430b..7bec7d9a 100644
--- a/test/Service/StorageFactoryTest.php
+++ b/test/Service/StorageFactoryTest.php
@@ -23,6 +23,9 @@
  */
 class StorageFactoryTest extends TestCase
 {
+    /** @var ServiceManager */
+    private $services;
+
     protected function setUp(): void
     {
         $config         = new Config(
@@ -47,8 +50,8 @@ public function sessionStorageConfig(): array
                                                       'foo' => 'bar',
                                                   ],
                                               ],
-                ],
-            ], ArrayStorage::class],
+                                          ],
+                                      ], ArrayStorage::class],
             'array-storage-fqcn' => [[
                 'session_storage' => [
                     'type' => ArrayStorage::class,
@@ -107,7 +110,8 @@ public function testUsesConfigurationToCreateStorage($config, $class): void
     public function testConfigurationWithoutInputIsValid(): void
     {
         $this->services->setService(
-            'config', [
+            'config',
+            [
                 'session_storage' => [
                     'type'    => ArrayStorage::class,
                     'options' => [],
@@ -132,10 +136,10 @@ public function invalidSessionStorageConfig(): array
                                       ]],
             'unknown-class-fqcn'  => [[
                                           'session_storage' => [
-                    'type' => 'Foo\Bar\Baz\Bat',
-                    'options' => [],
-                ],
-            ]],
+                                              'type'    => 'Foo\Bar\Baz\Bat',
+                                              'options' => [],
+                                          ],
+                                      ]],
             'bad-class' => [[
                 'session_storage' => [
                     'type' => 'Laminas\Session\Config\StandardConfig',
diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
index 7fea150d..f4bb12e6 100644
--- a/test/SessionManagerTest.php
+++ b/test/SessionManagerTest.php
@@ -508,7 +508,8 @@ public function testIdShouldNotBeMutableAfterSessionStarted(): void
     {
         $this->manager = new SessionManager();
         $this->expectException(
-            RuntimeException::class, 'Session has already been started);
+            RuntimeException::class,
+            'Session has already been started);
         $this->expectExceptionMessage(to change the session ID call regenerateId()'
         );
         $this->manager->start();

From 4aaf05698442209e76e90d5507da76009d30d46a Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 14:26:48 +0200
Subject: [PATCH 06/18] ci: check coverage on php 7.3, use nightly instead of
 8.0, skip mongodb in php8

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 .travis.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32db6971..eeebd758 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,23 +22,25 @@ matrix:
     - php: 7.3
       env:
         - DEPS=latest
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.3
       env:
         - DEPS=lowest
     - php: 7.4
       env:
         - DEPS=latest
-        - CS_CHECK=true
-        - TEST_COVERAGE=true
-    - php: 8.0
+    - php: nightly
       env:
         - DEPS=latest
+        - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+        - SKIP_MONGODB=true # ext-mongodb does not build on php8 yet (https://github.com/mongodb/mongo-php-driver/issues/1161)
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - pecl channel-update pecl.php.net
-  - pecl -q upgrade mongodb
-  - $(php -m | grep -q mongodb) || echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - if [[ $SKIP_MONGODB != 'true' ]]; then pecl -q upgrade mongodb ; fi
+  - if [[ $SKIP_MONGODB != 'true' ]]; then $(php -m | grep -q mongodb) || echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
   - psql -c 'create database laminas_session_test;' -U postgres
   - mysql -e 'CREATE DATABASE laminas_session_test;'
 

From 0c4954504c912d97f9f495abb89f818035191526 Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 14:34:22 +0200
Subject: [PATCH 07/18] fix: fix tests which only run with xdebug

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/SessionManagerTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
index f4bb12e6..5b93fbfb 100644
--- a/test/SessionManagerTest.php
+++ b/test/SessionManagerTest.php
@@ -424,7 +424,7 @@ public function testSendingFalseToSendExpireCookieWhenCallingDestroyShouldNotSen
         }
 
         if ($found) {
-            self::assertNotContains('expires=', $header);
+            self::assertStringNotContainsString('expires=', $header);
         } else {
             self::assertFalse($found, 'Unexpected session cookie found: ' . var_export($headers, true));
         }
@@ -678,7 +678,7 @@ public function testForgetMeShouldSendCookieWithZeroTimestamp(): void
         }
 
         self::assertTrue($found, 'No session cookie found: ' . var_export($headers, true));
-        self::assertNotContains('expires=', $header);
+        self::assertStringNotContainsString('expires=', $header);
     }
 
     /**

From 5beba2cc367a60c9e077ef7f4a4d4778be7ea3ac Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 14:58:12 +0200
Subject: [PATCH 08/18] qa: add a test for HttpUserAgent validator

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/Validator/HttpUserAgentTest.php | 39 ++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 test/Validator/HttpUserAgentTest.php

diff --git a/test/Validator/HttpUserAgentTest.php b/test/Validator/HttpUserAgentTest.php
new file mode 100644
index 00000000..b2a9ac7b
--- /dev/null
+++ b/test/Validator/HttpUserAgentTest.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Session\Validator;
+
+use Laminas\Session\Validator\HttpUserAgent;
+use PHPUnit\Framework\TestCase;
+
+class HttpUserAgentTest extends TestCase
+{
+    public function testIsValid(): void
+    {
+        $_SERVER['HTTP_USER_AGENT'] = 'Test-User-Agent';
+
+        $validator = new HttpUserAgent();
+
+        self::assertNotNull($validator->getData());
+        self::assertTrue($validator->isValid());
+    }
+
+    public function testIsValidWhenNoUserAgentIsSet(): void
+    {
+        // technically not needed in CLI
+        unset($_SERVER['HTTP_USER_AGENT']);
+
+        $validator = new HttpUserAgent();
+
+        self::assertNull($validator->getData());
+        self::assertTrue($validator->isValid());
+    }
+
+    public function testGetNameReturnsClassName(): void
+    {
+        $validator = new HttpUserAgent();
+
+        self::assertSame(HttpUserAgent::class, $validator->getName());
+    }
+}

From ce646c641d4db68fb0982b5a5fa7b7eead178592 Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 20:49:34 +0200
Subject: [PATCH 09/18] qa: convert ReflectionUtil to trait; use more specific
 php version requirement in composer.json

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 composer.json                                            | 2 +-
 test/{ReflectionUtil.php => ReflectionPropertyTrait.php} | 8 +++-----
 test/Service/SessionManagerFactoryTest.php               | 5 +++--
 test/SessionManagerTest.php                              | 5 +++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename test/{ReflectionUtil.php => ReflectionPropertyTrait.php} (58%)

diff --git a/composer.json b/composer.json
index 26efb4bc..fb15ac7d 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         }
     },
     "require": {
-        "php": "^7.3 ||^8.0",
+        "php": "^7.3 || ~8.0.0",
         "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
         "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-zendframework-bridge": "^1.0"
diff --git a/test/ReflectionUtil.php b/test/ReflectionPropertyTrait.php
similarity index 58%
rename from test/ReflectionUtil.php
rename to test/ReflectionPropertyTrait.php
index a82f3cf2..5621e801 100644
--- a/test/ReflectionUtil.php
+++ b/test/ReflectionPropertyTrait.php
@@ -6,18 +6,16 @@
 
 use ReflectionObject;
 
-final class ReflectionUtil
+trait ReflectionPropertyTrait
 {
     /**
      * @return mixed
      */
-    public static function getProperty(object $object, string $property)
+    private function getReflectionProperty(object $object, string $property)
     {
         $reflectionObject   = new ReflectionObject($object);
         $reflectionProperty = $reflectionObject->getProperty($property);
         $reflectionProperty->setAccessible(true);
-        $value = $reflectionProperty->getValue($object);
-        $reflectionProperty->setAccessible(false);
-        return $value;
+        return $reflectionProperty->getValue($object);
     }
 }
diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php
index 75faac50..185d9f8a 100644
--- a/test/Service/SessionManagerFactoryTest.php
+++ b/test/Service/SessionManagerFactoryTest.php
@@ -21,7 +21,7 @@
 use Laminas\Session\Storage\ArrayStorage;
 use Laminas\Session\Storage\StorageInterface;
 use Laminas\Session\Validator;
-use LaminasTest\Session\ReflectionUtil;
+use LaminasTest\Session\ReflectionPropertyTrait;
 use LaminasTest\Session\TestAsset\TestManager;
 use LaminasTest\Session\TestAsset\TestSaveHandler;
 use PHPUnit\Framework\TestCase;
@@ -33,6 +33,7 @@
 class SessionManagerFactoryTest extends TestCase
 {
     use EventListenerIntrospectionTrait;
+    use ReflectionPropertyTrait;
 
     /** @var ServiceManager */
     private $services;
@@ -233,7 +234,7 @@ public function testFactoryAllowsOverridingOptions(): void
 
         $manager = $this->services->get(ManagerInterface::class);
 
-        $containedValidators = ReflectionUtil::getProperty($manager, 'validators');
+        $containedValidators = $this->getReflectionProperty($manager, 'validators');
         self::assertSame([], $containedValidators);
     }
 
diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
index 5b93fbfb..f7417c35 100644
--- a/test/SessionManagerTest.php
+++ b/test/SessionManagerTest.php
@@ -31,6 +31,7 @@
 class SessionManagerTest extends TestCase
 {
     use ProphecyTrait;
+    use ReflectionPropertyTrait;
 
     public $error;
 
@@ -840,7 +841,7 @@ public function testIdValidationWillFailOnInvalidData(): void
      */
     private function assertAttributeEquals($expected, string $property, object $object): void
     {
-        $value = ReflectionUtil::getProperty($object, $property);
+        $value = $this->getReflectionProperty($object, $property);
         self::assertEquals($expected, $value);
     }
 
@@ -849,7 +850,7 @@ private function assertAttributeEquals($expected, string $property, object $obje
      */
     private function assertAttributeContains($expected, string $property, object $object): void
     {
-        $value = ReflectionUtil::getProperty($object, $property);
+        $value = $this->getReflectionProperty($object, $property);
         self::assertContains($expected, $value);
     }
 }

From 193d8fdbfda1b0a47178e563f3b171d1dc5020b1 Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 21:45:33 +0200
Subject: [PATCH 10/18] qa: add some tests to prevent coveralls from failing;
 ContainerTest should also cover AbstractContainer

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/AbstractContainerTest.php |  6 +---
 test/ConfigProviderTest.php    | 57 ++++++++++++++++++++++++++++++++++
 test/ContainerTest.php         | 13 ++------
 test/ModuleTest.php            | 18 +++++++++++
 test/TestAsset/TestManager.php |  2 +-
 5 files changed, 80 insertions(+), 16 deletions(-)
 create mode 100644 test/ConfigProviderTest.php
 create mode 100644 test/ModuleTest.php

diff --git a/test/AbstractContainerTest.php b/test/AbstractContainerTest.php
index 4791c1e6..dd6c6638 100644
--- a/test/AbstractContainerTest.php
+++ b/test/AbstractContainerTest.php
@@ -41,11 +41,7 @@ protected function setUp(): void
         $_SESSION = [];
         Container::setDefaultManager(null);
 
-        $config = new StandardConfig(
-            [
-                'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
-            ]
-        );
+        $config = new StandardConfig();
 
         $this->manager   = $manager = new TestAsset\TestManager($config);
         $this->container = new TestContainer('Default', $manager);
diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
new file mode 100644
index 00000000..4fb97600
--- /dev/null
+++ b/test/ConfigProviderTest.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Session;
+
+use Laminas\Session\Config\ConfigInterface;
+use Laminas\Session\ConfigProvider;
+use Laminas\Session\ManagerInterface;
+use Laminas\Session\Service\ContainerAbstractServiceFactory;
+use Laminas\Session\Service\SessionConfigFactory;
+use Laminas\Session\Service\SessionManagerFactory;
+use Laminas\Session\Service\StorageFactory;
+use Laminas\Session\SessionManager;
+use Laminas\Session\Storage\StorageInterface;
+use PHPUnit\Framework\TestCase;
+
+class ConfigProviderTest extends TestCase
+{
+    /** @var array<string, mixed> */
+    private $config;
+
+    protected function setUp(): void
+    {
+        $this->config = (new ConfigProvider())();
+    }
+
+    public function testProvidesDependencyConfig(): void
+    {
+        self::assertArrayHasKey('dependencies', $this->config);
+    }
+
+    public function testProvidesCorrectDependencyConfig(): void
+    {
+        $config = $this->config['dependencies'];
+
+        $abstractFactories = $config['abstract_factories'];
+        $aliases           = $config['aliases'];
+        $factories         = $config['factories'];
+
+        self::assertContains(ContainerAbstractServiceFactory::class, $abstractFactories);
+        self::assertSame($aliases[SessionManager::class], ManagerInterface::class);
+        self::assertSame($factories[ConfigInterface::class], SessionConfigFactory::class);
+        self::assertSame($factories[ManagerInterface::class], SessionManagerFactory::class);
+        self::assertSame($factories[StorageInterface::class], StorageFactory::class);
+    }
+
+    public function testProvidesAliasesForLegacyZendFrameworkClasses(): void
+    {
+        $config = $this->config['dependencies']['aliases'];
+
+        self::assertSame($config['Zend\Session\SessionManager'], SessionManager::class);
+        self::assertSame($config['Zend\Session\Config\ConfigInterface'], ConfigInterface::class);
+        self::assertSame($config['Zend\Session\ManagerInterface'], ManagerInterface::class);
+        self::assertSame($config['Zend\Session\Storage\StorageInterface'], StorageInterface::class);
+    }
+}
diff --git a/test/ContainerTest.php b/test/ContainerTest.php
index e5432d6c..2b8097e1 100644
--- a/test/ContainerTest.php
+++ b/test/ContainerTest.php
@@ -17,6 +17,7 @@
 
 /**
  * @covers \Laminas\Session\Container
+ * @covers \Laminas\Session\AbstractContainer
  */
 class ContainerTest extends TestCase
 {
@@ -42,11 +43,7 @@ protected function setUp(): void
         $_SESSION = [];
         Container::setDefaultManager(null);
 
-        $config = new StandardConfig(
-            [
-                'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
-            ]
-        );
+        $config = new StandardConfig();
 
         $this->manager   = $manager = new TestAsset\TestManager($config);
         $this->container = new Container('Default', $manager);
@@ -173,11 +170,7 @@ public function testContainerInstantiatesManagerWithDefaultsWhenNotInjected(): v
 
     public function testContainerAllowsInjectingManagerViaConstructor(): void
     {
-        $config    = new StandardConfig(
-            [
-                'storage' => 'Laminas\\Session\\Storage\\ArrayStorage',
-            ]
-        );
+        $config    = new StandardConfig();
         $manager   = new TestAsset\TestManager($config);
         $container = new Container('Foo', $manager);
         self::assertSame($manager, $container->getManager());
diff --git a/test/ModuleTest.php b/test/ModuleTest.php
new file mode 100644
index 00000000..f4a5d978
--- /dev/null
+++ b/test/ModuleTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Session;
+
+use Laminas\Session\Module;
+use PHPUnit\Framework\TestCase;
+
+class ModuleTest extends TestCase
+{
+    public function testConfigProvidesServiceManagerConfiguration(): void
+    {
+        $config = (new Module())->getConfig();
+
+        self::assertArrayHasKey('service_manager', $config);
+    }
+}
diff --git a/test/TestAsset/TestManager.php b/test/TestAsset/TestManager.php
index cd77aae7..26209dce 100644
--- a/test/TestAsset/TestManager.php
+++ b/test/TestAsset/TestManager.php
@@ -10,7 +10,7 @@
 
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\Session\AbstractManager;
-use Laminas\Session\Configuration\StandardConfig;
+use Laminas\Session\Config\StandardConfig;
 use Laminas\Session\Storage\ArrayStorage;
 
 class TestManager extends AbstractManager

From a8d0b3f95e3726ca41db5568a106bd8ae5a6410c Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 22:35:09 +0200
Subject: [PATCH 11/18] feat: drop support for laminas-eventmanager v2 and
 laminas-servicemanager v2

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 composer.json                               |   4 +-
 src/Validator/AbstractValidatorChainEM2.php |  55 -----------
 src/Validator/AbstractValidatorChainEM3.php |  55 -----------
 src/Validator/ValidatorChainTrait.php       |  63 ------------
 src/ValidatorChain.php                      | 101 ++++++++++++++------
 5 files changed, 74 insertions(+), 204 deletions(-)
 delete mode 100644 src/Validator/AbstractValidatorChainEM2.php
 delete mode 100644 src/Validator/AbstractValidatorChainEM3.php
 delete mode 100644 src/Validator/ValidatorChainTrait.php

diff --git a/composer.json b/composer.json
index fb15ac7d..fbf62711 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
     },
     "require": {
         "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+        "laminas/laminas-eventmanager": "^3.0",
         "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
@@ -36,7 +36,7 @@
         "laminas/laminas-coding-standard": "~1.0.0",
         "laminas/laminas-db": "^2.7",
         "laminas/laminas-http": "^2.5.4",
-        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+        "laminas/laminas-servicemanager": "^3.0.3",
         "laminas/laminas-validator": "^2.6",
         "mongodb/mongodb": "^1.0.1",
         "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
diff --git a/src/Validator/AbstractValidatorChainEM2.php b/src/Validator/AbstractValidatorChainEM2.php
deleted file mode 100644
index a8bf9dd0..00000000
--- a/src/Validator/AbstractValidatorChainEM2.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @see       https://github.com/laminas/laminas-session for the canonical source repository
- * @copyright https://github.com/laminas/laminas-session/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-session/blob/master/LICENSE.md New BSD License
- */
-
-namespace Laminas\Session\Validator;
-
-use Laminas\EventManager\EventManager;
-use Laminas\Session\Storage\StorageInterface;
-
-/**
- * Abstract validator chain for validating sessions (for use with laminas-eventmanager v2).
- */
-abstract class AbstractValidatorChainEM2 extends EventManager
-{
-    use ValidatorChainTrait;
-
-    /**
-     * Construct the validation chain
-     *
-     * Retrieves validators from session storage and attaches them.
-     *
-     * Duplicated in ValidatorChainEM3 to prevent trait collision with parent.
-     *
-     * @param StorageInterface $storage
-     */
-    public function __construct(StorageInterface $storage)
-    {
-        parent::__construct();
-
-        $this->storage = $storage;
-        $validators = $storage->getMetadata('_VALID');
-        if ($validators) {
-            foreach ($validators as $validator => $data) {
-                $this->attachValidator('session.validate', [new $validator($data), 'isValid'], 1);
-            }
-        }
-    }
-
-    /**
-     * Attach a listener to the session validator chain.
-     *
-     * @param string $event
-     * @param null|callable $callback
-     * @param int $priority
-     * @return \Laminas\Stdlib\CallbackHandler
-     */
-    public function attach($event, $callback = null, $priority = 1)
-    {
-        return $this->attachValidator($event, $callback, $priority);
-    }
-}
diff --git a/src/Validator/AbstractValidatorChainEM3.php b/src/Validator/AbstractValidatorChainEM3.php
deleted file mode 100644
index 85bfc5ba..00000000
--- a/src/Validator/AbstractValidatorChainEM3.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @see       https://github.com/laminas/laminas-session for the canonical source repository
- * @copyright https://github.com/laminas/laminas-session/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-session/blob/master/LICENSE.md New BSD License
- */
-
-namespace Laminas\Session\Validator;
-
-use Laminas\EventManager\EventManager;
-use Laminas\Session\Storage\StorageInterface;
-
-/**
- * Abstract validator chain for validating sessions (for use with laminas-eventmanager v3)
- */
-abstract class AbstractValidatorChainEM3 extends EventManager
-{
-    use ValidatorChainTrait;
-
-    /**
-     * Construct the validation chain
-     *
-     * Retrieves validators from session storage and attaches them.
-     *
-     * Duplicated in ValidatorChainEM2 to prevent trait collision with parent.
-     *
-     * @param StorageInterface $storage
-     */
-    public function __construct(StorageInterface $storage)
-    {
-        parent::__construct();
-
-        $this->storage = $storage;
-        $validators = $storage->getMetadata('_VALID');
-        if ($validators) {
-            foreach ($validators as $validator => $data) {
-                $this->attachValidator('session.validate', [new $validator($data), 'isValid'], 1);
-            }
-        }
-    }
-
-    /**
-     * Attach a listener to the session validator chain.
-     *
-     * @param string $eventName
-     * @param callable $callback
-     * @param int $priority
-     * @return \Laminas\Stdlib\CallbackHandler
-     */
-    public function attach($eventName, callable $callback, $priority = 1)
-    {
-        return $this->attachValidator($eventName, $callback, $priority);
-    }
-}
diff --git a/src/Validator/ValidatorChainTrait.php b/src/Validator/ValidatorChainTrait.php
deleted file mode 100644
index a8feb29e..00000000
--- a/src/Validator/ValidatorChainTrait.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @see       https://github.com/laminas/laminas-session for the canonical source repository
- * @copyright https://github.com/laminas/laminas-session/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-session/blob/master/LICENSE.md New BSD License
- */
-
-namespace Laminas\Session\Validator;
-
-use Laminas\Session\Storage\StorageInterface;
-
-/**
- * Base trait for validator chain implementations
- */
-trait ValidatorChainTrait
-{
-    /**
-     * @var StorageInterface
-     */
-    protected $storage;
-
-    /**
-     * Retrieve session storage object
-     *
-     * @return StorageInterface
-     */
-    public function getStorage()
-    {
-        return $this->storage;
-    }
-
-    /**
-     * Internal implementation for attaching a listener to the
-     * session validator chain.
-     *
-     * @param  string $event
-     * @param  callable $callback
-     * @param  int $priority
-     * @return \Laminas\Stdlib\CallbackHandler|callable
-     */
-    private function attachValidator($event, $callback, $priority)
-    {
-        $context = null;
-        if ($callback instanceof ValidatorInterface) {
-            $context = $callback;
-        } elseif (is_array($callback)) {
-            $test = array_shift($callback);
-            if ($test instanceof ValidatorInterface) {
-                $context = $test;
-            }
-            array_unshift($callback, $test);
-        }
-        if ($context instanceof ValidatorInterface) {
-            $data = $context->getData();
-            $name = $context->getName();
-            $this->getStorage()->setMetadata('_VALID', [$name => $data]);
-        }
-
-        $listener = parent::attach($event, $callback, $priority);
-        return $listener;
-    }
-}
diff --git a/src/ValidatorChain.php b/src/ValidatorChain.php
index 527724cb..00743924 100644
--- a/src/ValidatorChain.php
+++ b/src/ValidatorChain.php
@@ -8,35 +8,78 @@
 
 namespace Laminas\Session;
 
-use Laminas\EventManager\GlobalEventManager;
+use Laminas\EventManager\EventManager;
+use Laminas\Session\Storage\StorageInterface;
+use Laminas\Session\Validator\ValidatorInterface;
 
-/**
- * Polyfill for AbstractValidatorChain.
- *
- * The definitions for EventManagerInterface::attach differ between versions 2
- * and 3 of laminas-eventmanager, which makes it impossible to override the method
- * in a way that is compatible with both.
- *
- * To get around that, we define 2 abstract classes, one targeting each major
- * version of laminas-eventmanager, and each defining attach() per the EM version
- * they target.
- *
- * This conditional below then aliases the appropriate one to `AbstractValidatorChain`,
- * based on which version of the EM is present. Since the `GlobalEventManager`
- * is only present in v2, we can use that as our test.
- */
-if (class_exists(GlobalEventManager::class)) {
-    class_alias(Validator\AbstractValidatorChainEM2::class, AbstractValidatorChain::class);
-} else {
-    class_alias(Validator\AbstractValidatorChainEM3::class, AbstractValidatorChain::class);
-}
-
-/**
- * Validator chain implementation.
- *
- * Extends the laminas-eventmanager-version-specific base class implementation
- * as polyfilled above.
- */
-class ValidatorChain extends AbstractValidatorChain
+class ValidatorChain extends EventManager
 {
+    /** @var StorageInterface */
+    protected $storage;
+
+    public function __construct(StorageInterface $storage)
+    {
+        parent::__construct();
+
+        $this->storage = $storage;
+        $validators    = $storage->getMetadata('_VALID');
+        if ($validators) {
+            foreach ($validators as $validator => $data) {
+                $this->attachValidator('session.validate', [new $validator($data), 'isValid'], 1);
+            }
+        }
+    }
+
+    /**
+     * Attach a listener to the session validator chain.
+     *
+     * @param string   $eventName
+     * @param callable $callback
+     * @param int      $priority
+     * @return callable
+     */
+    public function attach($eventName, callable $callback, $priority = 1)
+    {
+        return $this->attachValidator($eventName, $callback, $priority);
+    }
+
+    /**
+     * Retrieve session storage object
+     *
+     * @return StorageInterface
+     */
+    public function getStorage()
+    {
+        return $this->storage;
+    }
+
+    /**
+     * Internal implementation for attaching a listener to the
+     * session validator chain.
+     *
+     * @param string   $event
+     * @param callable $callback
+     * @param int      $priority
+     * @return callable
+     */
+    private function attachValidator($event, $callback, $priority)
+    {
+        $context = null;
+        if ($callback instanceof ValidatorInterface) {
+            $context = $callback;
+        } elseif (is_array($callback)) {
+            $test = array_shift($callback);
+            if ($test instanceof ValidatorInterface) {
+                $context = $test;
+            }
+            array_unshift($callback, $test);
+        }
+        if ($context instanceof ValidatorInterface) {
+            $data = $context->getData();
+            $name = $context->getName();
+            $this->getStorage()->setMetadata('_VALID', [$name => $data]);
+        }
+
+        return parent::attach($event, $callback, $priority);
+    }
 }

From cc6e67aa5563e9824e0f388914edadf45d3a8822 Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Thu, 22 Oct 2020 23:11:51 +0200
Subject: [PATCH 12/18] qa: add a test for ValidatorChain

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/Validator/ValidatorChainTest.php | 80 +++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 test/Validator/ValidatorChainTest.php

diff --git a/test/Validator/ValidatorChainTest.php b/test/Validator/ValidatorChainTest.php
new file mode 100644
index 00000000..8d946a7e
--- /dev/null
+++ b/test/Validator/ValidatorChainTest.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Session\Validator;
+
+use Laminas\Session\Storage\ArrayStorage;
+use Laminas\Session\Validator\ValidatorInterface;
+use Laminas\Session\ValidatorChain;
+use LaminasTest\Session\TestAsset\TestFailingValidator;
+use PHPUnit\Framework\TestCase;
+
+use function assert;
+use function get_class;
+use function property_exists;
+
+class ValidatorChainTest extends TestCase
+{
+    /** @var ValidatorChain */
+    private $validatorChain;
+
+    protected function setUp(): void
+    {
+        $storage              = new ArrayStorage();
+        $this->validatorChain = new ValidatorChain($storage);
+    }
+
+    public function testGetStorage(): void
+    {
+        self::assertInstanceOf(ArrayStorage::class, $this->validatorChain->getStorage());
+    }
+
+    public function testAttachValidator(): void
+    {
+        $validator = new TestFailingValidator();
+
+        $this->validatorChain->attach('test', [$validator, 'isValid']);
+
+        $validatorMetadata = $this->validatorChain->getStorage()->getMetadata('_VALID');
+        self::assertIsArray($validatorMetadata);
+        self::assertArrayHasKey($validator->getName(), $validatorMetadata);
+        self::assertSame($validatorMetadata[$validator->getName()], $validator->getData());
+    }
+
+    public function testExistingValidatorsAreAttached(): void
+    {
+        $validator = $this->createValidatorSpy();
+        $storage   = new ArrayStorage();
+        $storage->setMetadata('_VALID', [get_class($validator) => $validator->getData()]);
+
+        $this->validatorChain = new ValidatorChain($storage);
+
+        $this->validatorChain->trigger('session.validate');
+        assert(property_exists($validator, 'isValidCallCount'));
+        self::assertSame(1, $validator::$isValidCallCount);
+    }
+
+    private function createValidatorSpy(): ValidatorInterface
+    {
+        return new class implements ValidatorInterface {
+            public static $isValidCallCount = 0;
+
+            public function isValid(): bool
+            {
+                self::$isValidCallCount++;
+                return $this->getData();
+            }
+
+            public function getData(): bool
+            {
+                return false;
+            }
+
+            public function getName(): string
+            {
+                return __CLASS__;
+            }
+        };
+    }
+}

From c0200b123be9804a695b2e4592a7840a7b4e019b Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Fri, 23 Oct 2020 09:21:13 +0200
Subject: [PATCH 13/18] qa: remove tests which require PHP < 7.1

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 test/Config/SessionConfigTest.php  | 300 +++--------------------------
 test/Config/StandardConfigTest.php | 219 +--------------------
 test/Validator/IdTest.php          |  19 --
 3 files changed, 38 insertions(+), 500 deletions(-)

diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php
index 9ddb9818..5a451806 100644
--- a/test/Config/SessionConfigTest.php
+++ b/test/Config/SessionConfigTest.php
@@ -10,7 +10,7 @@
 
 use Laminas\Session\Config\SessionConfig;
 use Laminas\Session\Exception;
-use Laminas\Session\SaveHandler\SaveHandlerInterface;
+use Laminas\Session\Exception\InvalidArgumentException;
 use LaminasTest\Session\TestAsset\TestSaveHandler;
 use phpmock\phpunit\PHPMock;
 use PHPUnit\Framework\TestCase;
@@ -41,19 +41,11 @@ protected function tearDown(): void
         $this->config = null;
     }
 
-    public function assertPhpLessThan71($message = 'This test requires a PHP version less than 7.1.0'): ?bool
-    {
-        if (PHP_VERSION_ID < 70100) {
-            return true;
-        }
-        self::markTestSkipped($message);
-    }
-
     // session.save_path
 
     public function testSetSavePathErrorsOnInvalidPath(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid save_path provided');
         $this->config->setSavePath(__DIR__ . '/foobarboguspath');
     }
@@ -143,7 +135,7 @@ public function testSaveHandlerDoesNotAlterIniSetting(): void
 
     public function testSettingInvalidSaveHandlerRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid save handler specified');
         $this->config->setPhpSaveHandler('foobar_bogus');
     }
@@ -169,21 +161,21 @@ public function testGcProbabilityAltersIniSetting(): void
 
     public function testSettingInvalidGcProbabilityRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid gc_probability; must be numeric');
         $this->config->setGcProbability('foobar_bogus');
     }
 
     public function testSettingInvalidGcProbabilityRaisesException2(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid gc_probability; must be a percentage');
         $this->config->setGcProbability(-1);
     }
 
     public function testSettingInvalidGcProbabilityRaisesException3(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid gc_probability; must be a percentage');
         $this->config->setGcProbability(101);
     }
@@ -209,14 +201,14 @@ public function testGcDivisorAltersIniSetting(): void
 
     public function testSettingInvalidGcDivisorRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid gc_divisor; must be numeric');
         $this->config->setGcDivisor('foobar_bogus');
     }
 
     public function testSettingInvalidGcDivisorRaisesException2(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid gc_divisor; must be a positive integer');
         $this->config->setGcDivisor(-1);
     }
@@ -242,14 +234,14 @@ public function testGcMaxlifetimeAltersIniSetting(): void
 
     public function testSettingInvalidGcMaxlifetimeRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid gc_maxlifetime; must be numeric');
         $this->config->setGcMaxlifetime('foobar_bogus');
     }
 
     public function testSettingInvalidGcMaxlifetimeRaisesException2(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid gc_maxlifetime; must be a positive integer');
         $this->config->setGcMaxlifetime(-1);
     }
@@ -277,7 +269,7 @@ public function testSerializeHandlerAltersIniSetting(): void
 
     public function testSettingInvalidSerializeHandlerRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid serialize handler specified');
         $this->config->setSerializeHandler('foobar_bogus');
     }
@@ -309,14 +301,14 @@ public function testCookieLifetimeCanBeZero(): void
 
     public function testSettingInvalidCookieLifetimeRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cookie_lifetime; must be numeric');
         $this->config->setCookieLifetime('foobar_bogus');
     }
 
     public function testSettingInvalidCookieLifetimeRaisesException2(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cookie_lifetime; must be a positive integer or zero');
         $this->config->setCookieLifetime(-1);
     }
@@ -342,21 +334,21 @@ public function testCookiePathAltersIniSetting(): void
 
     public function testSettingInvalidCookiePathRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cookie path');
         $this->config->setCookiePath(24);
     }
 
     public function testSettingInvalidCookiePathRaisesException2(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cookie path');
         $this->config->setCookiePath('foo');
     }
 
     public function testSettingInvalidCookiePathRaisesException3(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cookie path');
         $this->config->setCookiePath('D:\\WINDOWS\\System32\\drivers\\etc\\hosts');
     }
@@ -388,14 +380,14 @@ public function testCookieDomainAltersIniSetting(): void
 
     public function testSettingInvalidCookieDomainRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cookie domain: must be a string');
         $this->config->setCookieDomain(24);
     }
 
     public function testSettingInvalidCookieDomainRaisesException2(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('does not match the expected structure for a DNS hostname');
         $this->config->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts');
     }
@@ -509,48 +501,12 @@ public function testRefererCheckAltersIniSetting(): void
         self::assertEquals('BARBAZ', ini_get('session.referer_check'));
     }
 
-    // session.entropy_file
-
-    public function testSetEntropyFileErrorsOnInvalidPath(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid entropy_file provided');
-        $this->config->setEntropyFile(__DIR__ . '/foobarboguspath');
-    }
-
-    public function testEntropyFileDefaultsToIniSettings(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
-        self::assertSame(ini_get('session.entropy_file'), $this->config->getEntropyFile());
-    }
-
-    public function testEntropyFileIsMutable(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
-        $this->config->setEntropyFile(__FILE__);
-        self::assertEquals(__FILE__, $this->config->getEntropyFile());
-    }
-
-    public function testEntropyFileAltersIniSetting(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_file directive removed in PHP 7.1');
-        $this->config->setEntropyFile(__FILE__);
-        self::assertEquals(__FILE__, ini_get('session.entropy_file'));
-    }
-
-    /**
-     * @requires PHP 7.1
-     */
     public function testSetEntropyFileError(): void
     {
         $this->expectDeprecation();
         $this->config->getEntropyFile();
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetEntropyFileError(): void
     {
         $this->expectDeprecation();
@@ -559,61 +515,12 @@ public function testGetEntropyFileError(): void
 
     // session.entropy_length
 
-    public function testEntropyLengthDefaultsToIniSettings(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
-        self::assertSame(ini_get('session.entropy_length'), $this->config->getEntropyLength());
-    }
-
-    public function testEntropyLengthIsMutable(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
-        $this->config->setEntropyLength(20);
-        self::assertEquals(20, $this->config->getEntropyLength());
-    }
-
-    public function testEntropyLengthAltersIniSetting(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
-        $this->config->setEntropyLength(24);
-        self::assertEquals(24, ini_get('session.entropy_length'));
-    }
-
-    public function testEntropyLengthCanBeZero(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
-        $this->config->setEntropyLength(0);
-        self::assertEquals(0, ini_get('session.entropy_length'));
-    }
-
-    public function testSettingInvalidEntropyLengthRaisesException(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid entropy_length; must be numeric');
-        $this->config->setEntropyLength('foobar_bogus');
-    }
-
-    public function testSettingInvalidEntropyLengthRaisesException2(): void
-    {
-        $this->assertPhpLessThan71('session.entropy_length directive removed in PHP 7.1');
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid entropy_length; must be a positive integer or zero');
-        $this->config->setEntropyLength(-1);
-    }
-
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetEntropyLengthError(): void
     {
         $this->expectDeprecation();
         $this->config->getEntropyLength();
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSetEntropyLengthError(): void
     {
         $this->expectDeprecation();
@@ -658,7 +565,7 @@ public function testCacheLimiterAltersIniSetting($cacheLimiter): void
 
     public function testSettingInvalidCacheLimiterRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cache limiter provided');
         $this->config->setCacheLimiter('foobar_bogus');
     }
@@ -684,14 +591,14 @@ public function testCacheExpireAltersIniSetting(): void
 
     public function testSettingInvalidCacheExpireRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cache_expire; must be numeric');
         $this->config->setCacheExpire('foobar_bogus');
     }
 
     public function testSettingInvalidCacheExpireRaisesException2(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid cache_expire; must be a positive integer');
         $this->config->setCacheExpire(-1);
     }
@@ -729,52 +636,12 @@ public function hashFunctions(): array
         return $provider;
     }
 
-    public function testHashFunctionDefaultsToIniSettings(): void
-    {
-        $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
-        self::assertSame(ini_get('session.hash_function'), $this->config->getHashFunction());
-    }
-
-    /**
-     * @dataProvider hashFunctions
-     */
-    public function testHashFunctionIsMutable($hashFunction): void
-    {
-        $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
-        $this->config->setHashFunction($hashFunction);
-        self::assertEquals($hashFunction, $this->config->getHashFunction());
-    }
-
-    /**
-     * @dataProvider hashFunctions
-     */
-    public function testHashFunctionAltersIniSetting($hashFunction): void
-    {
-        $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
-        $this->config->setHashFunction($hashFunction);
-        self::assertEquals($hashFunction, ini_get('session.hash_function'));
-    }
-
-    public function testSettingInvalidHashFunctionRaisesException(): void
-    {
-        $this->assertPhpLessThan71('session.hash_function directive removed in PHP 7.1');
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid hash function provided');
-        $this->config->setHashFunction('foobar_bogus');
-    }
-
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetHashFunctionError(): void
     {
         $this->expectDeprecation();
         $this->config->getHashFunction();
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSetHashFunctionError(): void
     {
         $this->expectDeprecation();
@@ -792,55 +659,12 @@ public function hashBitsPerCharacters(): array
         ];
     }
 
-    public function testHashBitsPerCharacterDefaultsToIniSettings(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
-        }
-
-        self::assertSame(ini_get('session.hash_bits_per_character'), $this->config->getHashBitsPerCharacter());
-    }
-
-    /**
-     * @dataProvider hashBitsPerCharacters
-     */
-    public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter): void
-    {
-        $this->assertPhpLessThan71('session.hash_bits_per_character directive removed in PHP 7.1');
-        $this->config->setHashBitsPerCharacter($hashBitsPerCharacter);
-        self::assertEquals($hashBitsPerCharacter, $this->config->getHashBitsPerCharacter());
-    }
-
-    /**
-     * @dataProvider hashBitsPerCharacters
-     */
-    public function testHashBitsPerCharacterAltersIniSetting($hashBitsPerCharacter): void
-    {
-        $this->assertPhpLessThan71('session.hash_bits_per_character directive removed in PHP 7.1');
-        $this->config->setHashBitsPerCharacter($hashBitsPerCharacter);
-        self::assertEquals($hashBitsPerCharacter, ini_get('session.hash_bits_per_character'));
-    }
-
-    public function testSettingInvalidHashBitsPerCharacterRaisesException(): void
-    {
-        $this->assertPhpLessThan71('session.hash_bits_per_character directive removed in PHP 7.1');
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid hash bits per character provided');
-        $this->config->setHashBitsPerCharacter('foobar_bogus');
-    }
-
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetHashBitsPerCharacterError(): void
     {
         $this->expectDeprecation();
         $this->config->getHashBitsPerCharacter();
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSetHashBitsPerCharacterError(): void
     {
         $this->expectDeprecation();
@@ -849,48 +673,33 @@ public function testSetHashBitsPerCharacterError(): void
 
     // session.sid_length
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSidLengthDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.sid_length'), $this->config->getSidLength());
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSidLengthIsMutable(): void
     {
         $this->config->setSidLength(40);
         self::assertEquals(40, $this->config->getSidLength());
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSidLengthAltersIniSetting(): void
     {
         $this->config->setSidLength(40);
         self::assertEquals(40, ini_get('session.sid_length'));
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSettingInvalidSidLengthRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid length provided');
         $this->config->setSidLength('foobar_bogus');
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSettingOutOfRangeSidLengthRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid length provided');
         $this->config->setSidLength(999);
     }
@@ -906,16 +715,12 @@ public function sidSidPerCharacters(): array
         ];
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSidBitsPerCharacterDefaultsToIniSettings(): void
     {
         self::assertSame(ini_get('session.sid_bits_per_character'), $this->config->getSidBitsPerCharacter());
     }
 
     /**
-     * @requires PHP 7.1
      * @dataProvider sidSidPerCharacters
      */
     public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter): void
@@ -925,7 +730,6 @@ public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter): void
     }
 
     /**
-     * @requires PHP 7.1
      * @dataProvider sidSidPerCharacters
      */
     public function testSidBitsPerCharacterAltersIniSetting($sidBitsPerCharacter): void
@@ -934,22 +738,16 @@ public function testSidBitsPerCharacterAltersIniSetting($sidBitsPerCharacter): v
         self::assertEquals($sidBitsPerCharacter, ini_get('session.sid_bits_per_character'));
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSettingInvalidSidBitsPerCharacterRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid sid bits per character provided');
         $this->config->setSidBitsPerCharacter('foobar_bogus');
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSettingOutOfBoundSidBitsPerCharacterRaisesException(): void
     {
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid sid bits per character provided');
         $this->config->setSidBitsPerCharacter(999);
     }
@@ -994,7 +792,7 @@ public function testRememberMeSecondsIsMutable(): void
     public function testSetOptionSetsIniSetting($option, $getter, $value): void
     {
         // Leaving out special cases.
-        if ($option == 'remember_me_seconds' || $option == 'url_rewriter_tags') {
+        if ($option === 'remember_me_seconds' || $option === 'url_rewriter_tags') {
             self::markTestSkipped('remember_me_seconds && url_rewriter_tags');
         }
 
@@ -1032,7 +830,7 @@ public function testSetOptionsTranslatesUnderscoreSeparatedKeys($option, $getter
     {
         $options = [$option => $value];
         $this->config->setOptions($options);
-        if ('getOption' == $getter) {
+        if ('getOption' === $getter) {
             self::assertSame($value, $this->config->getOption($option));
         } else {
             self::assertSame($value, $this->config->$getter());
@@ -1137,51 +935,17 @@ public function optionsProvider(): array
                 'getUrlRewriterTags',
                 'a=href',
             ],
-        ];
-
-        // These options are no longer present as of PHP 7.1.0
-        if (PHP_VERSION_ID < 70100) {
-            $commonOptions[] = [
-                'entropy_file',
-                'getEntropyFile',
-                __FILE__,
-            ];
-
-            $commonOptions[] = [
-                'entropy_length',
-                'getEntropyLength',
-                42,
-            ];
-
-            // The docs do not say this was removed for 7.1.0, but tests fail
-            // on 7.1.0 due to this one.
-            $commonOptions[] = [
-                'hash_function',
-                'getHashFunction',
-                'md5',
-            ];
-
-            $commonOptions[] = [
-                'hash_bits_per_character',
-                'getOption',
-                5,
-            ];
-        }
-
-        // New options as of PHP 7.1.0
-        if (PHP_VERSION_ID >= 70100) {
-            $commonOptions[] = [
+            [
                 'sid_length',
                 'getSidLength',
                 40,
-            ];
-
-            $commonOptions[] = [
+            ],
+            [
                 'sid_bits_per_character',
                 'getSidBitsPerCharacter',
                 5,
-            ];
-        }
+            ],
+        ];
 
         return $commonOptions;
     }
diff --git a/test/Config/StandardConfigTest.php b/test/Config/StandardConfigTest.php
index b7f7cf4f..872d8ebc 100644
--- a/test/Config/StandardConfigTest.php
+++ b/test/Config/StandardConfigTest.php
@@ -40,6 +40,7 @@ public function testSavePathIsMutable(): void
         $this->config->setSavePath(__DIR__);
         self::assertEquals(__DIR__, $this->config->getSavePath());
     }
+
     // session.name
 
     public function testNameIsMutable(): void
@@ -275,103 +276,24 @@ public function testRefererCheckMayBeEmpty(): void
         self::assertEquals('', $this->config->getRefererCheck());
     }
 
-    // session.entropy_file
-
-    public function testSetEntropyFileErrorsOnInvalidPath(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
-        }
-
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid entropy_file provided');
-        $this->config->setEntropyFile(__DIR__ . '/foobarboguspath');
-    }
-
-    public function testEntropyFileIsMutable(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
-        }
-
-        $this->config->setEntropyFile(__FILE__);
-        self::assertEquals(__FILE__, $this->config->getEntropyFile());
-    }
-
-    /**
-     * @requires PHP 7.1
-     */
     public function testSetEntropyFileError(): void
     {
         $this->expectDeprecation();
         $this->config->getEntropyFile();
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetEntropyFileError(): void
     {
         $this->expectDeprecation();
         $this->config->setEntropyFile(__FILE__);
     }
 
-    // session.entropy_length
-
-    public function testEntropyLengthIsMutable(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
-        }
-
-        $this->config->setEntropyLength(20);
-        self::assertEquals(20, $this->config->getEntropyLength());
-    }
-
-    public function testEntropyLengthCanBeZero(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
-        }
-
-        $this->config->setEntropyLength(0);
-        self::assertEquals(0, $this->config->getEntropyLength());
-    }
-
-    public function testSettingInvalidEntropyLengthRaisesException(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
-        }
-
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid entropy_length; must be numeric');
-        $this->config->setEntropyLength('foobar_bogus');
-    }
-
-    public function testSettingInvalidEntropyLengthRaisesException2(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.entropy_length directive removed in PHP 7.1');
-        }
-
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid entropy_length; must be a positive integer or zero');
-        $this->config->setEntropyLength(-1);
-    }
-
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetEntropyLengthError(): void
     {
         $this->expectDeprecation();
         $this->config->getEntropyLength();
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSetEntropyLengthError(): void
     {
         $this->expectDeprecation();
@@ -429,96 +351,24 @@ public function testUseTransSidIsMutable(): void
         self::assertEquals(true, (bool)$this->config->getUseTransSid());
     }
 
-    // session.hash_function
-
-    public function hashFunctions(): array
-    {
-        $hashFunctions = array_merge([0, 1], hash_algos());
-        $provider      = [];
-        foreach ($hashFunctions as $function) {
-            $provider[] = [$function];
-        }
-        return $provider;
-    }
-
-    /**
-     * @dataProvider hashFunctions
-     */
-    public function testHashFunctionIsMutable($hashFunction): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.hash_function directive removed in PHP 7.1');
-        }
-
-        $this->config->setHashFunction($hashFunction);
-        self::assertEquals($hashFunction, $this->config->getHashFunction());
-    }
-
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetHashFunctionError(): void
     {
         $this->expectDeprecation();
         $this->config->getHashFunction();
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSetHashFunctionError(): void
     {
         $this->expectDeprecation();
         $this->config->setHashFunction('foobar_bogus');
     }
 
-    // session.hash_bits_per_character
-
-    public function hashBitsPerCharacters(): array
-    {
-        return [
-            [4],
-            [5],
-            [6],
-        ];
-    }
-
-    /**
-     * @dataProvider hashBitsPerCharacters
-     */
-    public function testHashBitsPerCharacterIsMutable($hashBitsPerCharacter): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
-        }
-
-        $this->config->setHashBitsPerCharacter($hashBitsPerCharacter);
-        self::assertEquals($hashBitsPerCharacter, $this->config->getHashBitsPerCharacter());
-    }
-
-    public function testSettingInvalidHashBitsPerCharacterRaisesException(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.hash_bits_per_character directive removed in PHP 7.1');
-        }
-
-        $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid hash bits per character provided');
-        $this->config->setHashBitsPerCharacter('foobar_bogus');
-    }
-
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetHashBitsPerCharacterError(): void
     {
         $this->expectDeprecation();
         $this->config->getHashBitsPerCharacter();
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSetHashBitsPerCharacterError(): void
     {
         $this->expectDeprecation();
@@ -527,18 +377,12 @@ public function testSetHashBitsPerCharacterError(): void
 
     // session.sid_length
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSidLengthIsMutable(): void
     {
         $this->config->setSidLength(40);
         self::assertEquals(40, $this->config->getSidLength());
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSettingInvalidSidLengthRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -546,9 +390,6 @@ public function testSettingInvalidSidLengthRaisesException(): void
         $this->config->setSidLength('foobar_bogus');
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSettingOutOfRangeSidLengthRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -568,7 +409,6 @@ public function sidBitsPerCharacters(): array
     }
 
     /**
-     * @requires PHP 7.1
      * @dataProvider sidBitsPerCharacters
      */
     public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter): void
@@ -577,9 +417,6 @@ public function testSidBitsPerCharacterIsMutable($sidBitsPerCharacter): void
         self::assertEquals($sidBitsPerCharacter, $this->config->getSidBitsPerCharacter());
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testSettingInvalidSidBitsPerCharacterRaisesException(): void
     {
         $this->expectException('Laminas\Session\Exception\InvalidArgumentException');
@@ -727,62 +564,18 @@ public function optionsProvider(): array
                 'getUrlRewriterTags',
                 'a=href',
             ],
-        ];
-
-        if (PHP_VERSION_ID < 70100) {
-            $commonOptions[] = [
-                'entropy_file',
-                'getEntropyFile',
-                __FILE__,
-            ];
-            $commonOptions[] = [
-                'entropy_length',
-                'getEntropyLength',
-                42,
-            ];
-            $commonOptions[] = [
-                'hash_function',
-                'getHashFunction',
-                'md5',
-            ];
-            $commonOptions[] = [
-                'hash_bits_per_character',
-                'getHashBitsPerCharacter',
-                5,
-            ];
-        } else {
-            $commonOptions[] = [
+            [
                 'sid_length',
                 'getSidLength',
                 40,
-            ];
-            $commonOptions[] = [
+            ],
+            [
                 'sid_bits_per_character',
                 'getSidBitsPerCharacter',
                 5,
-            ];
-        }
+            ],
+        ];
 
         return $commonOptions;
     }
-
-    /**
-     * Set entropy file /dev/urandom, see issue #3046
-     *
-     * @link https://github.com/zendframework/zf2/issues/3046
-     */
-    public function testSetEntropyDevUrandom(): void
-    {
-        if (PHP_VERSION_ID >= 70100) {
-            self::markTestSkipped('session.entropy_file directive removed in PHP 7.1');
-        }
-
-        if (! file_exists('/dev/urandom')) {
-            self::markTestSkipped(
-                "This test doesn't work because /dev/urandom file doesn't exist."
-            );
-        }
-        $result = $this->config->setEntropyFile('/dev/urandom');
-        self::assertInstanceOf('Laminas\Session\Config\StandardConfig', $result);
-    }
 }
diff --git a/test/Validator/IdTest.php b/test/Validator/IdTest.php
index 3625d6be..8f13b7ad 100644
--- a/test/Validator/IdTest.php
+++ b/test/Validator/IdTest.php
@@ -32,7 +32,6 @@ public function id(): ?Generator
     }
 
     /**
-     * @requires PHP 7.1
      * @runInSeparateProcess
      *
      * @dataProvider id
@@ -49,24 +48,6 @@ public function testIsValidPhp71($bitsPerCharacter, $id, $isValid): void
         self::assertSame($isValid, $validator->isValid());
     }
 
-    /**
-     * @requires PHP < 7.1
-     * @runInSeparateProcess
-     *
-     * @dataProvider id
-     *
-     * @param int    $bitsPerCharacter
-     * @param string $id
-     * @param bool   $isValid
-     */
-    public function testIsValidPhpPriorTo71($bitsPerCharacter, $id, $isValid): void
-    {
-        ini_set('session.hash_bits_per_character', $bitsPerCharacter);
-
-        $validator = new Id($id);
-        self::assertSame($isValid, $validator->isValid());
-    }
-
     public function testConstructorSetId(): void
     {
         $id = new Id('1234');

From e87c20d12d907f1293df47dc36e7eece3b596b1a Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Sat, 31 Oct 2020 14:46:19 +0100
Subject: [PATCH 14/18] deprecate methods which operate on session settings
 which were removed in PHP 7.1

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 src/Config/SessionConfig.php  | 2 ++
 src/Config/StandardConfig.php | 8 ++++++++
 src/Validator/Id.php          | 7 ++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Config/SessionConfig.php b/src/Config/SessionConfig.php
index ce006cb7..7e70efaf 100644
--- a/src/Config/SessionConfig.php
+++ b/src/Config/SessionConfig.php
@@ -284,6 +284,7 @@ public function setCacheLimiter($cacheLimiter)
      * @param  string|int $hashFunction
      * @return SessionConfig
      * @throws Exception\InvalidArgumentException
+     * @deprecated removed in PHP 7.1
      */
     public function setHashFunction($hashFunction)
     {
@@ -308,6 +309,7 @@ public function setHashFunction($hashFunction)
      * @param  int $hashBitsPerCharacter
      * @return SessionConfig
      * @throws Exception\InvalidArgumentException
+     * @deprecated removed in PHP 7.1
      */
     public function setHashBitsPerCharacter($hashBitsPerCharacter)
     {
diff --git a/src/Config/StandardConfig.php b/src/Config/StandardConfig.php
index ae4a63af..36d08f82 100644
--- a/src/Config/StandardConfig.php
+++ b/src/Config/StandardConfig.php
@@ -582,6 +582,7 @@ public function getUseCookies()
      * @param  string $entropyFile
      * @return StandardConfig
      * @throws Exception\InvalidArgumentException
+     * @deprecated removed in PHP 7.1
      */
     public function setEntropyFile($entropyFile)
     {
@@ -605,6 +606,7 @@ public function setEntropyFile($entropyFile)
      * Get session.entropy_file
      *
      * @return string
+     * @deprecated removed in PHP 7.1
      */
     public function getEntropyFile()
     {
@@ -625,6 +627,7 @@ public function getEntropyFile()
      * @param  int $entropyLength
      * @return StandardConfig
      * @throws Exception\InvalidArgumentException
+     * @deprecated removed in PHP 7.1
      */
     public function setEntropyLength($entropyLength)
     {
@@ -648,6 +651,7 @@ public function setEntropyLength($entropyLength)
      * Get session.entropy_length
      *
      * @return string
+     * @deprecated removed in PHP 7.1
      */
     public function getEntropyLength()
     {
@@ -704,6 +708,7 @@ public function getCacheExpire()
      *
      * @param  string $hashFunction
      * @return mixed
+     * @deprecated removed in PHP 7.1
      */
     public function setHashFunction($hashFunction)
     {
@@ -718,6 +723,7 @@ public function setHashFunction($hashFunction)
      * Get session.hash_function
      *
      * @return string
+     * @deprecated removed in PHP 7.1
      */
     public function getHashFunction()
     {
@@ -734,6 +740,7 @@ public function getHashFunction()
      * @param  int $hashBitsPerCharacter
      * @return StandardConfig
      * @throws Exception\InvalidArgumentException
+     * @deprecated removed in PHP 7.1
      */
     public function setHashBitsPerCharacter($hashBitsPerCharacter)
     {
@@ -754,6 +761,7 @@ public function setHashBitsPerCharacter($hashBitsPerCharacter)
      * Get session.hash_bits_per_character
      *
      * @return string
+     * @deprecated removed in PHP 7.1
      */
     public function getHashBitsPerCharacter()
     {
diff --git a/src/Validator/Id.php b/src/Validator/Id.php
index 771143fe..98cfb515 100644
--- a/src/Validator/Id.php
+++ b/src/Validator/Id.php
@@ -48,7 +48,7 @@ public function isValid()
     {
         $id = $this->id;
         $saveHandler = ini_get('session.save_handler');
-        if ($saveHandler == 'cluster') { // Zend Server SC, validate only after last dash
+        if ($saveHandler === 'cluster') { // Zend Server SC, validate only after last dash
             $dashPos = strrpos($id, '-');
             if ($dashPos) {
                 $id = substr($id, $dashPos + 1);
@@ -56,10 +56,7 @@ public function isValid()
         }
 
         // Get the session id bits per character INI setting, using 5 if unavailable
-        $bitsPerCharacter = PHP_VERSION_ID >= 70100
-            ? 'session.sid_bits_per_character'
-            : 'session.hash_bits_per_character';
-        $hashBitsPerChar = ini_get($bitsPerCharacter) ?: 5;
+        $hashBitsPerChar = ini_get('session.sid_bits_per_character') ?: 5;
 
         switch ($hashBitsPerChar) {
             case 4:

From fa7461bc14b5307a623c69f70c05411eaac309ae Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Sat, 31 Oct 2020 15:35:20 +0100
Subject: [PATCH 15/18] feat: don't delete unneeded classes just yet, just
 deprecate them

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 phpunit.xml.dist                            |  1 -
 src/Validator/AbstractValidatorChainEM3.php | 57 ++++++++++++++++++
 src/Validator/ValidatorChainTrait.php       | 65 +++++++++++++++++++++
 3 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 src/Validator/AbstractValidatorChainEM3.php
 create mode 100644 src/Validator/ValidatorChainTrait.php

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7c0f0982..b468d5a0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -21,7 +21,6 @@
         </include>
         <exclude>
             <file>src/compatibility/autoload.php</file>
-            <file>src/Validator/AbstractValidatorChainEM2.php</file>
         </exclude>
     </coverage>
 
diff --git a/src/Validator/AbstractValidatorChainEM3.php b/src/Validator/AbstractValidatorChainEM3.php
new file mode 100644
index 00000000..273c2fea
--- /dev/null
+++ b/src/Validator/AbstractValidatorChainEM3.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-session for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-session/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-session/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Session\Validator;
+
+use Laminas\EventManager\EventManager;
+use Laminas\Session\Storage\StorageInterface;
+
+/**
+ * Abstract validator chain for validating sessions (for use with laminas-eventmanager v3)
+ *
+ * @deprecated Use {@see \Laminas\Session\ValidatorChain} directly
+ */
+abstract class AbstractValidatorChainEM3 extends EventManager
+{
+    use ValidatorChainTrait;
+
+    /**
+     * Construct the validation chain
+     *
+     * Retrieves validators from session storage and attaches them.
+     *
+     * Duplicated in ValidatorChainEM2 to prevent trait collision with parent.
+     *
+     * @param StorageInterface $storage
+     */
+    public function __construct(StorageInterface $storage)
+    {
+        parent::__construct();
+
+        $this->storage = $storage;
+        $validators = $storage->getMetadata('_VALID');
+        if ($validators) {
+            foreach ($validators as $validator => $data) {
+                $this->attachValidator('session.validate', [new $validator($data), 'isValid'], 1);
+            }
+        }
+    }
+
+    /**
+     * Attach a listener to the session validator chain.
+     *
+     * @param string $eventName
+     * @param callable $callback
+     * @param int $priority
+     * @return \Laminas\Stdlib\CallbackHandler
+     */
+    public function attach($eventName, callable $callback, $priority = 1)
+    {
+        return $this->attachValidator($eventName, $callback, $priority);
+    }
+}
diff --git a/src/Validator/ValidatorChainTrait.php b/src/Validator/ValidatorChainTrait.php
new file mode 100644
index 00000000..2bd2c226
--- /dev/null
+++ b/src/Validator/ValidatorChainTrait.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @see       https://github.com/laminas/laminas-session for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-session/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-session/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Session\Validator;
+
+use Laminas\Session\Storage\StorageInterface;
+
+/**
+ * Base trait for validator chain implementations
+ *
+ * @deprecated Use {@see \Laminas\Session\ValidatorChain} directly
+ */
+trait ValidatorChainTrait
+{
+    /**
+     * @var StorageInterface
+     */
+    protected $storage;
+
+    /**
+     * Retrieve session storage object
+     *
+     * @return StorageInterface
+     */
+    public function getStorage()
+    {
+        return $this->storage;
+    }
+
+    /**
+     * Internal implementation for attaching a listener to the
+     * session validator chain.
+     *
+     * @param  string $event
+     * @param  callable $callback
+     * @param  int $priority
+     * @return \Laminas\Stdlib\CallbackHandler|callable
+     */
+    private function attachValidator($event, $callback, $priority)
+    {
+        $context = null;
+        if ($callback instanceof ValidatorInterface) {
+            $context = $callback;
+        } elseif (is_array($callback)) {
+            $test = array_shift($callback);
+            if ($test instanceof ValidatorInterface) {
+                $context = $test;
+            }
+            array_unshift($callback, $test);
+        }
+        if ($context instanceof ValidatorInterface) {
+            $data = $context->getData();
+            $name = $context->getName();
+            $this->getStorage()->setMetadata('_VALID', [$name => $data]);
+        }
+
+        $listener = parent::attach($event, $callback, $priority);
+        return $listener;
+    }
+}

From a0319f928e33281fe7102eae84db6f7340ceeb1a Mon Sep 17 00:00:00 2001
From: Thomas Rieschl <thomas@trinet.at>
Date: Sat, 31 Oct 2020 15:48:25 +0100
Subject: [PATCH 16/18] add a dummy AbstractValidatorChain class to keep bc

Signed-off-by: Thomas Rieschl <thomas@trinet.at>
---
 src/AbstractValidatorChain.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/AbstractValidatorChain.php

diff --git a/src/AbstractValidatorChain.php b/src/AbstractValidatorChain.php
new file mode 100644
index 00000000..ae74a5b1
--- /dev/null
+++ b/src/AbstractValidatorChain.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Laminas\Session;
+
+use Laminas\Session\Validator\AbstractValidatorChainEM3;
+
+/**
+ * Dummy class to keep backwards compatibility
+ *
+ * @deprecated Use {@see \Laminas\Session\ValidatorChain} directly
+ */
+abstract class AbstractValidatorChain extends AbstractValidatorChainEM3
+{
+}

From 14af97c1ac4f9e5bf1bc3151c8da9254001e3cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Sat, 31 Oct 2020 16:16:35 +0100
Subject: [PATCH 17/18] Add `CHANGELOG` entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
---
 CHANGELOG.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5eb5983b..a999b598 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#35](https://github.com/laminas/laminas-session/pull/35) Adds PHP 8.0 support
 
 ### Changed
 
@@ -14,11 +14,23 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Deprecated
 
-- Nothing.
+- [#35](https://github.com/laminas/laminas-session/pull/35) Marks some methods in `StandardConfig` and `SessionConfig` as deprecated as the functionality behind these methods was dropped in PHP 7.1
+  - `StandardConfig::setEntropyFile`
+  - `StandardConfig::getEntropyFile`
+  - `StandardConfig::setEntropyLength`
+  - `StandardConfig::getEntropyLength`
+  - `StandardConfig::setHashFunction`
+  - `StandardConfig::getHashFunction`
+  - `StandardConfig::setHashBitsPerCharacter`
+  - `StandardConfig::getHashBitsPerCharacter`
+  - `SessionConfig::setHashFunction`
+  - `SessionConfig::setHashBitsPerCharacter`
+
+- [#35](https://github.com/laminas/laminas-session/pull/35) Marks the `AbstractValidatorChain`, `ValidatorChainTrait` and `AbstractValidatorChainEM3` as deprecated as they can be replaced by using the `ValidatorChain` instead.
 
 ### Removed
 
-- Nothing.
+- [#35](https://github.com/laminas/laminas-session/pull/35) Removed compatibility with laminas-eventmanager v2
 
 ### Fixed
 

From f633855d63096ef7f86448e5f3da9af3bd36af20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Sat, 31 Oct 2020 16:23:24 +0100
Subject: [PATCH 18/18] Add `lowest` dependencies for PHP 7.4 and 8.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index eeebd758..a3e3ef11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,9 +27,17 @@ matrix:
     - php: 7.3
       env:
         - DEPS=lowest
+    - php: 7.4
+      env:
+        - DEPS=lowest
     - php: 7.4
       env:
         - DEPS=latest
+    - php: nightly
+      env:
+        - DEPS=lowest
+        - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+        - SKIP_MONGODB=true # ext-mongodb does not build on php8 yet (https://github.com/mongodb/mongo-php-driver/issues/1161)
     - php: nightly
       env:
         - DEPS=latest