clean logger instantiation

Author: mmelograno

src/SplitIO/Component/Initialization/LoggerFactory.php

@@ -1,24 +1,52 @@
 <?php
 namespace SplitIO\Component\Initialization;
 
+use Psr\Log\LogLevel;
 use SplitIO\Component\Log\Logger;
-use SplitIO\Component\Log\LoggerAdapterPSR3;
+use SplitIO\Component\Log\LoggerAdapterPSR;
+use SplitIO\Component\Log\LogLevelEnum;
+use SplitIO\Component\Log\Handler\Echos;
+use SplitIO\Component\Log\Handler\Stdout;
+use SplitIO\Component\Log\Handler\Syslog;
+use SplitIO\Component\Log\Handler\VoidHandler;
 
 class LoggerFactory
 {
     private static function setDefaultLogger(array $options) {
         $adapter = (isset($options['adapter'])) ? $options['adapter'] : null;
         $level = (isset($options['level'])) ? $options['level'] : null;
 
-        LoggerTrait::addLogger($adapter, $level);
+        switch ($adapter) {
+            case 'stdout':
+                $logAdapter = new Stdout();
+                break;
+
+            case 'echo':
+                $logAdapter = new Echos();
+                break;
+
+            case 'void':
+                $logAdapter = new VoidHandler();
+                break;
+
+            case 'syslog':
+            default:
+                $logAdapter = new Syslog();
+                break;
+        }
+
+        if (! LogLevelEnum::isValid($level)) {
+            $level = LogLevel::WARNING;
+        }
+
+        return new Logger($logAdapter, $level);
     }
 
     public static function setupLogger(array $options) {
         if (!isset($options['psr3-instance'])) {
-            self::setDefaultLogger($options);
-            return;
+            return self::setDefaultLogger($options);
         }
 
-        LoggerTrait::addLogger(null, null, new Logger(new LoggerAdapterPSR3($options['psr3-instance'])));
+        return new Logger(new LoggerAdapterPSR($options['psr3-instance']));
     }
 }

src/SplitIO/Component/Initialization/LoggerTrait.php

@@ -3,6 +3,7 @@
 
 use SplitIO\Component\Initialization\CacheTrait;
 use SplitIO\Component\Initialization\LoggerFactory;
+use SplitIO\Component\Common\ServiceProvider;
 use SplitIO\Exception\Exception;
 use SplitIO\Sdk\Factory\LocalhostSplitFactory;
 use SplitIO\Sdk\Factory\SplitFactory;
@@ -61,7 +62,8 @@ public static function factory($apiKey = 'localhost', array $options = array())
      */
     private static function registerLogger(array $options)
     {
-        LoggerFactory::setupLogger($options);
+        $logger = LoggerFactory::setupLogger($options);
+        ServiceProvider::registerLogger($logger);
     }
 
     private static function registerCache(array $options)

src/SplitIO/Sdk.php

@@ -1,7 +1,8 @@
 <?php
 namespace SplitIO\Test\Suite\Engine;
 
-use SplitIO\Component\Initialization\LoggerTrait;
+use SplitIO\Component\Initialization\LoggerFactory;
+use SplitIO\Component\Common\ServiceProvider;
 use SplitIO\Component\Log\LogLevelEnum;
 use SplitIO\Engine\Splitter;
 use SplitIO\Grammar\Condition\Partition;
@@ -15,7 +16,8 @@ class SplitterTest extends \PHPUnit\Framework\TestCase
 
     public function testDiLog()
     {
-        LoggerTrait::addLogger('stdout', LogLevelEnum::ERROR);
+        $logger = LoggerFactory::setupLogger(array('adapter' => 'stdout', 'level' => 'error'));
+        ServiceProvider::registerLogger($logger);
 
         $this->assertTrue(true);
     }