Merge pull request #607 from phil-davis/support-sabre-xml-v4-4.5-series

Support sabre/xml v4

Author: phil-davis

CHANGELOG.md

@@ -1,6 +1,16 @@
 ChangeLog
 =========
 
+4.5.3 (2023-01-22)
+------------------
+
+* #607: Apply 'Support sabre/xml v4' and needed code changes to 4.5 branch (@phil-davis)
+
+4.5.2 (2023-01-20)
+------------------
+
+* #603: Support sabre/xml v4 (@gharlan)
+
 4.5.1 (2022-10-09)
 ------------------
 

composer.json

@@ -34,7 +34,7 @@
     "require" : {
         "php"          : "^7.1 || ^8.0",
         "ext-mbstring" : "*",
-        "sabre/xml"    : "^2.1"
+        "sabre/xml"    : "^2.1 || ^3.0 || ^4.0"
     },
     "require-dev" : {
         "friendsofphp/php-cs-fixer": "~2.17.1",

lib/Component.php

@@ -368,7 +368,7 @@ public function jsonSerialize()
      *
      * @param Xml\Writer $writer XML writer
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         $components = [];
         $properties = [];

lib/Component/VCard.php

@@ -473,7 +473,7 @@ public function jsonSerialize()
      *
      * @param Xml\Writer $writer XML writer
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         $propertiesByGroup = [];
 

lib/Node.php

@@ -82,7 +82,7 @@ abstract public function jsonSerialize();
      *
      * @param Xml\Writer $writer XML writer
      */
-    abstract public function xmlSerialize(Xml\Writer $writer);
+    abstract public function xmlSerialize(Xml\Writer $writer): void;
 
     /**
      * Call this method on a document if you're done using it.

lib/Parameter.php

@@ -334,7 +334,7 @@ public function jsonSerialize()
      *
      * @param Xml\Writer $writer XML writer
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         foreach (explode(',', $this->value) as $value) {
             $writer->writeElement('text', $value);

lib/Parser/XML/Element/KeyValue.php

@@ -34,10 +34,8 @@ class KeyValue extends SabreXml\Element\KeyValue
      * the next element.
      *
      * @param XML\Reader $reader
-     *
-     * @return mixed
      */
-    public static function xmlDeserialize(SabreXml\Reader $reader)
+    public static function xmlDeserialize(SabreXml\Reader $reader): array
     {
         // If there's no children, we don't do anything.
         if ($reader->isEmptyElement) {

lib/Property.php

@@ -318,7 +318,7 @@ public function setXmlValue(array $value)
      *
      * @param Xml\Writer $writer XML writer
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         $parameters = [];
 

lib/Version.php

@@ -14,5 +14,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '4.5.1';
+    public const VERSION = '4.5.3';
 }

tests/VObject/TimeZoneUtilTest.php

@@ -181,6 +181,17 @@ public function testTimeZoneIdentifiers($tzid)
      */
     public function testTimeZoneBCIdentifiers($tzid)
     {
+        /*
+         * A regression was introduced in PHP 8.1.14 and 8.2.1
+         * Timezone ids containing a "+" like "GMT+10" do not work.
+         * See https://github.com/php/php-src/issues/10218
+         * The regression should be fixed in the next patch releases of PHP
+         * that should be released in Feb 2023.
+         */
+        $versionOfPHP = \phpversion();
+        if ((('8.1.14' == $versionOfPHP) || ('8.2.1' == $versionOfPHP)) && \str_contains($tzid, '+')) {
+            $this->markTestSkipped("Timezone ids containing '+' do not work on PHP $versionOfPHP");
+        }
         $tz = TimeZoneUtil::getTimeZone($tzid);
         $ex = new \DateTimeZone($tzid);