From d0a906c403a312cb2fd1ffe206d697bda96da820 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Sat, 8 Feb 2025 22:23:57 +0100 Subject: [PATCH] improve code style --- src/LoggerFactory.php | 23 ++++++++--------------- tests/LoggerFactoryTest.php | 24 ++++++++++++++++++++---- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/LoggerFactory.php b/src/LoggerFactory.php index 2bbd217..228885c 100644 --- a/src/LoggerFactory.php +++ b/src/LoggerFactory.php @@ -59,8 +59,7 @@ class LoggerFactory int $logLevel = Logger::INFO, ?int $maxFiles = null, array $specialHandlers = [] - ): Logger - { + ): Logger { $logger = new Logger($loggerName); $handler = $this->applySpecialHandlers( $this->getFileLoggerStreamHandler($filePath, $logLevel, $maxFiles), @@ -78,8 +77,7 @@ class LoggerFactory string $filePath, int $logLevel = Logger::INFO, ?int $maxFiles = null - ): AbstractProcessingHandler - { + ): AbstractProcessingHandler { return is_null($maxFiles) ? new StreamHandler($filePath, $logLevel) : new RotatingFileHandler($filePath, $maxFiles, $logLevel); @@ -94,8 +92,7 @@ class LoggerFactory int $logLevel = Logger::INFO, ?int $maxFiles = null, array $specialHandlers = [] - ): Logger - { + ): Logger { if (!class_exists(Registry::class)) { throw new RuntimeException(__METHOD__.' can executed in OXID eShop installations only'); } @@ -129,8 +126,7 @@ class LoggerFactory public function applySpecialHandlers( AbstractProcessingHandler $handler, array $specialHandlers = [] - ): HandlerInterface - { + ): HandlerInterface { if (in_array(self::SPECIAL_HANDLERS_BUFFERING, $specialHandlers, true)) { $handler = $this->setBuffering($handler); } elseif (in_array(self::SPECIAL_HANDLERS_BUFFERING, array_keys($specialHandlers), true)) { @@ -170,16 +166,14 @@ class LoggerFactory AbstractHandler $handler, int $bufferLimit = 0, int $loglevel = Logger::DEBUG - ): BufferHandler - { + ): BufferHandler { return new BufferHandler($handler, $bufferLimit, $loglevel); } public function setLogItemsOnErrorOnly( AbstractHandler $handler, int $activationLevel = Logger::ERROR - ): FingersCrossedHandler - { + ): FingersCrossedHandler { return new FingersCrossedHandler( $handler, new ErrorLevelActivationStrategy($activationLevel) @@ -190,8 +184,7 @@ class LoggerFactory AbstractHandler $handler, int $deduplicationLevel = Logger::ERROR, int $time = 60 - ): DeduplicationHandler - { + ): DeduplicationHandler { return new DeduplicationHandler($handler, null, $deduplicationLevel, $time); } -} \ No newline at end of file +} diff --git a/tests/LoggerFactoryTest.php b/tests/LoggerFactoryTest.php index b30e555..a55268e 100644 --- a/tests/LoggerFactoryTest.php +++ b/tests/LoggerFactoryTest.php @@ -1,5 +1,18 @@ + * @link https://www.oxidmodule.com + */ + namespace D3\LoggerFactory\tests; use D3\LoggerFactory\LoggerFactory; @@ -14,6 +27,9 @@ use PHPUnit\Framework\MockObject\MockObject; use ReflectionException; use RuntimeException; +/** + * @coversNothing + */ class LoggerFactoryTest extends ApiTestCase { /** @@ -181,17 +197,17 @@ class LoggerFactoryTest extends ApiTestCase yield 'simple buffering' => [[LoggerFactory::SPECIAL_HANDLERS_BUFFERING], BufferHandler::class]; yield 'advanced buffering' => [ [LoggerFactory::SPECIAL_HANDLERS_BUFFERING => [LoggerFactory::BUFFERING_OPTION_LIMIT => 10]], - BufferHandler::class + BufferHandler::class, ]; yield 'simple logOnErrorOnly' => [[LoggerFactory::SPECIAL_HANDLERS_LOG_ON_ERROR_ONLY], FingersCrossedHandler::class]; yield 'advanced logOnErrorOnly' => [ [LoggerFactory::SPECIAL_HANDLERS_LOG_ON_ERROR_ONLY => [LoggerFactory::LOGONERRORONLY_LEVEL => Logger::DEBUG]], - FingersCrossedHandler::class + FingersCrossedHandler::class, ]; yield 'simple deduplicate' => [[LoggerFactory::SPECIAL_HANDLERS_MAKE_UNIQUE], DeduplicationHandler::class]; yield 'advanced deduplicate' => [ [LoggerFactory::SPECIAL_HANDLERS_MAKE_UNIQUE => [LoggerFactory::MAKEUNIQUE_OPTION_TIME => 30]], - DeduplicationHandler::class + DeduplicationHandler::class, ]; } @@ -263,4 +279,4 @@ class LoggerFactoryTest extends ApiTestCase ) ); } -} \ No newline at end of file +}