From 03afc62200dd4893c6757dd2c2e5f148625d5b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Mon, 6 Nov 2023 19:36:28 +0100
Subject: [PATCH 1/2] Adds PHP 8.3 as new supported version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Stéphane Demonchaux <demonchaux.stephane@gmail.com>
Signed-off-by: Stéphane Demonchaux <demonchaux.stephane@gmail.com>
Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
---
 .laminas-ci.json                               | 5 ++++-
 .laminas-ci/install-apcu-extension-via-pecl.sh | 4 ++--
 composer.json                                  | 2 +-
 composer.lock                                  | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.laminas-ci.json b/.laminas-ci.json
index 38b147d9..8175dc67 100644
--- a/.laminas-ci.json
+++ b/.laminas-ci.json
@@ -6,5 +6,8 @@
         "apc.enabled=1",
         "apc.enable_cli=1"
     ],
-    "backwardCompatibilityCheck": true
+    "backwardCompatibilityCheck": true,
+    "ignore_php_platform_requirements": {
+        "8.3": true
+    }
 }
diff --git a/.laminas-ci/install-apcu-extension-via-pecl.sh b/.laminas-ci/install-apcu-extension-via-pecl.sh
index 0f2e221f..4fb9acda 100755
--- a/.laminas-ci/install-apcu-extension-via-pecl.sh
+++ b/.laminas-ci/install-apcu-extension-via-pecl.sh
@@ -2,8 +2,8 @@
 
 PHP_VERSION="$1"
 
-if ! [[ "${PHP_VERSION}" =~ 8\.2 ]]; then
-  echo "APCu is only installed from pecl for PHP 8.2, ${PHP_VERSION} detected."
+if ! [[ "${PHP_VERSION}" =~ 8\.3 ]]; then
+  echo "APCu is only installed from pecl for PHP 8.3, ${PHP_VERSION} detected."
   exit 0;
 fi
 
diff --git a/composer.json b/composer.json
index 5eb0e22d..251a4b31 100644
--- a/composer.json
+++ b/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": "1.0",
         "laminas/laminas-eventmanager": "^3.4",
         "laminas/laminas-servicemanager": "^3.21",
diff --git a/composer.lock b/composer.lock
index ea3fd1c1..e1632b16 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "295bfbb0011bdabd9ee9e7ab205903e7",
+    "content-hash": "e30d07ce4a69432401e9676e46993cd1",
     "packages": [
         {
             "name": "laminas/laminas-cache-storage-adapter-memory",
@@ -6217,11 +6217,11 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
     },
     "platform-dev": [],
     "platform-overrides": {
         "php": "8.1.99"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

From 7ad2133194f8a7d371800bf23c2ebdac582f6e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Mon, 6 Nov 2023 19:41:24 +0100
Subject: [PATCH 2/2] qa: add missing property to prevent dynamic property
 deprecation message
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>
---
 psalm-baseline.xml                         | 10 ----------
 test/Pattern/AbstractCommonPatternTest.php |  3 +++
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 0ee001c6..1f7c7266 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -194,7 +194,6 @@
       <code>setDirPermission</code>
       <code>setFileLocking</code>
       <code>setFilePermission</code>
-      <code>setIndexFilename</code>
       <code>setObject</code>
       <code>setObjectCacheMagicProperties</code>
       <code>setObjectCacheMethods</code>
@@ -851,9 +850,6 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="test/Pattern/CaptureCacheTest.php">
-    <MixedMethodCall>
-      <code>setIndexFilename</code>
-    </MixedMethodCall>
     <PossiblyNullArrayAccess>
       <code><![CDATA[$err['message']]]></code>
       <code><![CDATA[$err['message']]]></code>
@@ -866,12 +862,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">
     <MissingClosureParamType>
diff --git a/test/Pattern/AbstractCommonPatternTest.php b/test/Pattern/AbstractCommonPatternTest.php
index a5ff0abc..9ad2a282 100644
--- a/test/Pattern/AbstractCommonPatternTest.php
+++ b/test/Pattern/AbstractCommonPatternTest.php
@@ -17,6 +17,9 @@ abstract class AbstractCommonPatternTest extends TestCase
     /** @var PatternInterface */
     protected $pattern;
 
+    /** @var PatternOptions */
+    protected $options;
+
     protected function setUp(): void
     {
         self::assertInstanceOf(