From 68e48f1e71096d14ffae9f2dc97fa9c8b51d476f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Nov 2019 11:55:36 +0100 Subject: - update to 2.0.4 - drop patch merged upstream --- Horde_Xml_Wbxml-php74.patch | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 Horde_Xml_Wbxml-php74.patch (limited to 'Horde_Xml_Wbxml-php74.patch') diff --git a/Horde_Xml_Wbxml-php74.patch b/Horde_Xml_Wbxml-php74.patch deleted file mode 100644 index be35987..0000000 --- a/Horde_Xml_Wbxml-php74.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/lib/Horde/Xml/Wbxml/Decoder.php b/lib/Horde/Xml/Wbxml/Decoder.php -index 2750a34..e1f71fe 100644 ---- a/lib/Horde/Xml/Wbxml/Decoder.php -+++ b/lib/Horde/Xml/Wbxml/Decoder.php -@@ -89,7 +89,7 @@ class Horde_Xml_Wbxml_Decoder extends Horde_Xml_Wbxml_ContentHandler - */ - public function getByte($input) - { -- return ord($input{$this->_strpos++}); -+ return ord($input[$this->_strpos++]); - } - - /** -diff --git a/lib/Horde/Xml/Wbxml/Encoder.php b/lib/Horde/Xml/Wbxml/Encoder.php -index 69b14cb..dbacb86 100644 ---- a/lib/Horde/Xml/Wbxml/Encoder.php -+++ b/lib/Horde/Xml/Wbxml/Encoder.php -@@ -49,7 +49,7 @@ class Horde_Xml_Wbxml_Encoder extends Horde_Xml_Wbxml_ContentHandler - /** - * Constructor. - */ -- public function Horde_Xml_Wbxml_Encoder() -+ public function __construct() - { - $this->_dtdManager = new Horde_Xml_Wbxml_DtdManager(); - $this->_stringTable = new Horde_Xml_Wbxml_HashTable(); -@@ -213,7 +213,7 @@ class Horde_Xml_Wbxml_Encoder extends Horde_Xml_Wbxml_ContentHandler - - $bytes = array(); - for ($i = 0; $i < $nbytes; $i++) { -- $bytes[] = $string{$i}; -+ $bytes[] = $string[$i]; - } - - return $bytes; -@@ -422,7 +422,7 @@ class Horde_Xml_Wbxml_Encoder extends Horde_Xml_Wbxml_ContentHandler - $this->_output .= chr(Horde_Xml_Wbxml::GLOBAL_TOKEN_SWITCH_PAGE); - $this->_output .= chr($cp); - } else { -- $this->_subParser = new Horde_Xml_Wbxml_Encoder(true); -+ $this->_subParser = new Horde_Xml_Wbxml_Encoder(); - $this->_subParserStack = 1; - } - } -- cgit