qa: bump laminas/laminas-cache-storage-adapter-test along with phpunit

Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>

.gitignore

@@ -1,5 +1,4 @@
 /.phpunit.result.cache
-/composer.lock
 /docs/html/
 /laminas-mkdoc-theme.tgz
 /laminas-mkdoc-theme/

composer.json

@@ -17,9 +17,10 @@
     },
     "require-dev": {
         "laminas/laminas-cache": "^2.10",
-        "laminas/laminas-cache-storage-adapter-test": "^1.0.2",
+        "laminas/laminas-cache-storage-adapter-test": "^1.1.1",
         "laminas/laminas-coding-standard": "~1.0.0",
         "laminas/laminas-serializer": "^2.10",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^2.7"
     },
     "config": {

phpunit.xml.dist

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true">
-    <testsuites>
-        <testsuite name="Laminas cache-storage-adapter-filesystem Tests">
-            <directory>./test</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Laminas cache-storage-adapter-filesystem Tests">
+      <directory>./test</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

test/integration/Psr/CacheItemPool/FilesystemIntegrationTest.php

@@ -15,11 +15,9 @@
 
 class FilesystemIntegrationTest extends TestCase
 {
-    /**
-     * @expectedException \Laminas\Cache\Psr\CacheItemPool\CacheException
-     */
     public function testAdapterNotSupported()
     {
+        $this->expectException(\Laminas\Cache\Psr\CacheItemPool\CacheException::class);
         $storage = StorageFactory::adapterFactory('filesystem');
         $storage->addPlugin(new Serializer());
         new CacheItemPoolDecorator($storage);

test/integration/Psr/SimpleCache/FilesystemIntegrationTest.php

@@ -23,7 +23,7 @@ class FilesystemIntegrationTest extends SimpleCacheTest
     /** @var int */
     protected $umask;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->umask = umask();
 
@@ -47,16 +47,18 @@ public function setUp()
 
         $ttlMessage = 'Filesystem adapter does not honor TTL';
         $keyMessage = 'Filesystem adapter supports a subset of PSR-16 characters for keys';
+        $keyLengthMessage = 'Filesystem adapter supports only 64 characters for a cache key';
 
         $this->skippedTests['testSetTtl'] = $ttlMessage;
         $this->skippedTests['testSetMultipleTtl'] = $ttlMessage;
         $this->skippedTests['testSetValidKeys'] = $keyMessage;
         $this->skippedTests['testSetMultipleValidKeys'] = $keyMessage;
+        $this->skippedTests['testBasicUsageWithLongKey'] = $keyLengthMessage;
 
         parent::setUp();
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         $this->removeRecursive($this->tmpCacheDir);