Merge ~athos-ribeiro/ubuntu/+source/php-klogger:merge-lp1995965-kinetic into ubuntu/+source/php-klogger:debian/sid

[Athos Ribeiro]

php-klogger merge for the lunar cycle.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1995965-merge-php-klogger-kinetic/+packages

[Bryce Harrington (bryce)]

LGTM, +1

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Bryce!

Uploaded. I just realized that the branch name says kinetic, but that is due to my scripts fetching the name of the host series (I usually do this in a ubuntu+1 machine) and the fact that I did not upgraded my laptop to lunar yet.

$ dput ubuntu ../php-klogger_1.2.2-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../php-klogger_1.2.2-1ubuntu1_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../php-klogger_1.2.2-1ubuntu1.dsc: Valid signature from 033C4CA276024834
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading php-klogger_1.2.2-1ubuntu1.dsc: done.
  Uploading php-klogger_1.2.2.orig.tar.gz: done.
  Uploading php-klogger_1.2.2-1ubuntu1.debian.tar.xz: done.
  Uploading php-klogger_1.2.2-1ubuntu1_source.buildinfo: done.
  Uploading php-klogger_1.2.2-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index a798d03..0db8a1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php-klogger (1.2.2-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1995965). Remaining changes:
+    - d/p/0005-psr-logger-compliance.patch: comply with php-psr-log 3.
+      (LP #1967796)
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 08 Nov 2022 13:19:14 -0300
+
 php-klogger (1.2.2-1) unstable; urgency=medium
 
   * New upstream version 1.2.2
@@ -13,6 +21,19 @@ php-klogger (1.2.2-1) unstable; urgency=medium
 
  -- James Valleroy <[e-mail]>  Mon, 05 Sep 2022 10:39:08 -0400
 
+php-klogger (1.2.1-4ubuntu1) jammy; urgency=medium
+
+  * d/p/0005-psr-logger-compliance.patch: comply with php-psr-log 3.
+    (LP: #1967796)
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 04 Apr 2022 11:39:42 -0300
+
+php-klogger (1.2.1-4build1) jammy; urgency=medium
+
+  * No change rebuild for php-psr-log 3
+
+ -- Bryce Harrington <[e-mail]>  Fri, 25 Feb 2022 06:27:22 +0000
+
 php-klogger (1.2.1-4) unstable; urgency=medium
 
   * d/control: Move to Debian PHP PEAR Maintainers
diff --git a/debian/control b/debian/control
index 9f8080c..64d793b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: php-klogger
 Section: php
 Priority: optional
-Maintainer: Debian PHP PEAR Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <[e-mail]>
 Uploaders:
  James Valleroy <[e-mail]>,
  Sunil Mohan Adapa <[e-mail]>
diff --git a/debian/patches/0005-psr-logger-compliance.patch b/debian/patches/0005-psr-logger-compliance.patch
new file mode 100644
index 0000000..d6a8a2e
--- /dev/null
+++ b/debian/patches/0005-psr-logger-compliance.patch
@@ -0,0 +1,34 @@
+Description: Comply with psr/log 3
+Author: Athos Ribeiro <[e-mail]>
+Forwarded: https://github.com/katzgrau/KLogger/pull/104
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php-klogger/+bug/1967796
+Last-Update: 2022-11-08
+
+--- a/src/Logger.php
++++ b/src/Logger.php
+@@ -204,11 +204,11 @@
+      * Logs with an arbitrary level.
+      *
+      * @param mixed $level
+-     * @param string $message
++     * @param Stringable|string $message
+      * @param array $context
+-     * @return null
++     * @return void
+      */
+-    public function log($level, $message, array $context = array())
++    public function log($level, \Stringable|string $message, array $context = array()): void
+     {
+         if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {
+             return;
+--- a/composer.json
++++ b/composer.json
+@@ -5,7 +5,7 @@
+     "keywords": ["logging"],
+     "require": {
+         "php": ">=5.3",
+-        "psr/log": "^1.0.0"
++        "psr/log": "^3.0.0"
+     },
+     "require-dev": {
+         "phpunit/phpunit": "^6.0.0"
diff --git a/debian/patches/series b/debian/patches/series
index 534c9d6..a52a5e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Load-psr-log-directly.patch
 0004-Support-phpunit-v8.patch
+0005-psr-logger-compliance.patch