added improvements on adapter builder for logger and renamed PSRAdapter

Author: mmelograno

CHANGES.txt

@@ -1,7 +1,7 @@
 7.1.4 (Sep XX, 2022)
  - Updated dependencies to allow `psr/log` 2 and 3.
  - Removed `phpdocumentor/phpdocumentor` dependency.
- - Updated `Logger` and `LoggerTrait` to be compliant with `psr/log` 3.
+ - Added `PSR3LoggerAdapter` to support `psr/log: 1 - 3` versions.
 
 7.1.3 (Aug 24, 2022)
  - Updated `predis` dependency to `^2.0`.

src/SplitIO/Component/Initialization/LoggerFactory.php

@@ -3,7 +3,7 @@
 
 use Psr\Log\LogLevel;
 use SplitIO\Component\Log\Logger;
-use SplitIO\Component\Log\LoggerAdapterPSR;
+use SplitIO\Component\Log\PSR3LoggerAdapter;
 use SplitIO\Component\Log\LogLevelEnum;
 use SplitIO\Component\Log\Handler\Echos;
 use SplitIO\Component\Log\Handler\Stdout;
@@ -16,35 +16,26 @@ class LoggerFactory
      * Builds defaultLogger
      *
      * @param $options
-     * @param $level
-     * @return SplitIO\Component\Log\Logger
+     * @return SplitIO\Component\Log\Handler
      */
-    private static function setDefaultLogger(array $options, $level)
+    private static function buildAdapter(array $options)
     {
         $adapter = (isset($options['adapter'])) ? $options['adapter'] : null;
 
         switch ($adapter) {
             case 'stdout':
-                $logAdapter = new Stdout();
-                break;
+                return new Stdout();
 
             case 'echo':
-                $logAdapter = new Echos();
-                break;
+                return new Echos();
 
             case 'void':
-                $logAdapter = new VoidHandler();
-                break;
+                return new VoidHandler();
 
             case 'syslog':
             default:
-                $logAdapter = new Syslog();
-                break;
+                return new Syslog();
         }
-
-
-
-        return new Logger($logAdapter, $level);
     }
 
     /**
@@ -61,9 +52,9 @@ public static function setupLogger(array $options)
         }
 
         if (!isset($options['psr3-instance'])) {
-            return self::setDefaultLogger($options, $level);
+            return new Logger(self::buildAdapter($options), $level);
         }
 
-        return new Logger(new LoggerAdapterPSR($options['psr3-instance']), $level);
+        return new Logger(new PSR3LoggerAdapter($options['psr3-instance']), $level);
     }
 }

src/SplitIO/Component/Log/LoggerAdapterPSR.php renamed to src/SplitIO/Component/Log/PSR3LoggerAdapter.php

@@ -5,16 +5,16 @@
 use SplitIO\Component\Log\Handler\LogHandlerInterface;
 
 /**
- * Class LoggerAdapterPSR
+ * Class PSR3LoggerAdapter
  * Logger Handler for PSR3
  * @package namespace SplitIO\Component\Log;
  */
-class LoggerAdapterPSR implements LogHandlerInterface
+class PSR3LoggerAdapter implements LogHandlerInterface
 {
     /**
      * @var LogHandlerInterface
      */
-    protected $logger;
+    private $logger;
 
     /**
      * Logger constructor
@@ -32,12 +32,14 @@ public function __construct(LoggerInterface $logger)
      */
     public function write($logLevel, $message)
     {
-        try {
-            if (!is_string($message) || !$message instanceof Stringable) {
-                $message = json_encode($message);
+        if (!is_string($message) || !$message instanceof Stringable) {
+            try {
+                $this->logger->log($logLevel, json_encode($message));
+            } catch (\Exception $e) {
+                $this->logger->log(LogLevel::ERROR, "error serializing non-stringable object when trying to log message of type " + gettype($message));
             }
+        } else {
             $this->logger->log($logLevel, $message);
-        } catch (\Exception $e) {
         }
     }
 }

src/SplitIO/Version.php

@@ -3,5 +3,5 @@
 
 class Version
 {
-    const CURRENT = '7.1.4-rc4';
+    const CURRENT = '7.1.4-rc5';
 }