Skip to content

Commit da13032

Browse files
CarlSchwanCarlSchwan
committed
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
1 parent 6876f1f commit da13032

File tree

13 files changed

+192
-37
lines changed

13 files changed

+192
-37
lines changed

‎composer.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,11 @@
5252
"symfony/routing": "4.4.25",
5353
"symfony/translation": "4.4.25",
5454
"web-auth/webauthn-lib": "^3.1"
55+
},
56+
"require-dev": {
57+
"cweagans/composer-patches": "^1.7"
58+
},
59+
"extra": {
60+
"patches-file": "composer.patches.json"
5561
}
5662
}

‎composer.lock‎

Lines changed: 51 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎composer.patches.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"patches": {
3+
"sabre/xml": {
4+
"Correct version check": "patches/sabre-xml/correct-version-check.patch"
5+
}
6+
}
7+
}

‎composer/autoload_classmap.php‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,15 +2081,6 @@
20812081
'Pimple\\Psr11\\ServiceLocator' => $vendorDir . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php',
20822082
'Pimple\\ServiceIterator' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceIterator.php',
20832083
'Pimple\\ServiceProviderInterface' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php',
2084-
'Pimple\\Tests\\Fixtures\\Invokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php',
2085-
'Pimple\\Tests\\Fixtures\\NonInvokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php',
2086-
'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php',
2087-
'Pimple\\Tests\\Fixtures\\Service' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php',
2088-
'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php',
2089-
'Pimple\\Tests\\PimpleTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php',
2090-
'Pimple\\Tests\\Psr11\\ContainerTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php',
2091-
'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php',
2092-
'Pimple\\Tests\\ServiceIteratorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php',
20932084
'Psr\\Container\\ContainerExceptionInterface' => $vendorDir . '/psr/container/src/ContainerExceptionInterface.php',
20942085
'Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',
20952086
'Psr\\Container\\NotFoundExceptionInterface' => $vendorDir . '/psr/container/src/NotFoundExceptionInterface.php',
@@ -2121,9 +2112,6 @@
21212112
'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
21222113
'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
21232114
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
2124-
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
2125-
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
2126-
'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
21272115
'Punic\\Calendar' => $vendorDir . '/punic/punic/code/Calendar.php',
21282116
'Punic\\Comparer' => $vendorDir . '/punic/punic/code/Comparer.php',
21292117
'Punic\\Currency' => $vendorDir . '/punic/punic/code/Currency.php',
@@ -3027,9 +3015,7 @@
30273015
'Symfony\\Contracts\\Service\\ServiceProviderInterface' => $vendorDir . '/symfony/service-contracts/ServiceProviderInterface.php',
30283016
'Symfony\\Contracts\\Service\\ServiceSubscriberInterface' => $vendorDir . '/symfony/service-contracts/ServiceSubscriberInterface.php',
30293017
'Symfony\\Contracts\\Service\\ServiceSubscriberTrait' => $vendorDir . '/symfony/service-contracts/ServiceSubscriberTrait.php',
3030-
'Symfony\\Contracts\\Service\\Test\\ServiceLocatorTest' => $vendorDir . '/symfony/service-contracts/Test/ServiceLocatorTest.php',
30313018
'Symfony\\Contracts\\Translation\\LocaleAwareInterface' => $vendorDir . '/symfony/translation-contracts/LocaleAwareInterface.php',
3032-
'Symfony\\Contracts\\Translation\\Test\\TranslatorTest' => $vendorDir . '/symfony/translation-contracts/Test/TranslatorTest.php',
30333019
'Symfony\\Contracts\\Translation\\TranslatableInterface' => $vendorDir . '/symfony/translation-contracts/TranslatableInterface.php',
30343020
'Symfony\\Contracts\\Translation\\TranslatorInterface' => $vendorDir . '/symfony/translation-contracts/TranslatorInterface.php',
30353021
'Symfony\\Contracts\\Translation\\TranslatorTrait' => $vendorDir . '/symfony/translation-contracts/TranslatorTrait.php',
@@ -3139,6 +3125,9 @@
31393125
'ZipStreamer\\Lib\\Count64_64' => $vendorDir . '/deepdiver/zipstreamer/src/Lib/Count64_64.php',
31403126
'ZipStreamer\\ZipStreamer' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
31413127
'bantu\\IniGetWrapper\\IniGetWrapper' => $vendorDir . '/bantu/ini-get-wrapper/src/IniGetWrapper.php',
3128+
'cweagans\\Composer\\PatchEvent' => $vendorDir . '/cweagans/composer-patches/src/PatchEvent.php',
3129+
'cweagans\\Composer\\PatchEvents' => $vendorDir . '/cweagans/composer-patches/src/PatchEvents.php',
3130+
'cweagans\\Composer\\Patches' => $vendorDir . '/cweagans/composer-patches/src/Patches.php',
31423131
'libphonenumber\\AlternateFormatsCountryCodeSet' => $vendorDir . '/giggsey/libphonenumber-for-php/src/AlternateFormatsCountryCodeSet.php',
31433132
'libphonenumber\\AsYouTypeFormatter' => $vendorDir . '/giggsey/libphonenumber-for-php/src/AsYouTypeFormatter.php',
31443133
'libphonenumber\\CountryCodeSource' => $vendorDir . '/giggsey/libphonenumber-for-php/src/CountryCodeSource.php',

