Skip to content

Commit 728aa50

Browse files
author
Maelmin Henge
committed
add doctrine 3 support
1 parent 0ee9fc0 commit 728aa50

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Handler/SettingHandler.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected function innerGet(string $name): ?string
8787
}
8888

8989
$value = $setting->value;
90-
if ($setting->isSensitive) {
90+
if ($setting->isSensitive && $value !== '') {
9191
$value = $this->cryptoService->decrypt($value);
9292
}
9393
$this->setRunTime($name, $value);
@@ -114,7 +114,7 @@ public function getMultiple(array $names): array
114114

115115
foreach ($settings as $setting) {
116116
$value = $setting->value;
117-
if ($setting->isSensitive) {
117+
if ($setting->isSensitive && $value !== '') {
118118
$value = $this->cryptoService->decrypt($value);
119119
}
120120
$result[$setting->name] = $value;
@@ -152,9 +152,7 @@ private function group(array $settings): array
152152
$return[$groupName][] = $setting;
153153
}
154154
foreach ($return as $group => $unused) {
155-
uasort($return[$group], function (Setting $a, Setting $b) {
156-
return $a->name <=> $b->name;
157-
});
155+
uasort($return[$group], static fn(Setting $a, Setting $b) => $a->name <=> $b->name);
158156
}
159157

160158
return $return;
@@ -176,8 +174,11 @@ public function setOverridePrefix(?string $prefix): void
176174
$this->overridePrefix = $prefix;
177175
}
178176

179-
private function maskSensitiveString(string $input): string
177+
private function maskSensitiveString(#[\SensitiveParameter] string $input): string
180178
{
179+
if (!$input) {
180+
return '';
181+
}
181182
$input = $this->cryptoService->decrypt($input);
182183
if (strlen($input) < 5) {
183184
return "****";

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"require": {
88
"php": ">=8.3",
99
"doctrine/orm": "^2.10|^3.0",
10-
"doctrine/doctrine-bundle": "^2.5",
10+
"doctrine/doctrine-bundle": "^2.5|^3.0",
1111
"ext-sodium": "*",
1212
"symfony/serializer-pack": "*"
1313
},

0 commit comments

Comments
 (0)