Follow KeyRef/EncKeyRef move into WSSecurity\Outbound\KeyReference

Author: veewee

tests/Support/Wsse.php

@@ -31,7 +31,7 @@ final class Wsse
      */
     public static function sign(
         ?SoapVersion $soapVersion = null,
-        Outbound\KeyRef $keyRef = Outbound\KeyRef::BinarySecurityToken,
+        Outbound\KeyReference\KeyRef $keyRef = Outbound\KeyReference\KeyRef::BinarySecurityToken,
         ?SignatureMethod $signatureMethod = null,
         ?SignatureCanonicalization $canonicalization = null,
         ?string $clientCertFile = null,
@@ -64,7 +64,7 @@ public static function sign(
     /** Encrypt the sample Body to the given recipient cert and return the encrypted XML. */
     public static function encrypt(
         string $recipientCertFile,
-        Outbound\EncKeyRef $encKeyRef = Outbound\EncKeyRef::SubjectKeyIdentifier,
+        Outbound\KeyReference\EncKeyRef $encKeyRef = Outbound\KeyReference\EncKeyRef::SubjectKeyIdentifier,
         ?\Soap\Psr18WsseMiddleware\Algorithm\DataEncryptionMethod $dataMethod = null,
         ?KeyTransportAlgorithm $keyTransport = null,
         ?string $inputXml = null,

tests/Wsse/EncryptionInteropTest.php

@@ -112,7 +112,7 @@ public function test_php_encrypted_with_issuerserial_recipient_is_decrypted_by_w
     {
         $encrypted = Wsse::encrypt(
             recipientCertFile: Oracle::certPath('java-server.crt'),
-            encKeyRef: Outbound\EncKeyRef::IssuerSerial,
+            encKeyRef: Outbound\KeyReference\EncKeyRef::IssuerSerial,
         );
 
         $response = Oracle::post('/decrypt', $encrypted);

tests/Wsse/SignatureInteropTest.php

@@ -78,19 +78,19 @@ public function test_php_signed_ecdsa_sha256_is_accepted_by_wss4j(): void
     }
 
     /**
-     * @return iterable<string, array{Outbound\KeyRef, string}>
+     * @return iterable<string, array{Outbound\KeyReference\KeyRef, string}>
      */
     public static function phpKeyRefProvider(): iterable
     {
         // keyref => verify keystore hint param. BST/SKI resolve from the recipients keystore (holds php-client);
         // IssuerSerial also resolves there because the php-client cert is present.
-        yield 'BinarySecurityToken' => [Outbound\KeyRef::BinarySecurityToken, ''];
-        yield 'SubjectKeyIdentifier' => [Outbound\KeyRef::SubjectKeyIdentifier, ''];
-        yield 'IssuerSerial' => [Outbound\KeyRef::IssuerSerial, '?disableBsp=true'];
+        yield 'BinarySecurityToken' => [Outbound\KeyReference\KeyRef::BinarySecurityToken, ''];
+        yield 'SubjectKeyIdentifier' => [Outbound\KeyReference\KeyRef::SubjectKeyIdentifier, ''];
+        yield 'IssuerSerial' => [Outbound\KeyReference\KeyRef::IssuerSerial, '?disableBsp=true'];
     }
 
     #[DataProvider('phpKeyRefProvider')]
-    public function test_php_signed_keyref_is_accepted_by_wss4j(Outbound\KeyRef $keyRef, string $query): void
+    public function test_php_signed_keyref_is_accepted_by_wss4j(Outbound\KeyReference\KeyRef $keyRef, string $query): void
     {
         $signed = Wsse::sign(keyRef: $keyRef);