From 1488ea9371b9669d1b4aa04ac995bd9c4b915dee Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 3 Dec 2021 12:24:40 +0100
Subject: update to 2.14.0

keep compatibility using laminas-zendframework-bridge
  as this is only used using compat autolader
drop patch merged upstream
---
 21.patch             | 22 ++++++++++++++++++++++
 composer.json        |  5 ++---
 php-laminas-log.spec | 18 +++++++++++++-----
 3 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 21.patch

diff --git a/21.patch b/21.patch
new file mode 100644
index 0000000..59cf70a
--- /dev/null
+++ b/21.patch
@@ -0,0 +1,22 @@
+From dddd282052196dd8ae6851e3abc0536d4f49b3b1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 30 Jul 2021 15:48:11 +0200
+Subject: [PATCH] fix for laminas/escaper 2.8
+
+---
+ src/Formatter/Xml.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Formatter/Xml.php b/src/Formatter/Xml.php
+index c724057..7bc25b9 100644
+--- a/src/Formatter/Xml.php
++++ b/src/Formatter/Xml.php
+@@ -232,7 +232,7 @@ protected function buildElementTree(DOMDocument $doc, DOMElement $rootElement, $
+                 $value = $this->getEscaper()->escapeHtml(
+                     '"Object" of type ' . get_class($value) . " does not support __toString() method"
+                 );
+-            } else {
++            } else if ($value) {
+                 $value = $this->getEscaper()->escapeHtml($value);
+             }
+ 
diff --git a/composer.json b/composer.json
index 46940f8..e4e3626 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,6 @@
         "php": "^7.3 || ~8.0.0",
         "laminas/laminas-servicemanager": "^3.3.0",
         "laminas/laminas-stdlib": "^3.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "psr/log": "^1.1.2"
     },
     "require-dev": {
@@ -77,7 +76,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-log": "^2.12.0"
+    "conflict": {
+        "zendframework/zend-log": "*"
     }
 }
diff --git a/php-laminas-log.spec b/php-laminas-log.spec
index 05d8456..0a9ef6d 100644
--- a/php-laminas-log.spec
+++ b/php-laminas-log.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    6ac20830d4f324b4662fc454fcc1954436bfced3
+%global gh_commit    39f3dcbd77fd0d84b190ff1332f5d3d28d56527e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-log
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.13.1
+Version:        2.14.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -90,7 +90,6 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "php": "^7.3 || ~8.0.0",
 #        "laminas/laminas-servicemanager": "^3.3.0",
 #        "laminas/laminas-stdlib": "^3.0",
-#        "laminas/laminas-zendframework-bridge": "^1.0",
 #        "psr/log": "^1.1.2"
 Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
@@ -155,7 +154,6 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-
 mv LICENSE.md LICENSE
 
 
@@ -223,7 +221,7 @@ exit (class_exists("\\Zend\\%{library}\\Logger") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} || ret=1
@@ -246,6 +244,16 @@ exit $ret
 
 
 %changelog
+* Fri Dec  3 2021 Remi Collet <remi@remirepo.net> - 2.14.0-1
+- update to 2.14.0
+- keep compatibility using laminas-zendframework-bridge
+  as this is only used using compat autolader
+- drop patch merged upstream
+
+* Fri Jul 30 2021 Remi Collet <remi@remirepo.net> - 2.13.1-3
+- fix for laminas/escaper 2.8 from
+  https://github.com/laminas/laminas-log/pull/21
+
 * Mon Feb 15 2021 Remi Collet <remi@remirepo.net> - 2.13.1-1
 - update to 2.13.1 (no change)
 
-- 
cgit