Merge branch 'sabre-io:master' into master

Author: paulmhh

.github/workflows/ci.yml

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

lib/CalDAV/Schedule/Plugin.php

@@ -25,6 +25,7 @@
 use Sabre\VObject;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\ITip;
+use Sabre\VObject\ITip\Broker;
 use Sabre\VObject\ITip\Message;
 use Sabre\VObject\Reader;
 
@@ -389,7 +390,7 @@ public function beforeUnbind($path)
             $node->getOwner()
         );
 
-        $broker = new ITip\Broker();
+        $broker = $this->createITipBroker();
         $messages = $broker->parseEvent(null, $addresses, $node->get());
 
         foreach ($messages as $message) {
@@ -500,7 +501,7 @@ public function scheduleLocalDelivery(ITip\Message $iTipMessage)
             $isNewNode = true;
         }
 
-        $broker = new ITip\Broker();
+        $broker = $this->createITipBroker();
         $newObject = $broker->processMessage($iTipMessage, $currentObject);
 
         $inbox->createFile($newFileName, $iTipMessage->message->serialize());
@@ -611,7 +612,7 @@ public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilege
      */
     protected function processICalendarChange($oldObject, VCalendar $newObject, array $addresses, array $ignore = [], &$modified = false)
     {
-        $broker = new ITip\Broker();
+        $broker = $this->createITipBroker();
         $messages = $broker->parseEvent($newObject, $addresses, $oldObject);
 
         if ($messages) {
@@ -994,4 +995,12 @@ public function getPluginInfo()
             'link' => 'http://sabre.io/dav/scheduling/',
         ];
     }
+
+    /**
+     * Returns an instance of the iTip\Broker.
+     */
+    protected function createITipBroker(): Broker
+    {
+        return new Broker();
+    }
 }

lib/CardDAV/Plugin.php

@@ -800,7 +800,7 @@ protected function negotiateVCard($input, &$mimeType = null)
      *
      * @return string
      */
-    protected function convertVCard($data, $target, array $propertiesFilter = null)
+    protected function convertVCard($data, $target, ?array $propertiesFilter = null)
     {
         if (is_resource($data)) {
             $data = stream_get_contents($data);

lib/CardDAV/Xml/Property/SupportedAddressData.php

@@ -34,7 +34,7 @@ class SupportedAddressData implements XmlSerializable
     /**
      * Creates the property.
      */
-    public function __construct(array $supportedData = null)
+    public function __construct(?array $supportedData = null)
     {
         if (is_null($supportedData)) {
             $supportedData = [

lib/DAV/Auth/Plugin.php

@@ -58,7 +58,7 @@ class Plugin extends ServerPlugin
      *
      * @param Backend\BackendInterface $authBackend
      */
-    public function __construct(Backend\BackendInterface $authBackend = null)
+    public function __construct(?Backend\BackendInterface $authBackend = null)
     {
         if (!is_null($authBackend)) {
             $this->addBackend($authBackend);

lib/DAV/Exception/Locked.php

@@ -32,7 +32,7 @@ class Locked extends DAV\Exception
      *
      * @param DAV\Locks\LockInfo $lock
      */
-    public function __construct(DAV\Locks\LockInfo $lock = null)
+    public function __construct(?DAV\Locks\LockInfo $lock = null)
     {
         parent::__construct();
 

lib/DAV/Server.php

@@ -211,7 +211,7 @@ class Server implements LoggerAwareInterface, EmitterInterface
      *
      * @throws Exception
      */
-    public function __construct($treeOrNode = null, HTTP\Sapi $sapi = null)
+    public function __construct($treeOrNode = null, ?HTTP\Sapi $sapi = null)
     {
         if ($treeOrNode instanceof Tree) {
             $this->tree = $treeOrNode;
@@ -882,7 +882,7 @@ public function getHTTPHeaders($path)
      *
      * @return \Traversable
      */
-    private function generatePathNodes(PropFind $propFind, array $yieldFirst = null)
+    private function generatePathNodes(PropFind $propFind, ?array $yieldFirst = null)
     {
         if (null !== $yieldFirst) {
             yield $yieldFirst;

lib/DAV/Tree.php

@@ -62,9 +62,21 @@ public function getNodeForPath($path)
             return $this->rootNode;
         }
 
-        $parts = explode('/', $path);
         $node = $this->rootNode;
 
+        // look for any cached parent and collect the parts below the parent
+        $parts = [];
+        $remainingPath = $path;
+        do {
+            list($remainingPath, $baseName) = Uri\split($remainingPath);
+            array_unshift($parts, $baseName);
+
+            if (isset($this->cache[$remainingPath])) {
+                $node = $this->cache[$remainingPath];
+                break;
+            }
+        } while ('' !== $remainingPath);
+
         while (count($parts)) {
             if (!($node instanceof ICollection)) {
                 throw new Exception\NotFound('Could not find node at path: '.$path);

tests/Sabre/CalDAV/SharedCalendarTest.php

@@ -11,7 +11,7 @@ class SharedCalendarTest extends \PHPUnit\Framework\TestCase
 {
     protected $backend;
 
-    public function getInstance(array $props = null)
+    public function getInstance(?array $props = null)
     {
         if (is_null($props)) {
             $props = [

tests/Sabre/DAV/Mock/Collection.php

@@ -34,7 +34,7 @@ class Collection extends DAV\Collection
      * @param string     $name
      * @param Collection $parent
      */
-    public function __construct($name, array $children = [], Collection $parent = null)
+    public function __construct($name, array $children = [], ?Collection $parent = null)
     {
         $this->name = $name;
         foreach ($children as $key => $value) {