Skip to content

Commit 41c12d1

Browse files
committed
RATESWSX-324: feature-flags: fix missing argument on load & catch unknown exceptions
1 parent 542c6ea commit 41c12d1

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

src/Core/FeatureFlagService.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ public static function loadFeatureFlags(?string $flags = null): void
3434

3535
$list = str_replace(',', "\n", $flags);
3636
$list = explode("\n", $list);
37+
$list = array_filter($list, static fn ($value): bool => is_string($value) && !empty($value));
38+
$list = array_filter(array_map('trim', $list));
3739

38-
self::$flags = array_filter($list, static fn ($value): bool => !empty($value));
40+
self::$flags = $list;
3941
}
4042
}

src/RpayPayments.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
3636
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
3737
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
38+
use Throwable;
3839

3940
class RpayPayments extends Plugin
4041
{
@@ -170,11 +171,15 @@ public function boot(): void
170171
{
171172
parent::boot();
172173

173-
/** @var SystemConfigService $systemConfig */
174-
$systemConfig = $this->container->get(SystemConfigService::class);
175-
$flags = $systemConfig->get('RpayPayments.config.featureFlags');
176-
if (is_string($flags)) {
177-
FeatureFlagService::loadFeatureFlags();
174+
try {
175+
/** @var SystemConfigService $systemConfig */
176+
$systemConfig = $this->container->get(SystemConfigService::class);
177+
$flags = $systemConfig->get('RpayPayments.config.featureFlags');
178+
if (is_string($flags)) {
179+
FeatureFlagService::loadFeatureFlags($flags);
180+
}
181+
} catch (Throwable) {
182+
// maybe the database connection is not established.
178183
}
179184
}
180185

0 commit comments

Comments
 (0)