From cc893d2ceda8a0e158d80f56a8309049fea1aa36 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Thu, 25 Sep 2025 13:58:46 -0700
Subject: [PATCH 01/21] add v3 metadata work

---
 test-server/php-v2-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v2-server/local-php-sdk b/test-server/php-v2-server/local-php-sdk
index d78bd3b2..b7973fd2 160000
--- a/test-server/php-v2-server/local-php-sdk
+++ b/test-server/php-v2-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit d78bd3b221890aac679ec3b6cb5abcb01fd42699
+Subproject commit b7973fd259feb7373c888425d0e644dafda5a038

From ce8de2aa6005636520836ae588aae792a4a677b4 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Thu, 25 Sep 2025 14:03:53 -0700
Subject: [PATCH 02/21] use a v3 client

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 test-server/php-v3-server/src/index.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index d78bd3b2..0a654d86 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit d78bd3b221890aac679ec3b6cb5abcb01fd42699
+Subproject commit 0a654d867009f5f6e48816c34f9b1f068ac78fdc
diff --git a/test-server/php-v3-server/src/index.php b/test-server/php-v3-server/src/index.php
index cc5dee29..b20367bb 100644
--- a/test-server/php-v3-server/src/index.php
+++ b/test-server/php-v3-server/src/index.php
@@ -5,7 +5,7 @@
 require_once __DIR__ . '/get_object.php';
 require_once __DIR__ . '/put_object.php';
 
-use Aws\S3\Crypto\S3EncryptionClientV2;
+use Aws\S3\Crypto\S3EncryptionClientV3;
 use Aws\Crypto\KmsMaterialsProviderV2;
 use Aws\S3\S3Client;
 use Aws\Kms\KmsClient;
@@ -157,7 +157,7 @@ function getCachedClient($clientId)
 
     // Recreate the AWS clients from stored configuration
     $s3Client = new S3Client($config['s3Config']);
-    $encryptionClient = new S3EncryptionClientV2($s3Client);
+    $encryptionClient = new S3EncryptionClientV3($s3Client);
 
     $kmsClient = new KmsClient($config['kmsConfig']);
     $materialsProvider = new KmsMaterialsProviderV2($kmsClient, $config['kmsKeyId']);
@@ -183,7 +183,7 @@ function createDefaultClientTuple(): array
             ]
         ]
     ]);
-    $encryptionClient = new S3EncryptionClientV2($s3Client);
+    $encryptionClient = new S3EncryptionClientV3($s3Client);
 
     $kmsClient = new KmsClient([
         'region' => 'us-west-2',

From 39395bebd8bcd99ffb283d935fd5e4dbc2191a67 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Thu, 25 Sep 2025 16:59:47 -0700
Subject: [PATCH 03/21] point to newer v3

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index 0a654d86..4cf1388a 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit 0a654d867009f5f6e48816c34f9b1f068ac78fdc
+Subproject commit 4cf1388a7b183bc053ed89176b92a48d05c43a1d

From 0beaa787b86cbd5ebd57b85207ab5a1741db9c17 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Fri, 26 Sep 2025 10:42:38 -0700
Subject: [PATCH 04/21] use v3 kms material provider

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 test-server/php-v3-server/src/index.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index 4cf1388a..f4b03ebb 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit 4cf1388a7b183bc053ed89176b92a48d05c43a1d
+Subproject commit f4b03ebb7271238ff9b8e6f68699c6a9ce5950d3
diff --git a/test-server/php-v3-server/src/index.php b/test-server/php-v3-server/src/index.php
index b20367bb..41b9b47c 100644
--- a/test-server/php-v3-server/src/index.php
+++ b/test-server/php-v3-server/src/index.php
@@ -6,7 +6,7 @@
 require_once __DIR__ . '/put_object.php';
 
 use Aws\S3\Crypto\S3EncryptionClientV3;
-use Aws\Crypto\KmsMaterialsProviderV2;
+use Aws\Crypto\KmsMaterialsProviderV3;
 use Aws\S3\S3Client;
 use Aws\Kms\KmsClient;
 
@@ -160,7 +160,7 @@ function getCachedClient($clientId)
     $encryptionClient = new S3EncryptionClientV3($s3Client);
 
     $kmsClient = new KmsClient($config['kmsConfig']);
-    $materialsProvider = new KmsMaterialsProviderV2($kmsClient, $config['kmsKeyId']);
+    $materialsProvider = new KmsMaterialsProviderV3($kmsClient, $config['kmsKeyId']);
 
     return [
         'encryptionClient' => $encryptionClient,
@@ -197,7 +197,7 @@ function createDefaultClientTuple(): array
             ]
         ]
     ]);
