Merge pull request #542 from nextcloud/fixup-composer

Fixup composer
nextcloud · Dec 3, 2020 · e287243 · e287243
2 parents 03ec941 + 5a63aa1
commit e287243
Show file tree

Hide file tree

Showing 8 changed files with 5,841 additions and 6,441 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
@@ -37,8 +37,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {

diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
@@ -709,7 +709,6 @@
     'CBOR\\TextStringObject' => $vendorDir . '/spomky-labs/cbor-php/src/TextStringObject.php',
     'CBOR\\TextStringWithChunkObject' => $vendorDir . '/spomky-labs/cbor-php/src/TextStringWithChunkObject.php',
     'CBOR\\UnsignedIntegerObject' => $vendorDir . '/spomky-labs/cbor-php/src/UnsignedIntegerObject.php',
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'Console_Getopt' => $vendorDir . '/pear/console_getopt/Console/Getopt.php',
     'Cose\\Algorithm\\Algorithm' => $vendorDir . '/web-auth/cose-lib/src/Algorithm/Algorithm.php',
     'Cose\\Algorithm\\Mac\\HS256' => $vendorDir . '/web-auth/cose-lib/src/Algorithm/Mac/HS256.php',
@@ -1182,6 +1181,7 @@
     'Ds\\Hashable' => $vendorDir . '/php-ds/php-ds/src/Hashable.php',
     'Ds\\Map' => $vendorDir . '/php-ds/php-ds/src/Map.php',
     'Ds\\Pair' => $vendorDir . '/php-ds/php-ds/src/Pair.php',
+    'Ds\\PriorityNode' => $vendorDir . '/php-ds/php-ds/src/PriorityQueue.php',
     'Ds\\PriorityQueue' => $vendorDir . '/php-ds/php-ds/src/PriorityQueue.php',
     'Ds\\Queue' => $vendorDir . '/php-ds/php-ds/src/Queue.php',
     'Ds\\Sequence' => $vendorDir . '/php-ds/php-ds/src/Sequence.php',
@@ -1455,6 +1455,7 @@
     'Icewind\\Streams\\RetryWrapper' => $vendorDir . '/icewind/streams/src/RetryWrapper.php',
     'Icewind\\Streams\\SeekableWrapper' => $vendorDir . '/icewind/streams/src/SeekableWrapper.php',
     'Icewind\\Streams\\Url' => $vendorDir . '/icewind/streams/src/Url.php',
+    'Icewind\\Streams\\UrlCallback' => $vendorDir . '/icewind/streams/src/UrlCallBack.php',
     'Icewind\\Streams\\Wrapper' => $vendorDir . '/icewind/streams/src/Wrapper.php',
     'JmesPath\\AstRuntime' => $vendorDir . '/mtdowling/jmespath.php/src/AstRuntime.php',
     'JmesPath\\CompilerRuntime' => $vendorDir . '/mtdowling/jmespath.php/src/CompilerRuntime.php',
@@ -1716,6 +1717,7 @@
     'MicrosoftAzure\\Storage\\Common\\Models\\SignedIdentifier' => $vendorDir . '/microsoft/azure-storage-common/src/Common/Models/SignedIdentifier.php',
     'MicrosoftAzure\\Storage\\Common\\Models\\TransactionalMD5Trait' => $vendorDir . '/microsoft/azure-storage-common/src/Common/Models/TransactionalMD5Trait.php',
     'MicrosoftAzure\\Storage\\Common\\SharedAccessSignatureHelper' => $vendorDir . '/microsoft/azure-storage-common/src/Common/SharedAccessSignatureHelper.php',
+    'Nextcloud\\LogNormalizer\\Normalizer' => $vendorDir . '/nextcloud/lognormalizer/src/Normalizer.php',
     'Normalizer' => $vendorDir . '/patchwork/utf8/src/Normalizer.php',
     'OS_Guess' => $vendorDir . '/pear/pear-core-minimal/src/OS/Guess.php',
     'OpenStack\\BlockStorage\\v2\\Api' => $vendorDir . '/php-opencloud/openstack/src/BlockStorage/v2/Api.php',
@@ -1854,7 +1856,18 @@
     'OpenStack\\ObjectStore\\v1\\Params' => $vendorDir . '/php-opencloud/openstack/src/ObjectStore/v1/Params.php',
     'OpenStack\\ObjectStore\\v1\\Service' => $vendorDir . '/php-opencloud/openstack/src/ObjectStore/v1/Service.php',
     'OpenStack\\OpenStack' => $vendorDir . '/php-opencloud/openstack/src/OpenStack.php',
+    'Opis\\Closure\\Analyzer' => $vendorDir . '/opis/closure/src/Analyzer.php',
+    'Opis\\Closure\\ClosureContext' => $vendorDir . '/opis/closure/src/ClosureContext.php',
+    'Opis\\Closure\\ClosureScope' => $vendorDir . '/opis/closure/src/ClosureScope.php',
+    'Opis\\Closure\\ClosureStream' => $vendorDir . '/opis/closure/src/ClosureStream.php',
+    'Opis\\Closure\\ISecurityProvider' => $vendorDir . '/opis/closure/src/ISecurityProvider.php',
+    'Opis\\Closure\\ReflectionClosure' => $vendorDir . '/opis/closure/src/ReflectionClosure.php',
+    'Opis\\Closure\\SecurityException' => $vendorDir . '/opis/closure/src/SecurityException.php',
+    'Opis\\Closure\\SecurityProvider' => $vendorDir . '/opis/closure/src/SecurityProvider.php',
+    'Opis\\Closure\\SelfReference' => $vendorDir . '/opis/closure/src/SelfReference.php',
+    'Opis\\Closure\\SerializableClosure' => $vendorDir . '/opis/closure/src/SerializableClosure.php',
     'PEAR' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
+    'PEAR_Error' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
     'PEAR_ErrorStack' => $vendorDir . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
     'PEAR_Exception' => $vendorDir . '/pear/pear_exception/PEAR/Exception.php',
     'Patchwork\\JSqueeze' => $vendorDir . '/patchwork/jsqueeze/src/JSqueeze.php',
@@ -2127,6 +2140,7 @@
     'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
     'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
     'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
+    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
     'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
     'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
     'Punic\\Calendar' => $vendorDir . '/punic/punic/code/Calendar.php',
@@ -2698,6 +2712,7 @@
     'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface' => $vendorDir . '/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php',
     'Symfony\\Component\\EventDispatcher\\Debug\\WrappedListener' => $vendorDir . '/symfony/event-dispatcher/Debug/WrappedListener.php',
     'Symfony\\Component\\EventDispatcher\\DependencyInjection\\AddEventAliasesPass' => $vendorDir . '/symfony/event-dispatcher/DependencyInjection/AddEventAliasesPass.php',
+    'Symfony\\Component\\EventDispatcher\\DependencyInjection\\ExtractingEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php',
     'Symfony\\Component\\EventDispatcher\\DependencyInjection\\RegisterListenersPass' => $vendorDir . '/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php',
     'Symfony\\Component\\EventDispatcher\\Event' => $vendorDir . '/symfony/event-dispatcher/Event.php',
     'Symfony\\Component\\EventDispatcher\\EventDispatcher' => $vendorDir . '/symfony/event-dispatcher/EventDispatcher.php',
@@ -2759,6 +2774,7 @@
     'Symfony\\Component\\Routing\\Loader\\ObjectLoader' => $vendorDir . '/symfony/routing/Loader/ObjectLoader.php',
     'Symfony\\Component\\Routing\\Loader\\ObjectRouteLoader' => $vendorDir . '/symfony/routing/Loader/ObjectRouteLoader.php',
     'Symfony\\Component\\Routing\\Loader\\PhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php',
+    'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => $vendorDir . '/symfony/routing/Loader/XmlFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/routing/Loader/YamlFileLoader.php',
     'Symfony\\Component\\Routing\\Matcher\\CompiledUrlMatcher' => $vendorDir . '/symfony/routing/Matcher/CompiledUrlMatcher.php',
@@ -2953,6 +2969,18 @@
     'Webauthn\\TrustPath\\TrustPath' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/TrustPath.php',
     'Webauthn\\TrustPath\\TrustPathLoader' => $vendorDir . '/web-auth/webauthn-lib/src/TrustPath/TrustPathLoader.php',
     'Webauthn\\Util\\CoseSignatureFixer' => $vendorDir . '/web-auth/webauthn-lib/src/Util/CoseSignatureFixer.php',
+    'ZipStreamer\\COMPR' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
+    'ZipStreamer\\Count64' => $vendorDir . '/deepdiver/zipstreamer/src/lib/Count64.php',
+    'ZipStreamer\\Count64Base' => $vendorDir . '/deepdiver/zipstreamer/src/lib/Count64.php',
+    'ZipStreamer\\Count64_32' => $vendorDir . '/deepdiver/zipstreamer/src/lib/Count64.php',
+    'ZipStreamer\\Count64_64' => $vendorDir . '/deepdiver/zipstreamer/src/lib/Count64.php',
+    'ZipStreamer\\DOS' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
+    'ZipStreamer\\DeflatePeclStream' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
+    'ZipStreamer\\DeflateStoreStream' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
+    'ZipStreamer\\DeflateStream' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
+    'ZipStreamer\\ExtFileAttr' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
+    'ZipStreamer\\GPFLAGS' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
+    'ZipStreamer\\UNIX' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
     'ZipStreamer\\ZipStreamer' => $vendorDir . '/deepdiver/zipstreamer/src/ZipStreamer.php',
     'bantu\\IniGetWrapper\\IniGetWrapper' => $vendorDir . '/bantu/ini-get-wrapper/src/IniGetWrapper.php',
     'ownCloud\\TarStreamer\\TarHeader' => $vendorDir . '/deepdiver1975/tarstreamer/src/TarHeader.php',

diff --git a/composer/autoload_files.php b/composer/autoload_files.php
@@ -29,6 +29,7 @@
     'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
     'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
     '8a9dc1de0ca7e01f3e08231539562f61' => $vendorDir . '/aws/aws-sdk-php/src/functions.php',
+    '538ca81a9a966a6716601ecf48f4eaef' => $vendorDir . '/opis/closure/functions.php',
     'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
     '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
 );
diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php
@@ -48,7 +48,9 @@
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
     'Patchwork\\' => array($vendorDir . '/patchwork/jsqueeze/src', $vendorDir . '/patchwork/utf8/src/Patchwork'),
+    'Opis\\Closure\\' => array($vendorDir . '/opis/closure/src'),
     'OpenStack\\' => array($vendorDir . '/php-opencloud/openstack/src'),
+    '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-components/src', $vendorDir . '/league/uri-interfaces/src'),

diff --git a/composer/autoload_real.php b/composer/autoload_real.php
@@ -22,8 +22,6 @@ public static function getLoader()
             return self::$loader;
         }
 
-        require __DIR__ . '/platform_check.php';
-
         spl_autoload_register(array('ComposerAutoloaderInit2f23f73bc0cc116b4b1eee1521aa8652', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit2f23f73bc0cc116b4b1eee1521aa8652', 'loadClassLoader'));
@@ -34,7 +32,7 @@ public static function getLoader()
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652::getInitializer($loader));
         } else {