diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 36b59692d..ff01da921 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -23,7 +23,7 @@ jobs: - name: Update composer run: sudo composer self-update && composer --version - name: Delete dependencies - run: rm -rf ./*/ + run: find . -maxdepth 1 -mindepth 1 -type d ! -name 'patches' ! -name '.github' -exec rm -rf {} \; - name: Download dependencies run: composer install --no-dev - name: Dump Autoload diff --git a/composer.json b/composer.json index c997879a7..bce3f086e 100644 --- a/composer.json +++ b/composer.json @@ -51,6 +51,10 @@ "symfony/process": "4.4.25", "symfony/routing": "4.4.25", "symfony/translation": "4.4.25", - "web-auth/webauthn-lib": "^3.1" + "web-auth/webauthn-lib": "^3.1", + "cweagans/composer-patches": "^1.7" + }, + "extra": { + "patches-file": "composer.patches.json" } } diff --git a/composer.lock b/composer.lock index 0e655e2a3..15870b30c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "01e379129272f47558fd9e7d6b69d731", + "content-hash": "316c21372855c7d41b7a542d66c0d9d4", "packages": [ { "name": "aws/aws-sdk-php", @@ -5856,7 +5856,56 @@ "time": "2021-04-19T20:22:20+00:00" } ], - "packages-dev": [], + "packages-dev": [ + { + "name": "cweagans/composer-patches", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "9888dcc74993c030b75f3dd548bb5e20cdbd740c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/9888dcc74993c030b75f3dd548bb5e20cdbd740c", + "reference": "9888dcc74993c030b75f3dd548bb5e20cdbd740c", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.3.0" + }, + "require-dev": { + "composer/composer": "~1.0 || ~2.0", + "phpunit/phpunit": "~4.6" + }, + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Patches" + }, + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "support": { + "issues": "https://github.com/cweagans/composer-patches/issues", + "source": "https://github.com/cweagans/composer-patches/tree/1.7.1" + }, + "time": "2021-06-08T15:12:46+00:00" + } + ], "aliases": [], "minimum-stability": "stable", "stability-flags": [], diff --git a/composer.patches.json b/composer.patches.json new file mode 100644 index 000000000..0bd320203 --- /dev/null +++ b/composer.patches.json @@ -0,0 +1,7 @@ +{ + "patches": { + "sabre/xml": { + "Correct version check": "patches/sabre-xml/correct-version-check.patch" + } + } +} diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php index be546ae10..9336a93b1 100644 --- a/composer/autoload_classmap.php +++ b/composer/autoload_classmap.php @@ -3139,6 +3139,9 @@ 'ZipStreamer\\Lib\\Count64_64' => $vendorDir . '/deepdiver/zipstreamer/src/Lib/Count64_64.php', 'ZipStreamer\\ZipStreamer' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php', 'bantu\\IniGetWrapper\\IniGetWrapper' => $vendorDir . '/bantu/ini-get-wrapper/src/IniGetWrapper.php', + 'cweagans\\Composer\\PatchEvent' => $vendorDir . '/cweagans/composer-patches/src/PatchEvent.php', + 'cweagans\\Composer\\PatchEvents' => $vendorDir . '/cweagans/composer-patches/src/PatchEvents.php', + 'cweagans\\Composer\\Patches' => $vendorDir . '/cweagans/composer-patches/src/Patches.php', 'libphonenumber\\AlternateFormatsCountryCodeSet' => $vendorDir . '/giggsey/libphonenumber-for-php/src/AlternateFormatsCountryCodeSet.php', 'libphonenumber\\AsYouTypeFormatter' => $vendorDir . '/giggsey/libphonenumber-for-php/src/AsYouTypeFormatter.php', 'libphonenumber\\CountryCodeSource' => $vendorDir . '/giggsey/libphonenumber-for-php/src/CountryCodeSource.php', diff --git a/composer/autoload_files.php b/composer/autoload_files.php index 4e2cfcf53..b374975d9 100644 --- a/composer/autoload_files.php +++ b/composer/autoload_files.php @@ -10,23 +10,22 @@ '383eaff206634a77a1be54e64e6459c7' => $vendorDir . '/sabre/uri/lib/functions.php', 'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php', '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', - 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', + 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php', - 'a4ecaeafb8cfb009ad0e052c90355e98' => $vendorDir . '/beberlei/assert/lib/Assert/functions.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', '2b9d0f43f9552984cfa82fee95491826' => $vendorDir . '/sabre/event/lib/coroutine.php', 'd81bab31d3feb45bfe2f283ea3c8fdf7' => $vendorDir . '/sabre/event/lib/Loop/functions.php', 'a1cce3d26cc15c00fcd0b3354bd72c88' => $vendorDir . '/sabre/event/lib/Promise/functions.php', '3569eecfeed3bcf0bad3c998a494ecb8' => $vendorDir . '/sabre/xml/lib/Deserializer/functions.php', '93aa591bc4ca510c520999e34229ee79' => $vendorDir . '/sabre/xml/lib/Serializer/functions.php', - 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', + 'a4ecaeafb8cfb009ad0e052c90355e98' => $vendorDir . '/beberlei/assert/lib/Assert/functions.php', '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php', + 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', 'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php', 'ebdb698ed4152ae445614b69b5e4bb6a' => $vendorDir . '/sabre/http/lib/functions.php', '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', 'b067bc7112e384b61c701452d53a14a8' => $vendorDir . '/mtdowling/jmespath.php/src/JmesPath.php', - 'e39a8b23c42d4e1452234d762b03835a' => $vendorDir . '/ramsey/uuid/src/functions.php', 'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php', '51fcf4e06c07cc00c920b44bcd900e7a' => $vendorDir . '/thecodingmachine/safe/deprecated/apc.php', '47f619d9197b36cf5ab70738d7743fe2' => $vendorDir . '/thecodingmachine/safe/deprecated/libevent.php', @@ -117,8 +116,9 @@ '4af1dca6db8c527c6eed27bff85ff0e5' => $vendorDir . '/thecodingmachine/safe/generated/yaz.php', 'fe43ca06499ac37bc2dedd823af71eb5' => $vendorDir . '/thecodingmachine/safe/generated/zip.php', '356736db98a6834f0a886b8d509b0ecd' => $vendorDir . '/thecodingmachine/safe/generated/zlib.php', - '8a9dc1de0ca7e01f3e08231539562f61' => $vendorDir . '/aws/aws-sdk-php/src/functions.php', + 'e39a8b23c42d4e1452234d762b03835a' => $vendorDir . '/ramsey/uuid/src/functions.php', '538ca81a9a966a6716601ecf48f4eaef' => $vendorDir . '/opis/closure/functions.php', + '8a9dc1de0ca7e01f3e08231539562f61' => $vendorDir . '/aws/aws-sdk-php/src/functions.php', 'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php', '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php', '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php', diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php index efbdec955..b311f3321 100644 --- a/composer/autoload_psr4.php +++ b/composer/autoload_psr4.php @@ -9,6 +9,7 @@ 'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'), 'ownCloud\\TarStreamer\\' => array($vendorDir . '/deepdiver1975/tarstreamer/src'), 'libphonenumber\\' => array($vendorDir . '/giggsey/libphonenumber-for-php/src'), + 'cweagans\\Composer\\' => array($vendorDir . '/cweagans/composer-patches/src'), 'bantu\\IniGetWrapper\\' => array($vendorDir . '/bantu/ini-get-wrapper/src'), 'ZipStreamer\\' => array($vendorDir . '/deepdiver/zipstreamer/src'), 'Webauthn\\MetadataService\\' => array($vendorDir . '/web-auth/metadata-service/src'), @@ -47,7 +48,7 @@ 'Ramsey\\Collection\\' => array($vendorDir . '/ramsey/collection/src'), 'Punic\\' => array($vendorDir . '/punic/punic/code'), 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'), - 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'), + 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src', $vendorDir . '/psr/http-factory/src'), 'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'), 'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'), 'Psr\\Container\\' => array($vendorDir . '/psr/container/src'), @@ -58,7 +59,7 @@ 'Nextcloud\\LogNormalizer\\' => array($vendorDir . '/nextcloud/lognormalizer/src'), 'MicrosoftAzure\\Storage\\Common\\' => array($vendorDir . '/microsoft/azure-storage-common/src/Common'), 'MicrosoftAzure\\Storage\\Blob\\' => array($vendorDir . '/microsoft/azure-storage-blob/src/Blob'), - 'League\\Uri\\' => array($vendorDir . '/league/uri/src', $vendorDir . '/league/uri-interfaces/src'), + 'League\\Uri\\' => array($vendorDir . '/league/uri-interfaces/src', $vendorDir . '/league/uri/src'), 'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'), 'JmesPath\\' => array($vendorDir . '/mtdowling/jmespath.php/src'), 'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'), diff --git a/composer/autoload_static.php b/composer/autoload_static.php index 92b464495..3108aed47 100644 --- a/composer/autoload_static.php +++ b/composer/autoload_static.php @@ -11,23 +11,22 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php', 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', - 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', + 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php', - 'a4ecaeafb8cfb009ad0e052c90355e98' => __DIR__ . '/..' . '/beberlei/assert/lib/Assert/functions.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', '2b9d0f43f9552984cfa82fee95491826' => __DIR__ . '/..' . '/sabre/event/lib/coroutine.php', 'd81bab31d3feb45bfe2f283ea3c8fdf7' => __DIR__ . '/..' . '/sabre/event/lib/Loop/functions.php', 'a1cce3d26cc15c00fcd0b3354bd72c88' => __DIR__ . '/..' . '/sabre/event/lib/Promise/functions.php', '3569eecfeed3bcf0bad3c998a494ecb8' => __DIR__ . '/..' . '/sabre/xml/lib/Deserializer/functions.php', '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php', - 'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php', + 'a4ecaeafb8cfb009ad0e052c90355e98' => __DIR__ . '/..' . '/beberlei/assert/lib/Assert/functions.php', '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php', + 'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php', 'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php', 'ebdb698ed4152ae445614b69b5e4bb6a' => __DIR__ . '/..' . '/sabre/http/lib/functions.php', '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', 'b067bc7112e384b61c701452d53a14a8' => __DIR__ . '/..' . '/mtdowling/jmespath.php/src/JmesPath.php', - 'e39a8b23c42d4e1452234d762b03835a' => __DIR__ . '/..' . '/ramsey/uuid/src/functions.php', 'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php', '51fcf4e06c07cc00c920b44bcd900e7a' => __DIR__ . '/..' . '/thecodingmachine/safe/deprecated/apc.php', '47f619d9197b36cf5ab70738d7743fe2' => __DIR__ . '/..' . '/thecodingmachine/safe/deprecated/libevent.php', @@ -118,8 +117,9 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 '4af1dca6db8c527c6eed27bff85ff0e5' => __DIR__ . '/..' . '/thecodingmachine/safe/generated/yaz.php', 'fe43ca06499ac37bc2dedd823af71eb5' => __DIR__ . '/..' . '/thecodingmachine/safe/generated/zip.php', '356736db98a6834f0a886b8d509b0ecd' => __DIR__ . '/..' . '/thecodingmachine/safe/generated/zlib.php', - '8a9dc1de0ca7e01f3e08231539562f61' => __DIR__ . '/..' . '/aws/aws-sdk-php/src/functions.php', + 'e39a8b23c42d4e1452234d762b03835a' => __DIR__ . '/..' . '/ramsey/uuid/src/functions.php', '538ca81a9a966a6716601ecf48f4eaef' => __DIR__ . '/..' . '/opis/closure/functions.php', + '8a9dc1de0ca7e01f3e08231539562f61' => __DIR__ . '/..' . '/aws/aws-sdk-php/src/functions.php', 'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php', '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php', '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php', @@ -138,6 +138,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 array ( 'libphonenumber\\' => 15, ), + 'c' => + array ( + 'cweagans\\Composer\\' => 18, + ), 'b' => array ( 'bantu\\IniGetWrapper\\' => 20, @@ -288,6 +292,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 array ( 0 => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src', ), + 'cweagans\\Composer\\' => + array ( + 0 => __DIR__ . '/..' . '/cweagans/composer-patches/src', + ), 'bantu\\IniGetWrapper\\' => array ( 0 => __DIR__ . '/..' . '/bantu/ini-get-wrapper/src', @@ -444,8 +452,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 ), 'Psr\\Http\\Message\\' => array ( - 0 => __DIR__ . '/..' . '/psr/http-factory/src', - 1 => __DIR__ . '/..' . '/psr/http-message/src', + 0 => __DIR__ . '/..' . '/psr/http-message/src', + 1 => __DIR__ . '/..' . '/psr/http-factory/src', ), 'Psr\\Http\\Client\\' => array ( @@ -489,8 +497,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 ), 'League\\Uri\\' => array ( - 0 => __DIR__ . '/..' . '/league/uri/src', - 1 => __DIR__ . '/..' . '/league/uri-interfaces/src', + 0 => __DIR__ . '/..' . '/league/uri-interfaces/src', + 1 => __DIR__ . '/..' . '/league/uri/src', ), 'JsonSchema\\' => array ( @@ -3756,6 +3764,9 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652 'ZipStreamer\\Lib\\Count64_64' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/Lib/Count64_64.php', 'ZipStreamer\\ZipStreamer' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php', 'bantu\\IniGetWrapper\\IniGetWrapper' => __DIR__ . '/..' . '/bantu/ini-get-wrapper/src/IniGetWrapper.php', + 'cweagans\\Composer\\PatchEvent' => __DIR__ . '/..' . '/cweagans/composer-patches/src/PatchEvent.php', + 'cweagans\\Composer\\PatchEvents' => __DIR__ . '/..' . '/cweagans/composer-patches/src/PatchEvents.php', + 'cweagans\\Composer\\Patches' => __DIR__ . '/..' . '/cweagans/composer-patches/src/Patches.php', 'libphonenumber\\AlternateFormatsCountryCodeSet' => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src/AlternateFormatsCountryCodeSet.php', 'libphonenumber\\AsYouTypeFormatter' => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src/AsYouTypeFormatter.php', 'libphonenumber\\CountryCodeSource' => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src/CountryCodeSource.php', diff --git a/composer/include_paths.php b/composer/include_paths.php index e7d0ea320..b1989ff08 100644 --- a/composer/include_paths.php +++ b/composer/include_paths.php @@ -6,8 +6,8 @@ $baseDir = $vendorDir; return array( - $vendorDir . '/pear/archive_tar', + $vendorDir . '/pear/pear_exception', $vendorDir . '/pear/console_getopt', $vendorDir . '/pear/pear-core-minimal/src', - $vendorDir . '/pear/pear_exception', + $vendorDir . '/pear/archive_tar', ); diff --git a/composer/installed.json b/composer/installed.json index adbd6f9bc..065109166 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -374,6 +374,57 @@ ], "install-path": "./package-versions-deprecated" }, + { + "name": "cweagans/composer-patches", + "version": "1.7.1", + "version_normalized": "1.7.1.0", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "9888dcc74993c030b75f3dd548bb5e20cdbd740c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/9888dcc74993c030b75f3dd548bb5e20cdbd740c", + "reference": "9888dcc74993c030b75f3dd548bb5e20cdbd740c", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.3.0" + }, + "require-dev": { + "composer/composer": "~1.0 || ~2.0", + "phpunit/phpunit": "~4.6" + }, + "time": "2021-06-08T15:12:46+00:00", + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Patches" + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "support": { + "issues": "https://github.com/cweagans/composer-patches/issues", + "source": "https://github.com/cweagans/composer-patches/tree/1.7.1" + }, + "install-path": "../cweagans/composer-patches" + }, { "name": "deepdiver/zipstreamer", "version": "2.0.0", @@ -3935,6 +3986,11 @@ }, "time": "2020-10-03T10:08:14+00:00", "type": "library", + "extra": { + "patches_applied": { + "Correct version check": "patches/sabre-xml/correct-version-check.patch" + } + }, "installation-source": "dist", "autoload": { "psr-4": { @@ -6102,6 +6158,8 @@ "install-path": "../web-auth/webauthn-lib" } ], - "dev": false, - "dev-package-names": [] + "dev": true, + "dev-package-names": [ + "cweagans/composer-patches" + ] } diff --git a/composer/installed.php b/composer/installed.php index 9d4c00e9b..b2f2fb70c 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -5,9 +5,9 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), - 'reference' => '6d1cad56adb576b120b26329303e06166024cd20', + 'reference' => '59af07061eb8d123f872c8fd05a306100c073333', 'name' => 'nextcloud/3rdparty', - 'dev' => false, + 'dev' => true, ), 'versions' => array( 'aws/aws-sdk-php' => array( @@ -64,6 +64,15 @@ 'reference' => '7413f0b55a051e89485c5cb9f765fe24bb02a7b6', 'dev_requirement' => false, ), + 'cweagans/composer-patches' => array( + 'pretty_version' => '1.7.1', + 'version' => '1.7.1.0', + 'type' => 'composer-plugin', + 'install_path' => __DIR__ . '/../cweagans/composer-patches', + 'aliases' => array(), + 'reference' => '9888dcc74993c030b75f3dd548bb5e20cdbd740c', + 'dev_requirement' => true, + ), 'deepdiver/zipstreamer' => array( 'pretty_version' => '2.0.0', 'version' => '2.0.0.0', @@ -268,7 +277,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), - 'reference' => '6d1cad56adb576b120b26329303e06166024cd20', + 'reference' => '59af07061eb8d123f872c8fd05a306100c073333', '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 564f9f907..9fa911fdd 100644 --- a/composer/package-versions-deprecated/src/PackageVersions/Versions.php +++ b/composer/package-versions-deprecated/src/PackageVersions/Versions.php @@ -117,7 +117,8 @@ 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@6d1cad56adb576b120b26329303e06166024cd20', + 'cweagans/composer-patches' => '1.7.1@9888dcc74993c030b75f3dd548bb5e20cdbd740c', + 'nextcloud/3rdparty' => 'dev-master@59af07061eb8d123f872c8fd05a306100c073333', ); private function __construct() diff --git a/patches.txt b/patches.txt deleted file mode 100644 index e2c9c1373..000000000 --- a/patches.txt +++ /dev/null @@ -1,12 +0,0 @@ -Patches: - -- patchwork/utf8: Remove trigger_error() that spammed the error log -- Doctrine: fix named parameter detection on sqlite with like queries https://github.com/doctrine/dbal/pull/3104 -- SabreDAV: Make sure that files that are children of directories, are reported as files https://github.com/fruux/sabre-dav/issues/982 -- SabreDAV: Don't open the file on HEAD requests https://github.com/sabre-io/dav/pull/1058 -- SabreDAV: Properly parse carddav address-data https://github.com/sabre-io/dav/pull/1025 -- SabreVObject: Broker: add timezone to CANCEL messages https://github.com/sabre-io/vobject/pull/412 -- SabreXML: Fix invalid PHP docs https://github.com/fruux/sabre-xml/pull/128 -- SabreXML: Prevent infinite loops for empty props element https://github.com/fruux/sabre-xml/pull/132 -- ZipStreamer: Fix zip generation for 7zip https://github.com/McNetic/PHPZipStreamer/pull/39 -- scssphp: Fix Trying to access array offset on value of type null https://github.com/scssphp/scssphp/commit/05a5d11ea7f68c52fdb6a5ca35cf46613b608445 diff --git a/patches/sabre-xml/correct-version-check.patch b/patches/sabre-xml/correct-version-check.patch new file mode 100644 index 000000000..6a8dd873a --- /dev/null +++ b/patches/sabre-xml/correct-version-check.patch @@ -0,0 +1,30 @@ +From 26c59f5ce7fac44150e5986cef33808c79cd9ded Mon Sep 17 00:00:00 2001 +From: Carl Schwan +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 +--- + 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/sabre/xml/PATCHES.txt b/sabre/xml/PATCHES.txt new file mode 100644 index 000000000..68194cd07 --- /dev/null +++ b/sabre/xml/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: + +Correct version check +Source: patches/sabre-xml/correct-version-check.patch + + diff --git a/sabre/xml/lib/Reader.php b/sabre/xml/lib/Reader.php index 368e8ffd2..1a27af7cf 100644 --- a/sabre/xml/lib/Reader.php +++ b/sabre/xml/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); }