Upgrade dependencies and set minimal PHP version to 7.4

.github/workflows/ci.yml

@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+        php-versions: [ '7.4', '8.0', '8.1', '8.2' ]
         coverage: [ 'xdebug' ]
         streaming: [ false ]
         include:

.gitignore

@@ -37,4 +37,4 @@ build.properties
 docs/api
 docs/wikidocs
 
-.php_cs.cache
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,15 @@
+<?php
+
+$config = new PhpCsFixer\Config();
+$config->getFinder()
+    ->exclude('vendor')
+    ->in(__DIR__)
+    ->append([
+        __FILE__,
+    ]);
+$config->setRules([
+    '@PSR1' => true,
+    '@Symfony' => true,
+]);
+
+return $config;

composer.json

@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": "^7.1.0 || ^8.0",
-        "sabre/vobject": "^4.2.1",
-        "sabre/event" : "^5.0",
-        "sabre/xml"  : "^2.0.1",
-        "sabre/http" : "^5.0.5",
-        "sabre/uri" : "^2.0",
+        "php": "^7.4 || ^8.0",
+        "sabre/vobject": "^4.5.2",
+        "sabre/event" : "^6.0",
+        "sabre/xml"  : "^3.0 || ^4.0",
+        "sabre/http" : "^6.0 || ^7.0",
+        "sabre/uri" : "^2.3 || ^3.0",
         "ext-dom": "*",
         "ext-pcre": "*",
         "ext-spl": "*",
@@ -33,10 +33,10 @@
         "ext-json": "*"
     },
     "require-dev" : {
-        "friendsofphp/php-cs-fixer": "^2.17.1",
-        "phpstan/phpstan": "^0.12",
-        "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
-        "monolog/monolog": "^1.18"
+        "friendsofphp/php-cs-fixer": "^3.14",
+        "phpstan/phpstan": "^1.9",
+        "phpunit/phpunit" : "^9.0",
+        "monolog/monolog": "^2.8"
     },
     "suggest" : {
         "ext-curl" : "*",

lib/CalDAV/Xml/Notification/Invite.php

@@ -182,7 +182,7 @@ public function __construct(array $values)
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $writer->writeElement('{'.CalDAV\Plugin::NS_CALENDARSERVER.'}invite-notification');
     }

lib/CalDAV/Xml/Notification/InviteReply.php

@@ -131,7 +131,7 @@ public function __construct(array $values)
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $writer->writeElement('{'.CalDAV\Plugin::NS_CALENDARSERVER.'}invite-reply');
     }

lib/CalDAV/Xml/Notification/SystemStatus.php