‎composer/autoload_psr4.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
1010
'ownCloud\\TarStreamer\\' => array($vendorDir . '/deepdiver1975/tarstreamer/src'),
1111
'libphonenumber\\' => array($vendorDir . '/giggsey/libphonenumber-for-php/src'),
12+
'cweagans\\Composer\\' => array($vendorDir . '/cweagans/composer-patches/src'),
1213
'bantu\\IniGetWrapper\\' => array($vendorDir . '/bantu/ini-get-wrapper/src'),
1314
'ZipStreamer\\' => array($vendorDir . '/deepdiver/zipstreamer/src'),
1415
'Webauthn\\MetadataService\\' => array($vendorDir . '/web-auth/metadata-service/src'),

‎composer/autoload_static.php‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
138138
array (
139139
'libphonenumber\\' => 15,
140140
),
141+
'c' =>
142+
array (
143+
'cweagans\\Composer\\' => 18,
144+
),
141145
'b' =>
142146
array (
143147
'bantu\\IniGetWrapper\\' => 20,
@@ -288,6 +292,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
288292
array (
289293
0 => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src',
290294
),
295+
'cweagans\\Composer\\' =>
296+
array (
297+
0 => __DIR__ . '/..' . '/cweagans/composer-patches/src',
298+
),
291299
'bantu\\IniGetWrapper\\' =>
292300
array (
293301
0 => __DIR__ . '/..' . '/bantu/ini-get-wrapper/src',
@@ -2698,15 +2706,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
26982706
'Pimple\\Psr11\\ServiceLocator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php',
26992707
'Pimple\\ServiceIterator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceIterator.php',
27002708
'Pimple\\ServiceProviderInterface' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php',
2701-
'Pimple\\Tests\\Fixtures\\Invokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php',
2702-
'Pimple\\Tests\\Fixtures\\NonInvokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php',
2703-
'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php',
2704-
'Pimple\\Tests\\Fixtures\\Service' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php',
2705-
'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php',
2706-
'Pimple\\Tests\\PimpleTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php',
2707-
'Pimple\\Tests\\Psr11\\ContainerTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php',
2708-
'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php',
2709-
'Pimple\\Tests\\ServiceIteratorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php',
27102709
'Psr\\Container\\ContainerExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerExceptionInterface.php',
27112710
'Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',
27122711
'Psr\\Container\\NotFoundExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/NotFoundExceptionInterface.php',
@@ -2738,9 +2737,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
27382737
'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
27392738
'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
27402739
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
2741-
'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
2742-
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
2743-
'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
27442740
'Punic\\Calendar' => __DIR__ . '/..' . '/punic/punic/code/Calendar.php',
27452741
'Punic\\Comparer' => __DIR__ . '/..' . '/punic/punic/code/Comparer.php',
27462742
'Punic\\Currency' => __DIR__ . '/..' . '/punic/punic/code/Currency.php',
@@ -3644,9 +3640,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
36443640
'Symfony\\Contracts\\Service\\ServiceProviderInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceProviderInterface.php',
36453641
'Symfony\\Contracts\\Service\\ServiceSubscriberInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceSubscriberInterface.php',
36463642
'Symfony\\Contracts\\Service\\ServiceSubscriberTrait' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceSubscriberTrait.php',
3647-
'Symfony\\Contracts\\Service\\Test\\ServiceLocatorTest' => __DIR__ . '/..' . '/symfony/service-contracts/Test/ServiceLocatorTest.php',
36483643
'Symfony\\Contracts\\Translation\\LocaleAwareInterface' => __DIR__ . '/..' . '/symfony/translation-contracts/LocaleAwareInterface.php',
3649-
'Symfony\\Contracts\\Translation\\Test\\TranslatorTest' => __DIR__ . '/..' . '/symfony/translation-contracts/Test/TranslatorTest.php',
36503644
'Symfony\\Contracts\\Translation\\TranslatableInterface' => __DIR__ . '/..' . '/symfony/translation-contracts/TranslatableInterface.php',
36513645
'Symfony\\Contracts\\Translation\\TranslatorInterface' => __DIR__ . '/..' . '/symfony/translation-contracts/TranslatorInterface.php',
36523646
'Symfony\\Contracts\\Translation\\TranslatorTrait' => __DIR__ . '/..' . '/symfony/translation-contracts/TranslatorTrait.php',
@@ -3756,6 +3750,9 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
37563750
'ZipStreamer\\Lib\\Count64_64' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/Lib/Count64_64.php',
37573751
'ZipStreamer\\ZipStreamer' => __DIR__ . '/..' . '/deepdiver/zipstreamer/src/ZipStreamer.php',
37583752
'bantu\\IniGetWrapper\\IniGetWrapper' => __DIR__ . '/..' . '/bantu/ini-get-wrapper/src/IniGetWrapper.php',
3753+
'cweagans\\Composer\\PatchEvent' => __DIR__ . '/..' . '/cweagans/composer-patches/src/PatchEvent.php',
3754+
'cweagans\\Composer\\PatchEvents' => __DIR__ . '/..' . '/cweagans/composer-patches/src/PatchEvents.php',
3755+
'cweagans\\Composer\\Patches' => __DIR__ . '/..' . '/cweagans/composer-patches/src/Patches.php',
37593756
'libphonenumber\\AlternateFormatsCountryCodeSet' => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src/AlternateFormatsCountryCodeSet.php',
37603757
'libphonenumber\\AsYouTypeFormatter' => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src/AsYouTypeFormatter.php',
37613758
'libphonenumber\\CountryCodeSource' => __DIR__ . '/..' . '/giggsey/libphonenumber-for-php/src/CountryCodeSource.php',

‎composer/installed.json‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,57 @@
374374
],
375375
"install-path": "./package-versions-deprecated"
376376
},
377+
{
378+
"name": "cweagans/composer-patches",
379+
"version": "1.7.1",
380+
"version_normalized": "1.7.1.0",
381+
"source": {
382+
"type": "git",
383+
"url": "https://github.com/cweagans/composer-patches.git",
384+
"reference": "9888dcc74993c030b75f3dd548bb5e20cdbd740c"
385+
},
386+
"dist": {
387+
"type": "zip",
388+
"url": "https://api.github.com/repos/cweagans/composer-patches/zipball/9888dcc74993c030b75f3dd548bb5e20cdbd740c",
389+
"reference": "9888dcc74993c030b75f3dd548bb5e20cdbd740c",
390+
"shasum": ""
391+
},
392+
"require": {
393+
"composer-plugin-api": "^1.0 || ^2.0",
394+
"php": ">=5.3.0"
395+
},
396+
"require-dev": {
397+
"composer/composer": "~1.0 || ~2.0",
398+
"phpunit/phpunit": "~4.6"
399+
},
400+
"time": "2021-06-08T15:12:46+00:00",
401+
"type": "composer-plugin",
402+
"extra": {
403+
"class": "cweagans\\Composer\\Patches"
404+
},
405+
"installation-source": "dist",
406+
"autoload": {
407+
"psr-4": {
408+
"cweagans\\Composer\\": "src"
409+
}
410+
},
411+
"notification-url": "https://packagist.org/downloads/",
412+
"license": [
413+
"BSD-3-Clause"
414+
],
415+
"authors": [
416+
{
417+
"name": "Cameron Eagans",
418+
"email": "me@cweagans.net"
419+
}
420+
],
421+
"description": "Provides a way to patch Composer packages.",
422+
"support": {
423+
"issues": "https://github.com/cweagans/composer-patches/issues",
424+
"source": "https://github.com/cweagans/composer-patches/tree/1.7.1"
425+
},
426+
"install-path": "../cweagans/composer-patches"
427+
},
377428
{
378429
"name": "deepdiver/zipstreamer",
379430
"version": "2.0.0",
@@ -3935,6 +3986,11 @@
39353986
},
39363987
"time": "2020-10-03T10:08:14+00:00",
39373988
"type": "library",
3989+
"extra": {
3990+
"patches_applied": {
3991+
"Correct version check": "patches/sabre-xml/correct-version-check.patch"
3992+
}
3993+
},
39383994
"installation-source": "dist",
39393995
"autoload": {
39403996
"psr-4": {
@@ -6102,6 +6158,8 @@
61026158
"install-path": "../web-auth/webauthn-lib"
61036159
}
61046160
],
6105-
"dev": false,
6106-
"dev-package-names": []
6161+
"dev": true,
6162+
"dev-package-names": [
6163+
"cweagans/composer-patches"
6164+
]
61076165
}

