Remove obsolete patch for sabre/xml

It was merged upstream

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

7 files changed, 3 insertions, 57 deletions

diff --git a/.patches/sabre-xml/correct-version-check.patch b/.patches/sabre-xml/correct-version-check.patch
deleted file mode 100644
index 6a8dd873..00000000
--- a/.patches/sabre-xml/correct-version-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 26c59f5ce7fac44150e5986cef33808c79cd9ded Mon Sep 17 00:00:00 2001
-From: Carl Schwan <carl@carlschwan.eu>
-Date: Wed, 22 Sep 2021 10:05:41 +0200
-Subject: [PATCH] Use libxml version instead of PHP version before calling
- libxml_disable_entity_loader
-
-In some cases older version of php 7.4 are using libxml > 2.9.0 so use
-the libxml version instad of the php 8.0 to see if the call of libxml is
-useful.
-
-Otherwise this creates some warning.
-
-Signed-off-by: Carl Schwan <carl@carlschwan.eu>
----
- lib/Reader.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Reader.php b/lib/Reader.php
-index 368e8ff..1a27af7 100644
---- a/lib/Reader.php
-+++ b/lib/Reader.php
-@@ -56,7 +56,7 @@ public function getClark()
-     public function parse(): array
-     {
-         $previousEntityState = null;
--        $shouldCallLibxmlDisableEntityLoader = (\PHP_VERSION_ID < 80000);
-+        $shouldCallLibxmlDisableEntityLoader = (\LIBXML_VERSION < 20900);
-         if ($shouldCallLibxmlDisableEntityLoader) {
-             $previousEntityState = libxml_disable_entity_loader(true);
-         }
diff --git a/composer.patches.json b/composer.patches.json
index 71fef612..044d7666 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -1,7 +1,4 @@
 {
     "patches": {
-        "sabre/xml": {
-            "Correct version check": ".patches/sabre-xml/correct-version-check.patch"
-        }
     }
 }
diff --git a/composer/installed.json b/composer/installed.json
index e018f9bf..58845459 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -4115,9 +4115,6 @@
             },
             "time": "2021-11-04T06:37:27+00:00",
             "type": "library",
-            "extra": {
-                "patches_applied": []
-            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
diff --git a/composer/installed.php b/composer/installed.php
index 5bde8f84..a3b10c12 100644
--- a/composer/installed.php
+++ b/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
-        'reference' => '6e181eb3fbf0e2213da1765a56f95d6e18302a3c',
+        'reference' => '05db439e16650a0853234618956eff645c505fcd',
         'name' => 'nextcloud/3rdparty',
         'dev' => false,
     ),
@@ -286,7 +286,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
-            'reference' => '6e181eb3fbf0e2213da1765a56f95d6e18302a3c',
+            'reference' => '05db439e16650a0853234618956eff645c505fcd',
             '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 961c7d50..6b68be0c 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@6e181eb3fbf0e2213da1765a56f95d6e18302a3c',
+  'nextcloud/3rdparty' => 'dev-master@05db439e16650a0853234618956eff645c505fcd',
 );
 
     private function __construct()
diff --git a/sabre/xml/PATCHES.txt b/sabre/xml/PATCHES.txt
deleted file mode 100644
index 1b21d947..00000000
--- a/sabre/xml/PATCHES.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
-Patches applied to this directory:
-
-Correct version check
-Source: .patches/sabre-xml/correct-version-check.patch
-
-
diff --git a/sabre/xml/lib/Reader.php.rej b/sabre/xml/lib/Reader.php.rej
deleted file mode 100644
index e3e56677..00000000
--- a/sabre/xml/lib/Reader.php.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Reader.php
-+++ lib/Reader.php
-@@ -56,7 +56,7 @@ public function getClark()
-     public function parse(): array
-     {
-         $previousEntityState = null;
--        $shouldCallLibxmlDisableEntityLoader = (\PHP_VERSION_ID < 80000);
-+        $shouldCallLibxmlDisableEntityLoader = (\LIBXML_VERSION < 20900);
-         if ($shouldCallLibxmlDisableEntityLoader) {
-             $previousEntityState = libxml_disable_entity_loader(true);
-         }