From 2ddfdc1db40470fea460d10d874922a80b1be983 Mon Sep 17 00:00:00 2001 From: xl Date: Fri, 26 May 2023 10:06:37 +0800 Subject: [PATCH] qqq --- kiri-engine/Abstracts/BaseApplication.php | 2 +- kiri-engine/Abstracts/Logger.php | 13 +++++++++++-- kiri-engine/Config/ConfigProvider.php | 6 +++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/kiri-engine/Abstracts/BaseApplication.php b/kiri-engine/Abstracts/BaseApplication.php index 00d6300b..620ca393 100644 --- a/kiri-engine/Abstracts/BaseApplication.php +++ b/kiri-engine/Abstracts/BaseApplication.php @@ -47,7 +47,7 @@ abstract class BaseApplication extends Component $this->localService = make(LocalService::class); /** @var ConfigProvider $config */ - $config = instance(ConfigProvider::class, [sweep(APP_PATH . '/config')]); + $config = make(ConfigProvider::class); $this->mapping($config); $this->parseStorage($config); diff --git a/kiri-engine/Abstracts/Logger.php b/kiri-engine/Abstracts/Logger.php index ad806ead..a607a2cb 100644 --- a/kiri-engine/Abstracts/Logger.php +++ b/kiri-engine/Abstracts/Logger.php @@ -44,6 +44,9 @@ class Logger implements LoggerInterface private array $levels = []; + /** + * + */ public function __construct() { $this->levels = \config('log.level', Logger::LOGGER_LEVELS); @@ -176,8 +179,14 @@ class Logger implements LoggerInterface return; } - $console = Kiri::getDi()->get(OutputInterface::class); - $console->writeln($_string); + $container = Kiri::getDi(); + if ($container->has(OutputInterface::class)) { + $console = $container->get(OutputInterface::class); + $console->writeln($_string); + } else { + file_put_contents('php://output', $message . PHP_EOL); + } + $filename = storage('log-' . date('Y-m-d') . '.log', 'log/'); file_put_contents($filename, $_string, FILE_APPEND); diff --git a/kiri-engine/Config/ConfigProvider.php b/kiri-engine/Config/ConfigProvider.php index a8627f61..de7544a8 100644 --- a/kiri-engine/Config/ConfigProvider.php +++ b/kiri-engine/Config/ConfigProvider.php @@ -11,12 +11,12 @@ class ConfigProvider /** - * @param array $config + * */ - public function __construct(array $config) + public function __construct() { $this->hashMap = new HashMap(); - $this->load($config); + $this->load(sweep(APP_PATH . '/config')); $this->enableEnvConfig(APP_PATH . '.env'); }