From f867dcfdd238ae26cb129e629599d7f652e79c23 Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Sat, 1 Mar 2025 19:58:07 +0100 Subject: [PATCH] fix: Enhance code quality and shell provider factoryr --- src/Configuration/ConfigurationService.php | 8 ++------ src/ShellProvider/ShellProviderFactory.php | 4 +++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Configuration/ConfigurationService.php b/src/Configuration/ConfigurationService.php index ee8430d2..3b13315c 100644 --- a/src/Configuration/ConfigurationService.php +++ b/src/Configuration/ConfigurationService.php @@ -834,12 +834,8 @@ public function getDockerConfig(string $config_name): ?DockerConfig $shell_provider = ShellProviderFactory::create($data['shellProvider'], $this->logger); $errors = new ValidationErrorBag(); - if (!$shell_provider) { - $errors->addError('shellProvider', 'Unhandled shell-provider: `'.$data['shellProvider'].'`'); - } else { - $data = Node::mergeData($shell_provider->getDefaultConfig($this, $data), $data); - $shell_provider->validateConfig($data, $errors); - } + $data = Node::mergeData($shell_provider->getDefaultConfig($this, $data), $data); + $shell_provider->validateConfig($data, $errors); if ($errors->hasErrors()) { throw new ValidationFailedException($errors); } diff --git a/src/ShellProvider/ShellProviderFactory.php b/src/ShellProvider/ShellProviderFactory.php index 6da7665c..69f27a1a 100644 --- a/src/ShellProvider/ShellProviderFactory.php +++ b/src/ShellProvider/ShellProviderFactory.php @@ -2,9 +2,11 @@ namespace Phabalicious\ShellProvider; +use Psr\Log\LoggerInterface; + class ShellProviderFactory { - public static function create($shell_provider_name, $logger): ?ShellProviderInterface + public static function create(string $shell_provider_name, LoggerInterface $logger): ShellProviderInterface { switch ($shell_provider_name) { case LocalShellProvider::PROVIDER_NAME: