Skip to content

Commit 81a7ddb

Browse files
committed
Cast KMS provider to object to support AWS empty config
doctrine/mongodb-odm#2801
1 parent 23737b3 commit 81a7ddb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/DependencyInjection/DoctrineMongoDBExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ private function normalizeAutoEncryption(array $autoEncryption, string $defaultD
530530

531531
$provider = $autoEncryption['kmsProvider']['type'];
532532
$autoEncryption['kmsProviders'] = [
533-
$provider => array_diff_key($autoEncryption['kmsProvider'], ['type' => true]),
533+
$provider => (object) array_diff_key($autoEncryption['kmsProvider'], ['type' => true]),
534534
];
535535
if (isset($autoEncryption['tlsOptions'])) {
536536
$autoEncryption['tlsOptions'] = [$provider => $autoEncryption['tlsOptions']];

tests/DependencyInjection/DoctrineMongoDBExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ public function testAutoEncryptionWithKeyVaultClientService(): void
517517
self::assertInstanceOf(Reference::class, $driverOptions['autoEncryption']['keyVaultClient']);
518518
self::assertEquals($dummyServiceId, (string) $driverOptions['autoEncryption']['keyVaultClient']);
519519
self::assertEquals('db.vault', $driverOptions['autoEncryption']['keyVaultNamespace']);
520-
self::assertEquals(['local' => ['key' => 'cGFzc3dvcmQ=']], $driverOptions['autoEncryption']['kmsProviders']);
520+
self::assertEquals(['local' => (object) ['key' => 'cGFzc3dvcmQ=']], $driverOptions['autoEncryption']['kmsProviders']);
521521

522522
// Auto encryption configuration should be set in the ODM configuration
523523
$odmConfiguration = $container->get('doctrine_mongodb.odm.default_configuration');
@@ -572,7 +572,7 @@ public function testAutoEncryptionWithComplexKmsAndSchemaMap(): void
572572
$driverOptions = $clientDef->getArgument(2);
573573

574574
self::assertArrayHasKey('autoEncryption', $driverOptions);
575-
self::assertEquals(['aws' => ['accessKeyId' => 'test', 'secretAccessKey' => 'secret']], $driverOptions['autoEncryption']['kmsProviders']);
575+
self::assertEquals(['aws' => (object) ['accessKeyId' => 'test', 'secretAccessKey' => 'secret']], $driverOptions['autoEncryption']['kmsProviders']);
576576
self::assertEquals($schemaMap, $driverOptions['autoEncryption']['schemaMap']);
577577
self::assertEquals('db.vault', $driverOptions['autoEncryption']['keyVaultNamespace']);
578578

0 commit comments

Comments
 (0)