.laminas-ci.json

@@ -1,12 +1,10 @@
 {
-    "ignore_php_platform_requirements": {
-        "8.2": true
-    },
     "extensions": [
         "apcu"
     ],
     "ini": [
         "apc.enabled=1",
         "apc.enable_cli=1"
-    ]
+    ],
+    "backwardCompatibilityCheck": true
 }

.laminas-ci/pre-install.sh

@@ -2,8 +2,7 @@
 
 WORKING_DIRECTORY=$2
 JOB=$3
-PHP_VERSION=$(echo "${JOB}" | jq -r '.php')
-
+PHP_VERSION=$(php -nr "echo PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION;")
 
 if [ ! -z "$GITHUB_BASE_REF" ] && [[ "$GITHUB_BASE_REF" =~ ^[0-9]+\.[0-9] ]]; then
   readarray -td. TARGET_BRANCH_VERSION_PARTS <<<"${GITHUB_BASE_REF}.";

composer.json

@@ -21,7 +21,7 @@
         "process-timeout": 600,
         "sort-packages": true,
         "platform": {
-            "php": "8.0.99"
+            "php": "8.1.99"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
@@ -34,14 +34,14 @@
         }
     },
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0",
         "laminas/laminas-cache-storage-implementation": "1.0",
         "laminas/laminas-eventmanager": "^3.4",
-        "laminas/laminas-servicemanager": "^3.18.0",
+        "laminas/laminas-servicemanager": "^3.21",
         "laminas/laminas-stdlib": "^3.6",
         "psr/cache": "^1.0",
         "psr/simple-cache": "^1.0",