‎composer/installed.php‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
'type' => 'library',
66
'install_path' => __DIR__ . '/../',
77
'aliases' => array(),
8-
'reference' => '6d1cad56adb576b120b26329303e06166024cd20',
8+
'reference' => '13140c55512ea4bface2de2b1022e90af862440d',
99
'name' => 'nextcloud/3rdparty',
10-
'dev' => false,
10+
'dev' => true,
1111
),
1212
'versions' => array(
1313
'aws/aws-sdk-php' => array(
@@ -64,6 +64,15 @@
6464
'reference' => '7413f0b55a051e89485c5cb9f765fe24bb02a7b6',
6565
'dev_requirement' => false,
6666
),
67+
'cweagans/composer-patches' => array(
68+
'pretty_version' => '1.7.1',
69+
'version' => '1.7.1.0',
70+
'type' => 'composer-plugin',
71+
'install_path' => __DIR__ . '/../cweagans/composer-patches',
72+
'aliases' => array(),
73+
'reference' => '9888dcc74993c030b75f3dd548bb5e20cdbd740c',
74+
'dev_requirement' => true,
75+
),
6776
'deepdiver/zipstreamer' => array(
6877
'pretty_version' => '2.0.0',
6978
'version' => '2.0.0.0',
@@ -268,7 +277,7 @@
268277
'type' => 'library',
269278
'install_path' => __DIR__ . '/../',
270279
'aliases' => array(),
271-
'reference' => '6d1cad56adb576b120b26329303e06166024cd20',
280+
'reference' => '13140c55512ea4bface2de2b1022e90af862440d',
272281
'dev_requirement' => false,
273282
),
274283
'nextcloud/lognormalizer' => array(

‎composer/package-versions-deprecated/src/PackageVersions/Versions.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ final class Versions
117117
'web-auth/cose-lib' => 'v3.3.9@ed172d2dc1a6b87b5c644c07c118cd30c1b3819b',
118118
'web-auth/metadata-service' => 'v3.3.9@8488d3a832a38cc81c670fce05de1e515c6e64b1',
119119
'web-auth/webauthn-lib' => 'v3.3.9@04b98ee3d39cb79dad68a7c15c297c085bf66bfe',
120-
'nextcloud/3rdparty' => 'dev-master@6d1cad56adb576b120b26329303e06166024cd20',
120+
'cweagans/composer-patches' => '1.7.1@9888dcc74993c030b75f3dd548bb5e20cdbd740c',
121+
'nextcloud/3rdparty' => 'dev-master@13140c55512ea4bface2de2b1022e90af862440d',
121122
);
122123

123124
private function __construct()

‎patches.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ Patches:
88
- SabreVObject: Broker: add timezone to CANCEL messages https://github.com/sabre-io/vobject/pull/412
99
- SabreXML: Fix invalid PHP docs https://github.com/fruux/sabre-xml/pull/128
1010
- SabreXML: Prevent infinite loops for empty props element https://github.com/fruux/sabre-xml/pull/132
11+
- SabreXML: Use libxml version instead of PHP version before calling libxml_disable_entity_loader https://github.com/sabre-io/xml/pull/204
1112
- ZipStreamer: Fix zip generation for 7zip https://github.com/McNetic/PHPZipStreamer/pull/39
1213
- scssphp: Fix Trying to access array offset on value of type null https://github.com/scssphp/scssphp/commit/05a5d11ea7f68c52fdb6a5ca35cf46613b608445

0 commit comments

Comments
 (0)