@@ -91,7 +91,7 @@ public function __construct($id, $etag, $type = self::TYPE_HIGH, $description =
      * Important note 2: If you are writing any new elements, you are also
      * responsible for closing them.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         switch ($this->type) {
             case self::TYPE_LOW:

lib/CalDAV/Xml/Property/AllowedSharingModes.php

@@ -69,7 +69,7 @@ public function __construct($canBeShared, $canBePublished)
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         if ($this->canBeShared) {
             $writer->writeElement('{'.Plugin::NS_CALENDARSERVER.'}can-be-shared');

lib/CalDAV/Xml/Property/EmailAddressSet.php

@@ -62,7 +62,7 @@ public function getValue()
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->emails as $email) {
             $writer->writeElement('{http://calendarserver.org/ns/}email-address', $email);

lib/CalDAV/Xml/Property/Invite.php

@@ -68,7 +68,7 @@ public function getValue()
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $cs = '{'.Plugin::NS_CALENDARSERVER.'}';
 

lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php

@@ -77,7 +77,7 @@ public function getValue()
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         switch ($this->value) {
             case self::TRANSPARENT:

lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php

@@ -68,7 +68,7 @@ public function getValue()
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->components as $component) {
             $writer->startElement('{'.Plugin::NS_CALDAV.'}comp');

lib/CalDAV/Xml/Property/SupportedCalendarData.php

@@ -40,7 +40,7 @@ class SupportedCalendarData implements XmlSerializable
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $writer->startElement('{'.Plugin::NS_CALDAV.'}calendar-data');
         $writer->writeAttributes([

lib/CalDAV/Xml/Property/SupportedCollationSet.php

@@ -39,7 +39,7 @@ class SupportedCollationSet implements XmlSerializable
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $collations = [
             'i;ascii-casemap',

lib/CardDAV/Xml/Property/SupportedAddressData.php

@@ -63,7 +63,7 @@ public function __construct(array $supportedData = null)
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->supportedData as $supported) {
             $writer->startElement('{'.Plugin::NS_CARDDAV.'}address-data-type');

lib/CardDAV/Xml/Property/SupportedCollationSet.php

@@ -35,7 +35,7 @@ class SupportedCollationSet implements XmlSerializable
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach (['i;ascii-casemap', 'i;octet', 'i;unicode-casemap'] as $coll) {
             $writer->writeElement('{urn:ietf:params:xml:ns:carddav}supported-collation', $coll);

lib/DAV/CorePlugin.php

@@ -548,7 +548,7 @@ public function httpMkcol(RequestInterface $request, ResponseInterface $response
             if (!isset($properties['{DAV:}resourcetype'])) {
                 throw new Exception\BadRequest('The mkcol request must include a {DAV:}resourcetype property');
             }
-            $resourceType = $properties['{DAV:}resourcetype']->getValue();
+            $resourceType = $properties['{DAV:}resourcetype'];
             unset($properties['{DAV:}resourcetype']);
         } else {
             $properties = [];

lib/DAV/Xml/Element/Prop.php

@@ -100,6 +100,9 @@ private static function parseCurrentElement(Reader $reader)
             }
         } else {
             $value = Complex::xmlDeserialize($reader);
+            if (!($value instanceof Complex)) {
+                $value = $value->getXml();
+            }
         }
 
         return [

lib/DAV/Xml/Element/Response.php

@@ -110,7 +110,7 @@ public function getResponseProperties()
      * Important note 2: If you are writing any new elements, you are also
      * responsible for closing them.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         if ($status = $this->getHTTPStatus()) {
             $writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$status.' '.\Sabre\HTTP\Response::$statusCodes[$status]);

lib/DAV/Xml/Element/Sharee.php

@@ -112,7 +112,7 @@ public function __construct(array $properties = [])
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $writer->write([
             new Href($this->href),

lib/DAV/Xml/Property/Complex.php

@@ -39,15 +39,15 @@ class Complex extends XmlFragment
      *
      * @return mixed
      */
-    public static function xmlDeserialize(Reader $reader)
+    public static function xmlDeserialize(Reader $reader): XmlFragment
     {
         $xml = $reader->readInnerXml();
 
         if (Reader::ELEMENT === $reader->nodeType && $reader->isEmptyElement) {
             // Easy!
             $reader->next();
 
-            return null;
+            return new XmlFragment('');
         }
         // Now we have a copy of the inner xml, we need to traverse it to get
         // all the strings. If there's no non-string data, we just return the
@@ -81,7 +81,9 @@ public static function xmlDeserialize(Reader $reader)
 
             return $new;
         } else {
-            return $text;
+            $new = new XmlFragment($text);
+
+            return $new;
         }
     }
 }

lib/DAV/Xml/Property/GetLastModified.php

@@ -69,7 +69,7 @@ public function getTime()
      * Important note 2: If you are writing any new elements, you are also
      * responsible for closing them.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $writer->write(
             HTTP\toDate($this->time)

lib/DAV/Xml/Property/Href.php

@@ -85,7 +85,7 @@ public function getHrefs()
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->getHrefs() as $href) {
             $href = Uri\resolve($writer->contextUri, $href);

lib/DAV/Xml/Property/Invite.php

@@ -57,7 +57,7 @@ public function __construct(array $sharees)
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->sharees as $sharee) {
             $writer->writeElement('{DAV:}sharee', $sharee);

lib/DAV/Xml/Property/LockDiscovery.php

@@ -63,7 +63,7 @@ public function __construct($locks)
      * Important note 2: If you are writing any new elements, you are also
      * responsible for closing them.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->locks as $lock) {
             $writer->startElement('{DAV:}activelock');

lib/DAV/Xml/Property/ResourceType.php

@@ -72,31 +72,6 @@ public function add($type)
         $this->value = array_unique($this->value);
     }
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * Important note 2: You are responsible for advancing the reader to the
-     * next element. Not doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        return new self(parent::xmlDeserialize($reader));
-    }
-
     /**
      * Generate html representation for this value.
      *

lib/DAV/Xml/Property/ShareAccess.php

@@ -72,7 +72,7 @@ public function getValue()
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         switch ($this->value) {
             case SharingPlugin::ACCESS_NOTSHARED:

lib/DAV/Xml/Property/SupportedLock.php

@@ -38,7 +38,7 @@ class SupportedLock implements XmlSerializable
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $writer->writeElement('{DAV:}lockentry', [
             '{DAV:}lockscope' => ['{DAV:}exclusive' => null],

lib/DAV/Xml/Property/SupportedMethodSet.php

@@ -82,7 +82,7 @@ public function has($methodName)
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->getValue() as $val) {
             $writer->startElement('{DAV:}supported-method');

lib/DAV/Xml/Property/SupportedReportSet.php

@@ -110,7 +110,7 @@ public function has($reportName)
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->getValue() as $val) {
             $writer->startElement('{DAV:}supported-report');

lib/DAV/Xml/Request/PropPatch.php

@@ -46,7 +46,7 @@ class PropPatch implements Element
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->properties as $propertyName => $propertyValue) {
             if (is_null($propertyValue)) {

lib/DAV/Xml/Response/MultiStatus.php

@@ -81,7 +81,7 @@ public function getSyncToken()
      * Important note 2: If you are writing any new elements, you are also
      * responsible for closing them.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         foreach ($this->getResponses() as $response) {
             $writer->writeElement('{DAV:}response', $response);

lib/DAV/Xml/Service.php

@@ -19,7 +19,7 @@ class Service extends \Sabre\Xml\Service
      * For instance, this list may contain an entry `{DAV:}propfind` that would
      * be mapped to Sabre\DAV\Xml\Request\PropFind
      */
-    public $elementMap = [
+    public array $elementMap = [
         '{DAV:}multistatus' => 'Sabre\\DAV\\Xml\\Response\\MultiStatus',
         '{DAV:}response' => 'Sabre\\DAV\\Xml\\Element\\Response',
 
@@ -40,7 +40,7 @@ class Service extends \Sabre\Xml\Service
      *
      * @var array
      */
-    public $namespaceMap = [
+    public array $namespaceMap = [
         'DAV:' => 'd',
         'http://sabredav.org/ns' => 's',
     ];