Merge pull request #281 from laminas/3.12.x-merge-up-into-4.0.x_gaUWszuj

Merge release 3.12.0 into 4.0.x

Author: boesing

composer.json

@@ -34,7 +34,7 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "laminas/laminas-cache-storage-implementation": "2.0",
         "laminas/laminas-eventmanager": "^3.4",
         "laminas/laminas-servicemanager": "^3.21",
@@ -45,7 +45,7 @@
         "webmozart/assert": "^1.9"
     },
     "require-dev": {
-        "laminas/laminas-cache-storage-adapter-dev": "@dev",
+        "laminas/laminas-cache-storage-adapter-dev": "^1.0",
         "laminas/laminas-cli": "^1.7",
         "laminas/laminas-coding-standard": "~2.5.0",
         "laminas/laminas-config-aggregator": "^1.13",

composer.lock

@@ -1,6 +1,7 @@
 {
     "name": "laminas/laminas-cache-storage-adapter-dev",
     "type": "library",
+    "version": "1.0",
     "provide": {
         "laminas/laminas-cache-storage-implementation": "2.0"
     },

dev-implementation/composer.json

@@ -163,7 +163,6 @@
       <code>setDirPermission</code>
       <code>setFileLocking</code>
       <code>setFilePermission</code>
-      <code>setIndexFilename</code>
       <code>setObject</code>
       <code>setObjectCacheMagicProperties</code>
       <code>setObjectCacheMethods</code>
@@ -667,9 +666,6 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="test/Pattern/CaptureCacheTest.php">
-    <MixedMethodCall>
-      <code>setIndexFilename</code>
-    </MixedMethodCall>
     <PossiblyNullArrayAccess>
       <code><![CDATA[$err['message']]]></code>
       <code><![CDATA[$err['message']]]></code>
@@ -682,12 +678,6 @@
       <code>set</code>
       <code>set</code>
     </UndefinedInterfaceMethod>
-    <UndefinedThisPropertyAssignment>
-      <code><![CDATA[$this->options]]></code>
-    </UndefinedThisPropertyAssignment>
-    <UndefinedThisPropertyFetch>
-      <code><![CDATA[$this->options]]></code>
-    </UndefinedThisPropertyFetch>
   </file>
   <file src="test/Pattern/ObjectCacheTest.php">
     <PossiblyNullPropertyFetch>

psalm-baseline.xml

@@ -17,6 +17,9 @@ abstract class AbstractCommonPatternTest extends TestCase
     /** @var PatternInterface */
     protected $pattern;
 
+    /** @var PatternOptions */
+    protected $options;
+
     protected function setUp(): void
     {
         self::assertInstanceOf(