-    $materialsProvider = new KmsMaterialsProviderV2($kmsClient, 'arn:aws:kms:us-west-2:370957321024:alias/S3EC-Test-Server-Github-KMS-Key');
+    $materialsProvider = new KmsMaterialsProviderV3($kmsClient, 'arn:aws:kms:us-west-2:370957321024:alias/S3EC-Test-Server-Github-KMS-Key');
 
     return [
         'encryptionClient' => $encryptionClient,

From 3f0d1fb27c709939c7224b60c2870e73576521f4 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Fri, 26 Sep 2025 11:05:28 -0700
Subject: [PATCH 05/21] ci

---
 .github/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 49b125ef..a7263494 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,8 +37,9 @@ jobs:
       - name: Set up PHP with Composer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
-          tools: composer:v2
+          coverage: xdebug
+          php-version: '8.1' 
+          ini-values: xdebug.overload_var_dump=0, memory_limit=4G, phar.readonly=false
       
       - name: Install PHP V2 dependencies
         working-directory: ./test-server/php-v2-server

From 763400cb4e8b0ed9001f044a6bfe056f409a2851 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Fri, 26 Sep 2025 14:22:59 -0700
Subject: [PATCH 06/21] php v3 supports ec on decrypt

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index f4b03ebb..aa67accb 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit f4b03ebb7271238ff9b8e6f68699c6a9ce5950d3
+Subproject commit aa67accbee51c4677296b9984236fff6237ce663

From 1cba8770bec09194a3ff6363fbdaa7c5c8cfa4f2 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Fri, 26 Sep 2025 14:46:41 -0700
Subject: [PATCH 07/21] fix sdk

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index aa67accb..b8a28e3a 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit aa67accbee51c4677296b9984236fff6237ce663
+Subproject commit b8a28e3a72f9e5b7f98329e634a3b2a5570fca33

From 16ba37ba7509041ece83704bc8f12495e04c9d34 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Fri, 26 Sep 2025 14:50:26 -0700
Subject: [PATCH 08/21] debug

---
 .../software/amazon/encryption/s3/TestUtils.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
index 2e78d9e5..3caa6976 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
@@ -61,15 +61,15 @@ public class TestUtils {
     static {
         final Map<String, LanguageServerTarget> servers = new LinkedHashMap<>();
         servers.put(JAVA_V3, new LanguageServerTarget(JAVA_V3, "8080"));
-        servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
-        servers.put(GO_V3, new LanguageServerTarget(GO_V3, "8082"));
-        servers.put(NET_V2, new LanguageServerTarget(NET_V2, "8083"));
-        servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
-        servers.put(CPP_V2, new LanguageServerTarget(CPP_V2, "8085"));
+        //servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
+        //servers.put(GO_V3, new LanguageServerTarget(GO_V3, "8082"));
+        //servers.put(NET_V2, new LanguageServerTarget(NET_V2, "8083"));
+        //servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
+        //servers.put(CPP_V2, new LanguageServerTarget(CPP_V2, "8085"));
         servers.put(PHP_V2, new LanguageServerTarget(PHP_V2, "8087"));
         servers.put(PHP_V3, new LanguageServerTarget(PHP_V3, "8093"));
-        servers.put(RUBY_V2, new LanguageServerTarget(RUBY_V2, "8086"));
-        servers.put(RUBY_V3, new LanguageServerTarget(RUBY_V3, "8092"));
+        //servers.put(RUBY_V2, new LanguageServerTarget(RUBY_V2, "8086"));
+        //servers.put(RUBY_V3, new LanguageServerTarget(RUBY_V3, "8092"));
 
         serverMap = filterServers(servers);
     }

From f070bc531617e1e8a190a878efc121876fe413f5 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Mon, 29 Sep 2025 13:44:46 -0700
Subject: [PATCH 09/21] fix error wrapping

---
 test-server/php-v2-server/src/get_object.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v2-server/src/get_object.php b/test-server/php-v2-server/src/get_object.php
index 61bacb5b..3150ec04 100644
--- a/test-server/php-v2-server/src/get_object.php
+++ b/test-server/php-v2-server/src/get_object.php
@@ -77,7 +77,7 @@ function handleGetObject($params)
             ob_end_clean();
         }
         if (strpos($e->getMessage(), "@SecurityProfile=V2") !== false) {
-            return S3EncryptionClientError($e->getMessage() . " " . "Enable legacy wrapping algorithms to use legacy key wrapping algorithm: kms");
+            return S3EncryptionClientError($e->getMessage());
         } else {
             return GenericServerError("Server argument: " . $e->getMessage(), 500);
         }

From 28f92c4ebaf1a468b6a1162dbc1aa69fa2056762 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Mon, 29 Sep 2025 13:49:06 -0700
Subject: [PATCH 10/21] add v3 client and have it pass ec tests

---
 test-server/php-v3-server/local-php-sdk      | 2 +-
 test-server/php-v3-server/src/get_object.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index b8a28e3a..b042a5d1 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit b8a28e3a72f9e5b7f98329e634a3b2a5570fca33
+Subproject commit b042a5d1d0b19ec5ac544c1b4d186be60f84e59f
diff --git a/test-server/php-v3-server/src/get_object.php b/test-server/php-v3-server/src/get_object.php
index 59e2192c..17a2ba43 100644
--- a/test-server/php-v3-server/src/get_object.php
+++ b/test-server/php-v3-server/src/get_object.php
@@ -77,7 +77,10 @@ function handleGetObject($params)
             ob_end_clean();
         }
         if (strpos($e->getMessage(), "@SecurityProfile=V2") !== false) {
-            return S3EncryptionClientError($e->getMessage() . " " . "Enable legacy wrapping algorithms to use legacy key wrapping algorithm: kms");
+            return S3EncryptionClientError($e->getMessage());
+        }
+        if (strpos($e->getMessage(), "Provided encryption context does not match information retrieved from S3") !== false) {
+            return S3EncryptionClientError($e->getMessage());
         } else {
             return GenericServerError("Server argument: " . $e->getMessage(), 500);
         }

