Merge pull request #1964 from nextcloud/dependabot/composer/sabre/dav…

…-4.7.0 build: Update Sabre/DAV and siblings to PHP 8.4 compatible versions
nextcloud · Oct 29, 2024 · f0d0672 · f0d0672
2 parents 09f4cbc + c0c0e16
commit f0d0672
Show file tree

Hide file tree

Showing 83 changed files with 409 additions and 438 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,7 @@ bin
 */*/psalm.baseline.xml
 */*/phpcs.xml
 */*/phpcs.xml.dist
+*/*/.php-cs-fixer.dist.php
 */*/.phpcs.xml
 */*/phpstan.neon.dist
 */*/phpunit.xml

diff --git a/.patches/custom-itip-broker.diff b/.patches/custom-itip-broker.diff
diff --git a/.patches/fix-cache-for-node.diff b/.patches/fix-cache-for-node.diff
diff --git a/composer.json b/composer.json
@@ -47,7 +47,7 @@
 		"psr/event-dispatcher": "^1.0",
 		"psr/log": "^3.0.2",
 		"punic/punic": "^3.8",
-		"sabre/dav": "^4.4.0",
+		"sabre/dav": "^4.7.0",
 		"scssphp/scssphp": "^1.12",
 		"stecman/symfony-console-completion": "^0.13.0",
 		"symfony/console": "^6.4.12",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -1,9 +1,5 @@
 {
 	"patches": {
-		"sabre/dav": {
-			"Allow for custom iTip broker": ".patches/custom-itip-broker.diff",
-			"Fix getNodeForPath cache": ".patches/fix-cache-for-node.diff"
-		},
 		"wapmorgan/mp3info": {
 			"generate exception if codec/layer versions or channel headers are unrecognized": ".patches/mp3info-check-array-key.diff"
 		}