v1.0.1 fixes

Author: Asisyas

src/Business/Executor/HttpExecutorLoggerAwareDecoratorFactory.php

@@ -15,7 +15,7 @@
 
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactoryInterface;
 use Micro\Plugin\Http\HttpLoggerPluginConfigurationInterface;
-use Micro\Plugin\Logger\LoggerFacadeInterface;
+use Micro\Plugin\Logger\Facade\LoggerFacadeInterface;
 
 /**
  * @author Stanislau Komar <kost@micro-php.net>

src/HttpLoggerPlugin.php

@@ -24,7 +24,7 @@
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactoryInterface;
 use Micro\Plugin\Http\Decorator\HttpFacadeLoggerDecorator;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
-use Micro\Plugin\Logger\LoggerFacadeInterface;
+use Micro\Plugin\Logger\Facade\LoggerFacadeInterface;
 use Micro\Plugin\Logger\LoggerPlugin;
 
 /**

src/HttpLoggerPluginConfiguration.php

@@ -14,6 +14,7 @@
 namespace Micro\Plugin\Http;
 
 use Micro\Framework\Kernel\Configuration\PluginConfiguration;
+use Micro\Plugin\Logger\LoggerPluginConfiguration;
 
 /**
  * @author Stanislau Komar <kost@micro-php.net>
@@ -31,14 +32,14 @@ class HttpLoggerPluginConfiguration extends PluginConfiguration implements HttpL
 
     public const DECORATION_DEFAULT = 10;
 
-    public function getAccessLoggerName(): string|null
+    public function getAccessLoggerName(): string
     {
-        return $this->configuration->get(self::CFG_LOGGER_ACCESS);
+        return (string) $this->configuration->get(self::CFG_LOGGER_ACCESS, LoggerPluginConfiguration::LOGGER_NAME_DEFAULT);
     }
 
-    public function getErrorLoggerName(): string|null
+    public function getErrorLoggerName(): string
     {
-        return $this->configuration->get(self::CFG_LOGGER_ERROR);
+        return (string) $this->configuration->get(self::CFG_LOGGER_ERROR, LoggerPluginConfiguration::LOGGER_NAME_DEFAULT);
     }
 
     public function getWeight(): int

src/HttpLoggerPluginConfigurationInterface.php

@@ -18,9 +18,9 @@
  */
 interface HttpLoggerPluginConfigurationInterface
 {
-    public function getAccessLoggerName(): string|null;
+    public function getAccessLoggerName(): string;
 
-    public function getErrorLoggerName(): string|null;
+    public function getErrorLoggerName(): string;
 
     public function getErrorLogFormat(): string;
 

tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorFactoryTest.php

@@ -16,7 +16,7 @@
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactoryInterface;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
 use Micro\Plugin\Http\HttpLoggerPluginConfigurationInterface;
-use Micro\Plugin\Logger\LoggerFacadeInterface;
+use Micro\Plugin\Logger\Facade\LoggerFacadeInterface;
 use PHPUnit\Framework\TestCase;
 
 class HttpExecutorLoggerAwareDecoratorFactoryTest extends TestCase

tests/Unit/HttpLoggerPluginConfigurationTest.php

@@ -14,6 +14,7 @@
 use Micro\Framework\Kernel\Configuration\ApplicationConfigurationInterface;
 use Micro\Plugin\Http\HttpLoggerPluginConfiguration;
 use Micro\Plugin\Http\HttpLoggerPluginConfigurationInterface;
+use Micro\Plugin\Logger\LoggerPluginConfiguration;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -56,9 +57,9 @@ public function testGetAccessLoggerName()
             ->expects($this->once())
             ->method('get')
             ->with(HttpLoggerPluginConfiguration::CFG_LOGGER_ACCESS)
-            ->willReturn(null);
+            ->willReturn(LoggerPluginConfiguration::LOGGER_NAME_DEFAULT);
 
-        $this->assertNull($this->loggerConfiguration->getAccessLoggerName());
+        $this->assertEquals(LoggerPluginConfiguration::LOGGER_NAME_DEFAULT, $this->loggerConfiguration->getAccessLoggerName());
     }
 
     public function testGetAccessLogFormat()
@@ -74,6 +75,12 @@ public function testGetAccessLogFormat()
 
     public function testGetErrorLoggerName()
     {
-        $this->assertNull($this->loggerConfiguration->getErrorLoggerName());
+        $this->applicationConfiguration
+            ->expects($this->once())
+            ->method('get')
+            ->with(HttpLoggerPluginConfiguration::CFG_LOGGER_ERROR)
+            ->willReturn(LoggerPluginConfiguration::LOGGER_NAME_DEFAULT);
+
+        $this->assertEquals(LoggerPluginConfiguration::LOGGER_NAME_DEFAULT, $this->loggerConfiguration->getErrorLoggerName());
     }
 }