-        "stella-maris/clock": "^0.1.5",
+        "psr/clock": "^1.0",
         "webmozart/assert": "^1.9"
     },
     "require-dev": {
@@ -61,7 +61,8 @@
         "vimeo/psalm": "^5.4"
     },
     "conflict": {
-        "symfony/console": "<5.1"
+        "symfony/console": "<5.1",
+        "stella-maris/clock": "<0.1.7"
     },
     "provide": {
         "psr/cache-implementation": "1.0",

psalm.xml

@@ -7,6 +7,8 @@
         xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
         errorBaseline="psalm-baseline.xml"
         findUnusedPsalmSuppress="true"
+        findUnusedBaselineEntry="true"
+        findUnusedCode="true"
 >
     <projectFiles>
         <directory name="src"/>

src/ConfigProvider.php

@@ -16,6 +16,8 @@
 
 class ConfigProvider
 {
+    public const ADAPTER_PLUGIN_MANAGER_CONFIGURATION_KEY = 'storage_adapters';
+
     /**
      * Return default configuration for laminas-cache.
      *

src/Pattern/CaptureCache.php

@@ -314,14 +314,14 @@ protected function createDirectoryStructure($pathname)
             // built-in mkdir function is enough
 
             $umask = $umask !== false ? umask($umask) : false;
-            $res   = mkdir($pathname, $perm !== false ? $perm : 0775, true);
+            $res   = mkdir($pathname, 0775, true);
 
             if ($umask !== false) {
                 umask($umask);
             }
 
             if (! $res) {
-                $oct = $perm === false ? '775' : decoct($perm);
+                $oct = '775';
                 $err = ErrorHandler::stop();
                 throw new Exception\RuntimeException("mkdir('{$pathname}', 0{$oct}, true) failed", 0, $err);
             }
@@ -354,20 +354,20 @@ protected function createDirectoryStructure($pathname)
 
                 // create a single directory, set and reset umask immediately
                 $umask = $umask !== false ? umask($umask) : false;
-                $res   = mkdir($path, $perm === false ? 0775 : $perm, false);
+                $res   = mkdir($path, $perm, false);
                 if ($umask !== false) {
                     umask($umask);
                 }
 
                 if (! $res) {
-                    $oct = $perm === false ? '775' : decoct($perm);
+                    $oct = decoct($perm);
                     ErrorHandler::stop();
                     throw new Exception\RuntimeException(
                         "mkdir('{$path}', 0{$oct}, false) failed"
                     );
                 }
 
-                if ($perm !== false && ! chmod($path, $perm)) {
+                if (! chmod($path, $perm)) {
                     $oct = decoct($perm);
                     ErrorHandler::stop();
                     throw new Exception\RuntimeException(

src/Psr/CacheItemPool/CacheItem.php

@@ -6,7 +6,7 @@
 use DateTimeImmutable;
 use DateTimeInterface;
 use Psr\Cache\CacheItemInterface;
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 use function gettype;
 use function is_int;

src/Psr/CacheItemPool/CacheItemPoolDecorator.php

@@ -11,7 +11,7 @@
 use Laminas\Cache\Storage\StorageInterface;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 use function array_diff;
 use function array_diff_key;

src/Service/StorageAdapterFactory.php

@@ -12,7 +12,6 @@
 use Webmozart\Assert\Assert;
 
 use function assert;
-use function is_array;
 use function is_string;
 use function sprintf;
 
@@ -103,7 +102,6 @@ private function assertValidPluginConfigurationStructure(string $adapter, array
     {
         Assert::allIsArray($plugins, 'All plugin configurations are expected to be an array.');
         foreach ($plugins as $pluginConfiguration) {
-            assert(is_array($pluginConfiguration));
             try {
                 $this->pluginFactory->assertValidConfigurationStructure($pluginConfiguration);
                 if (isset($pluginConfiguration['priority'])) {

src/Service/StorageAdapterPluginManagerFactory.php

@@ -1,14 +1,45 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\Cache\Service;
 
+use Laminas\Cache\ConfigProvider;
 use Laminas\Cache\Storage\AdapterPluginManager;
+use Laminas\ServiceManager\ServiceManager;
 use Psr\Container\ContainerInterface;
 
+use function is_array;
+
+/**
+ * @psalm-import-type ServiceManagerConfiguration from ServiceManager
+ */
 final class StorageAdapterPluginManagerFactory
 {
     public function __invoke(ContainerInterface $container): AdapterPluginManager
     {
-        return new AdapterPluginManager($container);
+        $pluginManager = new AdapterPluginManager($container);
+
+        // If we do not have a config service, nothing more to do
+        if (! $container->has('config')) {
+            return $pluginManager;
+        }
+
+        $config = $container->get('config');
+
+        // If we do not have a configuration, nothing more to do
+        if (
+            ! isset($config[ConfigProvider::ADAPTER_PLUGIN_MANAGER_CONFIGURATION_KEY])
+            || ! is_array($config[ConfigProvider::ADAPTER_PLUGIN_MANAGER_CONFIGURATION_KEY])
+        ) {
+            return $pluginManager;
+        }
+
+        // Wire service configuration
+        /** @var ServiceManagerConfiguration $config */
+        $config = $config[ConfigProvider::ADAPTER_PLUGIN_MANAGER_CONFIGURATION_KEY];
+        $pluginManager->configure($config);
+
+        return $pluginManager;
     }
 }

test/Psr/CacheItemPool/CacheItemPoolDecoratorTest.php

@@ -22,8 +22,8 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemInterface;
+use Psr\Clock\ClockInterface;
 use stdClass;
-use StellaMaris\Clock\ClockInterface;
 use Throwable;
 
 use function array_keys;

test/Psr/CacheItemPool/CacheItemTest.php

@@ -11,7 +11,7 @@
 use Laminas\Cache\Psr\CacheItemPool\CacheItem;
 use Laminas\Cache\Psr\CacheItemPool\InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
-use StellaMaris\Clock\ClockInterface;
+use Psr\Clock\ClockInterface;
 
 use function date_default_timezone_get;
 use function date_default_timezone_set;

test/Psr/SimpleCache/SimpleCacheDecoratorTest.php

@@ -128,7 +128,6 @@ private function mockCapabilities(
     public function setSuccessReference(SimpleCacheDecorator $cache, bool $success): void
     {
         $r = new ReflectionProperty($cache, 'success');
-        $r->setAccessible(true);
         $r->setValue($cache, $success);
     }
 

test/Storage/Adapter/AbstractAdapterTest.php

@@ -161,8 +161,7 @@ public function testInternalTriggerPre(): void
         ]);
 
         // call protected method
-        $method = new ReflectionMethod($storage::class, 'triggerPre');
-        $method->setAccessible(true);
+        $method       = new ReflectionMethod($storage::class, 'triggerPre');
         $rsCollection = $method->invoke($storage, 'setItem', $params);
         self::assertInstanceOf(ResponseCollection::class, $rsCollection);
 
@@ -192,7 +191,6 @@ public function testInternalTriggerPost(): void
 
         // call protected method
         $method = new ReflectionMethod($storage::class, 'triggerPost');
-        $method->setAccessible(true);
         $result = $method->invokeArgs($storage, ['setItem', $params, &$result]);
 
         // test called event
@@ -225,7 +223,6 @@ public function testInternalTriggerExceptionThrowRuntimeException(): void
 
         // call protected method
         $method = new ReflectionMethod($storage::class, 'triggerException');
-        $method->setAccessible(true);
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('test');

test/Storage/AdapterPluginManagerTest.php

@@ -34,7 +34,7 @@ public function testPluginAliasesResolve(string $alias, string $expected)
         $this->addToAssertionCount(1);
     }
 
-    protected function getPluginManager(): AdapterPluginManager
+    protected static function getPluginManager(): AdapterPluginManager
     {
         return new AdapterPluginManager(new ServiceManager());
     }

test/Storage/PluginManagerTest.php

@@ -14,7 +14,7 @@ class PluginManagerTest extends TestCase
 {
     use CommonPluginManagerTrait;
 
-    protected function getPluginManager(): PluginManager
+    protected static function getPluginManager(): PluginManager
     {
         return new PluginManager(new ServiceManager());
     }