From a9317bdcf9033ad10f8fe51a0c917221a5a07132 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Mon, 29 Sep 2025 13:49:31 -0700
Subject: [PATCH 11/21] update tests

---
 .../amazon/encryption/s3/RoundTripTests.java     |  2 ++
 .../software/amazon/encryption/s3/TestUtils.java | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java
index 3b6b664d..24dedead 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java
@@ -380,6 +380,8 @@ public void kmsV1LegacyFailsWhenLegacyDisabled(String language) {
               ));
             } else if (language.equals(RUBY_V3) || language.equals(RUBY_V2)) {
               assertTrue(e.getMessage().contains("The requested object is encrypted with V1 encryption schemas that have been disabled by client configuration security_profile = :v2. Retry with :v2_and_legacy or re-encrypt the object."));
+            } else if (language.equals(PHP_V2) || language.equals(PHP_V3)) {
+              assertTrue(e.getMessage().contains("The requested object is encrypted with V1 encryption schemas that have been disabled by client configuration @SecurityProfile=V2. Retry with V2_AND_LEGACY enabled or reencrypt the object."));;
             } else {
               assertTrue(e.getMessage().contains("Enable legacy wrapping algorithms to use legacy key wrapping algorithm: kms"));
             }
diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
index 3caa6976..0e331e4d 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
@@ -51,7 +51,7 @@ public class TestUtils {
 
     // Sets of unsupported features by language
     public static final Set<String> ENCRYPTION_CONTEXT_ON_DECRYPT_UNSUPPORTED =
-        Set.of(GO_V3, PHP_V2, PHP_V3, NET_V2, NET_V3);
+        Set.of(GO_V3, PHP_V2, NET_V2, NET_V3);
     
     public static final Set<String> ENCRYPTION_CONTEXT_ON_ENCRYPT_UNSUPPORTED =
         Set.of(NET_V2, NET_V3);
@@ -61,15 +61,15 @@ public class TestUtils {
     static {
         final Map<String, LanguageServerTarget> servers = new LinkedHashMap<>();
         servers.put(JAVA_V3, new LanguageServerTarget(JAVA_V3, "8080"));
-        //servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
-        //servers.put(GO_V3, new LanguageServerTarget(GO_V3, "8082"));
-        //servers.put(NET_V2, new LanguageServerTarget(NET_V2, "8083"));
-        //servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
-        //servers.put(CPP_V2, new LanguageServerTarget(CPP_V2, "8085"));
+        servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
+        servers.put(GO_V3, new LanguageServerTarget(GO_V3, "8082"));
+        servers.put(NET_V2, new LanguageServerTarget(NET_V2, "8083"));
+        servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
+        servers.put(CPP_V2, new LanguageServerTarget(CPP_V2, "8085"));
         servers.put(PHP_V2, new LanguageServerTarget(PHP_V2, "8087"));
         servers.put(PHP_V3, new LanguageServerTarget(PHP_V3, "8093"));
-        //servers.put(RUBY_V2, new LanguageServerTarget(RUBY_V2, "8086"));
-        //servers.put(RUBY_V3, new LanguageServerTarget(RUBY_V3, "8092"));
+        servers.put(RUBY_V2, new LanguageServerTarget(RUBY_V2, "8086"));
+        servers.put(RUBY_V3, new LanguageServerTarget(RUBY_V3, "8092"));
 
         serverMap = filterServers(servers);
     }

From 2039046d9b66fe6421be3f2bfb958779b661f6e6 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Tue, 30 Sep 2025 11:17:42 -0700
Subject: [PATCH 12/21] fix

---
 .../it/java/software/amazon/encryption/s3/RoundTripTests.java   | 2 +-
 .../src/it/java/software/amazon/encryption/s3/TestUtils.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java
index 6c0788b0..c0cb07b1 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/RoundTripTests.java
@@ -380,7 +380,7 @@ public void kmsV1LegacyFailsWhenLegacyDisabled(String language) {
               ));
             } else if (language.equals(RUBY_V3) || language.equals(RUBY_V2_CURRENT)) {
               assertTrue(e.getMessage().contains("The requested object is encrypted with V1 encryption schemas that have been disabled by client configuration security_profile = :v2. Retry with :v2_and_legacy or re-encrypt the object."));
-            } else if (language.equals(PHP_V2) || language.equals(PHP_V3)) {
+            } else if (language.equals(PHP_V2_CURRENT) || language.equals(PHP_V3)) {
               assertTrue(e.getMessage().contains("The requested object is encrypted with V1 encryption schemas that have been disabled by client configuration @SecurityProfile=V2. Retry with V2_AND_LEGACY enabled or reencrypt the object."));;
             } else {
               assertTrue(e.getMessage().contains("Enable legacy wrapping algorithms to use legacy key wrapping algorithm: kms"));
diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
index 395d11c7..44302d2f 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
@@ -73,7 +73,7 @@ public class TestUtils {
 
     // Sets of unsupported features by language
     public static final Set<String> ENCRYPTION_CONTEXT_ON_DECRYPT_UNSUPPORTED =
-        Set.of(GO_V3_CURRENT, PHP_V2_CURRENT, PHP_V3, NET_V2_CURRENT, NET_V3);
+        Set.of(GO_V3_CURRENT, PHP_V2_CURRENT, NET_V2_CURRENT, NET_V3);
     
     public static final Set<String> ENCRYPTION_CONTEXT_ON_ENCRYPT_UNSUPPORTED =
         Set.of(NET_V2_CURRENT, NET_V3);

From d83e9c4f0d3d730e66bb0432286d664c768ac6d0 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Tue, 30 Sep 2025 13:39:29 -0700
Subject: [PATCH 13/21] newer sdk

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index b042a5d1..2af1e15f 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit b042a5d1d0b19ec5ac544c1b4d186be60f84e59f
+Subproject commit 2af1e15f7ee3d72ffdd3ab99f226caa149d22921

From c4556f620d586d44243a31eec2cbdefd803e3fcf Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Tue, 30 Sep 2025 14:06:15 -0700
Subject: [PATCH 14/21] newer sdk

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index 2af1e15f..3af530da 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit 2af1e15f7ee3d72ffdd3ab99f226caa149d22921
+Subproject commit 3af530da2c3659e8a418c996cee41343ca3795c1

From 1acb64c4db3187971d96ede12511c7d04372a814 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Tue, 30 Sep 2025 14:13:44 -0700
Subject: [PATCH 15/21] point to newer

---
 test-server/php-v2-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v2-server/local-php-sdk b/test-server/php-v2-server/local-php-sdk
index b7973fd2..ab8aee74 160000
--- a/test-server/php-v2-server/local-php-sdk
+++ b/test-server/php-v2-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit b7973fd259feb7373c888425d0e644dafda5a038
+Subproject commit ab8aee74db1141da07c9c979cf313418fddae256

From 150604cd97a2477c4ce5fcc7d06312cacd9a8983 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Tue, 30 Sep 2025 14:33:49 -0700
Subject: [PATCH 16/21] more

---
 .../amazon/encryption/s3/TestUtils.java       | 22 +++++++++----------
 test-server/php-v3-server/local-php-sdk       |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
index 88dceb3d..e0ccbd6e 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
@@ -113,24 +113,24 @@ public class TestUtils {
 
     static {
         final Map<String, LanguageServerTarget> servers = new LinkedHashMap<>();
-        servers.put(JAVA_V3_CURRENT, new LanguageServerTarget(JAVA_V3_CURRENT, "8080"));
-        servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
-        servers.put(GO_V3_CURRENT, new LanguageServerTarget(GO_V3_CURRENT, "8082"));
-        servers.put(NET_V2_CURRENT, new LanguageServerTarget(NET_V2_CURRENT, "8083"));
-        servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
-        servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
-        servers.put(RUBY_V2_CURRENT, new LanguageServerTarget(RUBY_V2_CURRENT, "8086"));
+        // servers.put(JAVA_V3_CURRENT, new LanguageServerTarget(JAVA_V3_CURRENT, "8080"));
+        // servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
+        // servers.put(GO_V3_CURRENT, new LanguageServerTarget(GO_V3_CURRENT, "8082"));
+        // servers.put(NET_V2_CURRENT, new LanguageServerTarget(NET_V2_CURRENT, "8083"));
+        // servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
+        // servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
+        // servers.put(RUBY_V2_CURRENT, new LanguageServerTarget(RUBY_V2_CURRENT, "8086"));
         servers.put(PHP_V2_CURRENT, new LanguageServerTarget(PHP_V2_CURRENT, "8087"));
-        servers.put(RUBY_V3, new LanguageServerTarget(RUBY_V3, "8092"));
+        // servers.put(RUBY_V3, new LanguageServerTarget(RUBY_V3, "8092"));
         servers.put(PHP_V3, new LanguageServerTarget(PHP_V3, "8093"));
         // TODO: Create and add transition servers
-        servers.put(JAVA_V3_TRANSITION, new LanguageServerTarget(JAVA_V3_TRANSITION, "8094"));
+        // servers.put(JAVA_V3_TRANSITION, new LanguageServerTarget(JAVA_V3_TRANSITION, "8094"));
         // servers.put(GO_V3_TRANSITION, new LanguageServerTarget(GO_V3_TRANSITION, "8095"));
         // servers.put(NET_V2_TRANSITION, new LanguageServerTarget(NET_V2_TRANSITION, "8096"));
-        servers.put(CPP_V2_TRANSITION, new LanguageServerTarget(CPP_V2_TRANSITION, "8097"));
+        // servers.put(CPP_V2_TRANSITION, new LanguageServerTarget(CPP_V2_TRANSITION, "8097"));
         // servers.put(RUBY_V2_TRANSITION, new LanguageServerTarget(RUBY_V2_TRANSITION, "8098"));
         // servers.put(PHP_V2_TRANSITION, new LanguageServerTarget(PHP_V2_TRANSITION, "8099"));
-        servers.put(JAVA_V4, new LanguageServerTarget(JAVA_V4, "8090"));
+        // servers.put(JAVA_V4, new LanguageServerTarget(JAVA_V4, "8090"));
         serverMap = filterServers(servers);
     }
 
diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index 3af530da..80bd6405 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit 3af530da2c3659e8a418c996cee41343ca3795c1
+Subproject commit 80bd64058f0bd57a98793b2bb77485b7b92fb5af

From c1aa0059b218abf06eeecebd0d54c178f68b8af5 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Wed, 1 Oct 2025 13:55:58 -0700
Subject: [PATCH 17/21] fixed

---
 .../amazon/encryption/s3/TestUtils.java       | 22 +++++++++----------
 test-server/php-v3-server/local-php-sdk       |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
index 3902bd86..af851239 100644
--- a/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
+++ b/test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
@@ -115,24 +115,24 @@ public class TestUtils {
 
     static {
         final Map<String, LanguageServerTarget> servers = new LinkedHashMap<>();
-        // servers.put(JAVA_V3_CURRENT, new LanguageServerTarget(JAVA_V3_CURRENT, "8080"));
-        // servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
-        // servers.put(GO_V3_CURRENT, new LanguageServerTarget(GO_V3_CURRENT, "8082"));
-        // servers.put(NET_V2_CURRENT, new LanguageServerTarget(NET_V2_CURRENT, "8083"));
-        // servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
-        // servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
-        // servers.put(RUBY_V2_CURRENT, new LanguageServerTarget(RUBY_V2_CURRENT, "8086"));
+        servers.put(JAVA_V3_CURRENT, new LanguageServerTarget(JAVA_V3_CURRENT, "8080"));
+        servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
+        servers.put(GO_V3_CURRENT, new LanguageServerTarget(GO_V3_CURRENT, "8082"));
+        servers.put(NET_V2_CURRENT, new LanguageServerTarget(NET_V2_CURRENT, "8083"));
+        servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
+        servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
+        servers.put(RUBY_V2_CURRENT, new LanguageServerTarget(RUBY_V2_CURRENT, "8086"));
         servers.put(PHP_V2_CURRENT, new LanguageServerTarget(PHP_V2_CURRENT, "8087"));
-        // servers.put(RUBY_V3, new LanguageServerTarget(RUBY_V3, "8092"));
+        servers.put(RUBY_V3, new LanguageServerTarget(RUBY_V3, "8092"));
         servers.put(PHP_V3, new LanguageServerTarget(PHP_V3, "8093"));
         // TODO: Create and add transition servers
-        // servers.put(JAVA_V3_TRANSITION, new LanguageServerTarget(JAVA_V3_TRANSITION, "8094"));
+        servers.put(JAVA_V3_TRANSITION, new LanguageServerTarget(JAVA_V3_TRANSITION, "8094"));
         // servers.put(GO_V3_TRANSITION, new LanguageServerTarget(GO_V3_TRANSITION, "8095"));
         // servers.put(NET_V2_TRANSITION, new LanguageServerTarget(NET_V2_TRANSITION, "8096"));
-        // servers.put(CPP_V2_TRANSITION, new LanguageServerTarget(CPP_V2_TRANSITION, "8097"));
+        servers.put(CPP_V2_TRANSITION, new LanguageServerTarget(CPP_V2_TRANSITION, "8097"));
         // servers.put(RUBY_V2_TRANSITION, new LanguageServerTarget(RUBY_V2_TRANSITION, "8098"));
         // servers.put(PHP_V2_TRANSITION, new LanguageServerTarget(PHP_V2_TRANSITION, "8099"));
-        // servers.put(JAVA_V4, new LanguageServerTarget(JAVA_V4, "8090"));
+        servers.put(JAVA_V4, new LanguageServerTarget(JAVA_V4, "8090"));
         serverMap = filterServers(servers);
     }
 
diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index 80bd6405..f25f1892 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit 80bd64058f0bd57a98793b2bb77485b7b92fb5af
+Subproject commit f25f18929ce812d73d3549097cfb4a569b74dea7

From b12a55a3d17dccb977a2e99ff7ec2c31d050a936 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Wed, 1 Oct 2025 17:01:36 -0700
Subject: [PATCH 18/21] php sdk fix

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index f25f1892..d7c65745 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit f25f18929ce812d73d3549097cfb4a569b74dea7
+Subproject commit d7c6574517a7c4e60e1b12a798a5d6cf66ad0c1f

From b7c1adc71071f57c5355b44a28329dcb588e59ba Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Thu, 2 Oct 2025 12:07:40 -0700
Subject: [PATCH 19/21] newer sdk

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index d7c65745..4b14faa3 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit d7c6574517a7c4e60e1b12a798a5d6cf66ad0c1f
+Subproject commit 4b14faa39187c8352abd36fb9cf783dd8189cfa3

From 12c1f3d553ea95d0cf445fe6d09e79697f5df767 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Mon, 6 Oct 2025 11:38:08 -0700
Subject: [PATCH 20/21] newer sdk

---
 test-server/php-v3-server/local-php-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index 4b14faa3..b10a145b 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit 4b14faa39187c8352abd36fb9cf783dd8189cfa3
+Subproject commit b10a145b9f0c66902161fd488315b026c1026336

From cea715acb5d7869c40d3369c27a394e6d8d88e80 Mon Sep 17 00:00:00 2001
From: Jose Corella <jocorell@amazon.com>
Date: Tue, 7 Oct 2025 17:25:33 -0700
Subject: [PATCH 21/21] newer sdk

---
 test-server/php-v3-server/.duvet/config.toml | 9 +++++++++
 test-server/php-v3-server/local-php-sdk      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/test-server/php-v3-server/.duvet/config.toml b/test-server/php-v3-server/.duvet/config.toml
index 64b00927..c3ae4317 100644
--- a/test-server/php-v3-server/.duvet/config.toml
+++ b/test-server/php-v3-server/.duvet/config.toml
@@ -6,6 +6,15 @@ pattern = "local-php-sdk/src/S3/**/*.php"
 [[source]]
 pattern = "local-php-sdk/src/Crypto/**/*.php"
 
+[[source]]
+pattern = "local-php-sdk/tests/S3/**/*.php"
+
+[[source]]
+pattern = "local-php-sdk/tests/Crypto/**/*.php"
+
+[[source]]
+pattern = "local-php-sdk/compliance_exceptions/*.txt"
+
 # Include required specifications here
 [[specification]]
 source = "../specification/s3-encryption/data-format/content-metadata.md"
diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk
index b10a145b..96aedea4 160000
--- a/test-server/php-v3-server/local-php-sdk
+++ b/test-server/php-v3-server/local-php-sdk
@@ -1 +1 @@
-Subproject commit b10a145b9f0c66902161fd488315b026c1026336
+Subproject commit 96aedea49e74c0bd8a701870037a668209195f7d