Add patch to fix phpdoc in sabre/dav

PR opened upstream as well

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

7 files changed, 32 insertions, 4 deletions

diff --git a/.patches/sabre-dav/fix-backendinterface-phpdoc.patch b/.patches/sabre-dav/fix-backendinterface-phpdoc.patch
new file mode 100644
index 00000000..deaf415c
--- /dev/null
+++ b/.patches/sabre-dav/fix-backendinterface-phpdoc.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/DAVACL/PrincipalBackend/BackendInterface.php b/lib/DAVACL/PrincipalBackend/BackendInterface.php
+index 72717a59bf..7140a92954 100644
+--- a/lib/DAVACL/PrincipalBackend/BackendInterface.php
++++ b/lib/DAVACL/PrincipalBackend/BackendInterface.php
+@@ -110,7 +110,7 @@ public function searchPrincipals($prefixPath, array $searchProperties, $test = '
+      * @param string $uri
+      * @param string $principalPrefix
+      *
+-     * @return string
++     * @return string|null
+      */
+     public function findByUri($uri, $principalPrefix);
+ 
diff --git a/composer.patches.json b/composer.patches.json
index 044d7666..e58c506a 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -1,4 +1,7 @@
 {
     "patches": {
+        "sabre/dav": {
+            "Fix BackendInterface phpdoc return type": ".patches/sabre-dav/fix-backendinterface-phpdoc.patch"
+        }
     }
 }
diff --git a/composer/installed.json b/composer/installed.json
index 58845459..0fa484f1 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -3746,6 +3746,11 @@
                 "bin/naturalselection"
             ],
             "type": "library",
+            "extra": {
+                "patches_applied": {
+                    "Fix BackendInterface phpdoc return type": ".patches/sabre-dav/fix-backendinterface-phpdoc.patch"
+                }
+            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
diff --git a/composer/installed.php b/composer/installed.php
index a3b10c12..82ee0192 100644
--- a/composer/installed.php
+++ b/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
-        'reference' => '05db439e16650a0853234618956eff645c505fcd',
+        'reference' => '7109a846cbc5032d12895cfdb0653ef358bf67d2',
         'name' => 'nextcloud/3rdparty',
         'dev' => false,
     ),
@@ -286,7 +286,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
-            'reference' => '05db439e16650a0853234618956eff645c505fcd',
+            'reference' => '7109a846cbc5032d12895cfdb0653ef358bf67d2',
             'dev_requirement' => false,
         ),
         'nextcloud/lognormalizer' => array(
diff --git a/composer/package-versions-deprecated/src/PackageVersions/Versions.php b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
index 6b68be0c..b79d292d 100644
--- a/composer/package-versions-deprecated/src/PackageVersions/Versions.php
+++ b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
@@ -120,7 +120,7 @@ final class Versions
   'web-auth/cose-lib' => 'v3.3.9@ed172d2dc1a6b87b5c644c07c118cd30c1b3819b',
   'web-auth/metadata-service' => 'v3.3.9@8488d3a832a38cc81c670fce05de1e515c6e64b1',
   'web-auth/webauthn-lib' => 'v3.3.9@04b98ee3d39cb79dad68a7c15c297c085bf66bfe',
-  'nextcloud/3rdparty' => 'dev-master@05db439e16650a0853234618956eff645c505fcd',
+  'nextcloud/3rdparty' => 'dev-master@7109a846cbc5032d12895cfdb0653ef358bf67d2',
 );
 
     private function __construct()
diff --git a/sabre/dav/PATCHES.txt b/sabre/dav/PATCHES.txt
new file mode 100644
index 00000000..53b8fc0c
--- /dev/null
+++ b/sabre/dav/PATCHES.txt
@@ -0,0 +1,7 @@
+This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
+Patches applied to this directory:
+
+Fix BackendInterface phpdoc return type
+Source: .patches/sabre-dav/fix-backendinterface-phpdoc.patch
+
+
diff --git a/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php b/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
index 72717a59..7140a929 100644
--- a/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
+++ b/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
@@ -110,7 +110,7 @@ interface BackendInterface
      * @param string $uri
      * @param string $principalPrefix
      *
-     * @return string
+     * @return string|null
      */
     public function findByUri($uri, $principalPrefix);