Merge pull request #1566 from phil-davis/backport-20241029

Backport various changes from master to 4.6

.gitattributes

@@ -4,6 +4,7 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.php_cs.dist export-ignore
+/.php-cs-fixer.dist.php export-ignore
 /CHANGELOG.md export-ignore
 /CONTRIBUTING.md export-ignore
 /phpstan.neon export-ignore

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
@@ -93,7 +93,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
@@ -126,5 +126,5 @@ jobs:
           SABRE_PGSQLDSN: "pgsql:host=127.0.0.1;port=5432;dbname=sabredav_test;user=postgres;password=postgres"
           RUN_TEST_WITH_STREAMING_PROPFIND: "true"
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         if: matrix.coverage != 'none'

lib/CalDAV/Backend/BackendInterface.php

@@ -221,7 +221,7 @@ public function deleteCalendarObject($calendarId, $objectUri);
      *
      * This default may well be good enough for personal use, and calendars
      * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
+     * or high loads, you are strongly advised to optimize certain paths.
      *
      * The best way to do so is override this method and to optimize
      * specifically for 'common filters'.

lib/CalDAV/Backend/NotificationSupport.php

@@ -36,7 +36,7 @@ interface NotificationSupport extends BackendInterface
     public function getNotificationsForPrincipal($principalUri);
 
     /**
-     * This deletes a specific notifcation.
+     * This deletes a specific notification.
      *
      * This may be called by a client once it deems a notification handled.
      *

lib/CalDAV/Backend/PDO.php

@@ -196,7 +196,7 @@ public function getCalendarsForUser($principalUri)
                 //$stmt2 = $this->pdo->prepare('SELECT principaluri FROM ' . $this->calendarInstancesTableName . ' WHERE access = 1 AND id = ?');
                 //$stmt2->execute([$row['id']]);
 
-                // read-only is for backwards compatbility. Might go away in
+                // read-only is for backwards compatibility. Might go away in
                 // the future.
                 $calendar['read-only'] = \Sabre\DAV\Sharing\Plugin::ACCESS_READ === (int) $row['access'];
             }
@@ -730,7 +730,7 @@ public function deleteCalendarObject($calendarId, $objectUri)
      *
      * This default may well be good enough for personal use, and calendars
      * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
+     * or high loads, you are strongly advised to optimize certain paths.
      *
      * The best way to do so is override this method and to optimize
      * specifically for 'common filters'.

lib/CalDAV/Calendar.php

@@ -435,7 +435,7 @@ public function getSyncToken()
      * return null.
      *
      * The limit is 'suggestive'. You are free to ignore it.
-     * TODO: RFC6578 Setion 3.7 says that the server must fail when the server
+     * TODO: RFC6578 Section 3.7 says that the server must fail when the server
      * cannot truncate according to the limit, so it may not be just suggestive.
      *
      * @param string $syncToken

lib/CalDAV/Notifications/Node.php

@@ -70,7 +70,7 @@ public function getName()
     /**
      * Returns the etag for the notification.
      *
-     * The etag must be surrounded by litteral double-quotes.
+     * The etag must be surrounded by literal double-quotes.
      *
      * @return string
      */
@@ -101,7 +101,7 @@ public function delete()
     /**
      * Returns the owner principal.
      *
-     * This must be a url to a principal, or null if there's no owner
+     * This must be an url to a principal, or null if there's no owner
      *
      * @return string|null
      */

lib/CalDAV/Plugin.php

@@ -720,7 +720,7 @@ public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified)
             return;
         }
 
-        // We're onyl interested in ICalendarObject nodes that are inside of a
+        // We're only interested in ICalendarObject nodes that are inside of a
         // real calendar. This is to avoid triggering validation and scheduling
         // for non-calendars (such as an inbox).
         list($parent) = Uri\split($path);
@@ -913,7 +913,7 @@ protected function validateICalendar(&$data, $path, &$modified, RequestInterface
     }
 
     /**
-     * This method is triggered whenever a subsystem reqeuests the privileges
+     * This method is triggered whenever a subsystem requests the privileges
      * that are supported on a particular node.
      */
     public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet)

lib/CalDAV/SharingPlugin.php

@@ -136,7 +136,7 @@ public function propFindLate(DAV\PropFind $propFind, DAV\INode $node)
     }
 
     /**
-     * This method is trigged when a user attempts to update a node's
+     * This method is triggered when a user attempts to update a node's
      * properties.
      *
      * A previous draft of the sharing spec stated that it was possible to use

lib/CalDAV/Xml/Request/CalendarMultiGetReport.php

@@ -48,7 +48,7 @@ class CalendarMultiGetReport implements XmlDeserializable
     public $expand = null;
 
     /**
-     * The mimetype of the content that should be returend. Usually
+     * The mimetype of the content that should be returned. Usually
      * text/calendar.
      *
      * @var string

lib/CalDAV/Xml/Request/CalendarQueryReport.php

@@ -48,7 +48,7 @@ class CalendarQueryReport implements XmlDeserializable
     public $expand = null;
 
     /**
-     * The mimetype of the content that should be returend. Usually
+     * The mimetype of the content that should be returned. Usually
      * text/calendar.
      *
      * @var string