From db4b66c517cd170f133cb07547c52a88e82ed5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@tideways-gmbh.com>
Date: Mon, 21 Oct 2024 09:25:33 +0200
Subject: [PATCH 1/2] Run unit tests with PHP 8.3 and 8.4 on CI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Düsterhus <tim@tideways-gmbh.com>
---
 .github/workflows/test.yml | 2 ++
 CHANGELOG.md               | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 860cb57a..2382a101 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -107,6 +107,8 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
+          - '8.4'
         os:
           - ubuntu-latest
           - macos-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c7f9851..b367b2c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,13 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Generate endpoints from OpenSearch API Specification ([#194](https://github.com/opensearch-project/opensearch-php/pull/194))
 - Added workflow for automated API update using OpenSearch API specification ([#209](https://github.com/opensearch-project/opensearch-php/pull/209))
 - Added samples ([#218](https://github.com/opensearch-project/opensearch-php/pull/218))
+- Added support for PHP 8.3 and 8.4 ([#229](https://github.com/opensearch-project/opensearch-php/pull/229))
 ### Changed
 - Increased min version of `ezimuel/ringphp` to `^1.2.2`
 ### Deprecated
 ### Removed
 ### Fixed
-- Fixed upcomming PHP 8.4 deprecations
+- Fixed PHP 8.4 deprecations
 ### Updated APIs
 - Updated opensearch-php APIs to reflect [opensearch-api-specification@cb320b5](https://github.com/opensearch-project/opensearch-api-specification/commit/cb320b5482551c4f28afa26ff0d1653332699722)
 ### Security

From 9916191243330f41ec2901ec7136a698bb6de7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@tideways-gmbh.com>
Date: Mon, 21 Oct 2024 16:27:22 +0200
Subject: [PATCH 2/2] Run non-Unit Test CI jobs with PHP 8.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Düsterhus <tim@tideways-gmbh.com>
---
 .github/workflows/test.yml            | 24 ++++++++++++------------
 .github/workflows/test_unreleased.yml |  4 ++--
 .github/workflows/update_docs.yml     |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2382a101..04cffe5f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,10 +14,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Use PHP 8.2
+      - name: Use PHP 8.3
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: yaml, zip, curl
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -37,10 +37,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Use PHP 8.2
+      - name: Use PHP 8.3
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: yaml, zip, curl
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -70,10 +70,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Use PHP 8.2
+      - name: Use PHP 8.3
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: yaml, zip, curl, pcov
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -155,10 +155,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Use PHP 8.2
+    - name: Use PHP 8.3
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.2
+        php-version: 8.3
         extensions: yaml, zip, curl
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -214,10 +214,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Use PHP 8.2
+    - name: Use PHP 8.3
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.2
+        php-version: 8.3
         extensions: yaml, zip, curl
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -262,10 +262,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Use PHP 8.2
+    - name: Use PHP 8.3
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.2
+        php-version: 8.3
         extensions: yaml, zip, curl
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test_unreleased.yml b/.github/workflows/test_unreleased.yml
index 7cf27432..196f5212 100644
--- a/.github/workflows/test_unreleased.yml
+++ b/.github/workflows/test_unreleased.yml
@@ -19,10 +19,10 @@ jobs:
       - name: Checkout PHP Client
         uses: actions/checkout@v2
 
-      - name: Use PHP 8.2
+      - name: Use PHP 8.3
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: yaml, zip, curl
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update_docs.yml b/.github/workflows/update_docs.yml
index d57f043f..7ac33508 100644
--- a/.github/workflows/update_docs.yml
+++ b/.github/workflows/update_docs.yml
@@ -19,10 +19,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Use PHP 8.2
+      - name: Use PHP 8.3
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}