diff options
author | Remi Collet <remi@remirepo.net> | 2021-12-03 12:24:40 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2021-12-03 12:24:40 +0100 |
commit | 1488ea9371b9669d1b4aa04ac995bd9c4b915dee (patch) | |
tree | 9bffebcc0d6a51924d3bfa91ed35f9aa9db72948 /21.patch | |
parent | 3b81c1edc187dc21dd7af25461fd4db99ca64df4 (diff) |
update to 2.14.0
keep compatibility using laminas-zendframework-bridge
as this is only used using compat autolader
drop patch merged upstream
Diffstat (limited to '21.patch')
-rw-r--r-- | 21.patch | 22 |
1 files changed, 22 insertions, 0 deletions
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); + } + |