From e6f13d722bcba58e936192bacc71eef5c993b55c Mon Sep 17 00:00:00 2001
From: Paul Klimov <klimov.paul@gmail.com>
Date: Tue, 18 Jul 2023 15:48:02 +0300
Subject: [PATCH] fix PHP 7.x compatibility

---
 src/PsrLogger.php                             | 37 +++++--------------
 src/compatibility/PsrLogger.v7.php            | 17 +++++++++
 src/compatibility/PsrLogger.v8.php            | 17 +++++++++
 tests/support/ArrayLogger.php                 | 18 +--------
 .../support/compatibility/ArrayLogger.v7.php  | 19 ++++++++++
 .../support/compatibility/ArrayLogger.v8.php  | 19 ++++++++++
 6 files changed, 83 insertions(+), 44 deletions(-)
 create mode 100644 src/compatibility/PsrLogger.v7.php
 create mode 100644 src/compatibility/PsrLogger.v8.php
 create mode 100644 tests/support/compatibility/ArrayLogger.v7.php
 create mode 100644 tests/support/compatibility/ArrayLogger.v8.php

diff --git a/src/PsrLogger.php b/src/PsrLogger.php
index a63e33a..c00df85 100644
--- a/src/PsrLogger.php
+++ b/src/PsrLogger.php
@@ -1,33 +1,14 @@
 <?php
-
-namespace yii1tech\psr\log;
+/**
+ * Splits actual class declaration into 2 separated branches, allowing support both PHP 8.x and PHP 7.x.
+ * This is necessary since {@see \Psr\Log\LoggerInterface} changes signature over different PHP versions.
+ *
+ * @author Paul Klimov <klimov.paul@gmail.com>
+ * @since 1.0
+ */
 
 if (version_compare(phpversion(), '8.0', '>=')) {
-    /**
-     * {@inheritdoc}
-     */
-    class PsrLogger extends AbstractPsrLogger
-    {
-        /**
-         * {@inheritdoc}
-         */
-        public function log($level, string|\Stringable $message, array $context = []): void
-        {
-            $this->writeLog($level, $message, $context);
-        }
-    }
+    require __DIR__ . '/compatibility/PsrLogger.v8.php';
 } else {
-    /**
-     * {@inheritdoc}
-     */
-    class PsrLogger extends AbstractPsrLogger
-    {
-        /**
-         * {@inheritdoc}
-         */
-        public function log($level, $message, array $context = []): void
-        {
-            $this->writeLog($level, $message, $context);
-        }
-    }
+    require __DIR__ . '/compatibility/PsrLogger.v7.php';
 }
\ No newline at end of file
diff --git a/src/compatibility/PsrLogger.v7.php b/src/compatibility/PsrLogger.v7.php
new file mode 100644
index 0000000..2412e6d
--- /dev/null
+++ b/src/compatibility/PsrLogger.v7.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace yii1tech\psr\log;
+
+/**
+ * {@inheritdoc}
+ */
+class PsrLogger extends AbstractPsrLogger
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function log($level, $message, array $context = []): void
+    {
+        $this->writeLog($level, $message, $context);
+    }
+}
\ No newline at end of file
diff --git a/src/compatibility/PsrLogger.v8.php b/src/compatibility/PsrLogger.v8.php
new file mode 100644
index 0000000..22c1ed9
--- /dev/null
+++ b/src/compatibility/PsrLogger.v8.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace yii1tech\psr\log;
+
+/**
+ * {@inheritdoc}
+ */
+class PsrLogger extends AbstractPsrLogger
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function log($level, string|\Stringable $message, array $context = []): void
+    {
+        $this->writeLog($level, $message, $context);
+    }
+}
\ No newline at end of file
diff --git a/tests/support/ArrayLogger.php b/tests/support/ArrayLogger.php
index 1a48638..35bc0ad 100644
--- a/tests/support/ArrayLogger.php
+++ b/tests/support/ArrayLogger.php
@@ -1,21 +1,7 @@
 <?php
 
-namespace yii1tech\psr\log\test\support;
-
 if (version_compare(phpversion(), '8.0', '>=')) {
-    class ArrayLogger extends AbstractArrayLogger
-    {
-        public function log($level, string|\Stringable $message, array $context = []): void
-        {
-            $this->writeLog($level, $message, $context);
-        }
-    }
+    require __DIR__ . '/compatibility/ArrayLogger.v8.php';
 } else {
-    class ArrayLogger extends AbstractArrayLogger
-    {
-        public function log($level, $message, array $context = []): void
-        {
-            $this->writeLog($level, $message, $context);
-        }
-    }
+    require __DIR__ . '/compatibility/ArrayLogger.v7.php';
 }
\ No newline at end of file
diff --git a/tests/support/compatibility/ArrayLogger.v7.php b/tests/support/compatibility/ArrayLogger.v7.php
new file mode 100644
index 0000000..2783363
--- /dev/null
+++ b/tests/support/compatibility/ArrayLogger.v7.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace yii1tech\psr\log\test\support;
+
+use yii1tech\psr\log\test\support\AbstractArrayLogger;
+
+/**
+ * {@inheritdoc}
+ */
+class ArrayLogger extends AbstractArrayLogger
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function log($level, $message, array $context = []): void
+    {
+        $this->writeLog($level, $message, $context);
+    }
+}
\ No newline at end of file
diff --git a/tests/support/compatibility/ArrayLogger.v8.php b/tests/support/compatibility/ArrayLogger.v8.php
new file mode 100644
index 0000000..2684247
--- /dev/null
+++ b/tests/support/compatibility/ArrayLogger.v8.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace yii1tech\psr\log\test\support;
+
+use yii1tech\psr\log\test\support\AbstractArrayLogger;
+
+/**
+ * {@inheritdoc}
+ */
+class ArrayLogger extends AbstractArrayLogger
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function log($level, string|\Stringable $message, array $context = []): void
+    {
+        $this->writeLog($level, $message, $context);
+    }
+}
\ No newline at end of file