Przeglądaj źródła

Fix an issue with the search backend update

And update autoloader

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Carl Schwan 2 lat temu
rodzic
commit
1c7ecfc544
58 zmienionych plików z 184 dodań i 63 usunięć
  1. 5 0
      apps/accessibility/composer/autoload.php
  2. 1 1
      apps/accessibility/composer/composer/autoload_real.php
  3. 5 0
      apps/admin_audit/composer/autoload.php
  4. 1 1
      apps/admin_audit/composer/composer/autoload_real.php
  5. 5 0
      apps/cloud_federation_api/composer/autoload.php
  6. 1 1
      apps/cloud_federation_api/composer/composer/autoload_real.php
  7. 5 0
      apps/comments/composer/autoload.php
  8. 1 1
      apps/comments/composer/composer/autoload_real.php
  9. 5 0
      apps/contactsinteraction/composer/autoload.php
  10. 1 1
      apps/contactsinteraction/composer/composer/autoload_real.php
  11. 3 3
      apps/dav/lib/Connector/Sabre/FilesPlugin.php
  12. 10 10
      apps/dav/lib/Files/FileSearchBackend.php
  13. 5 0
      apps/encryption/composer/autoload.php
  14. 1 1
      apps/encryption/composer/composer/autoload_real.php
  15. 5 0
      apps/federatedfilesharing/composer/autoload.php
  16. 1 1
      apps/federatedfilesharing/composer/composer/autoload_real.php
  17. 5 0
      apps/federation/composer/autoload.php
  18. 1 1
      apps/federation/composer/composer/autoload_real.php
  19. 5 0
      apps/files/composer/autoload.php
  20. 1 1
      apps/files/composer/composer/autoload_real.php
  21. 5 0
      apps/files_sharing/composer/autoload.php
  22. 1 1
      apps/files_sharing/composer/composer/autoload_real.php
  23. 5 0
      apps/files_trashbin/composer/autoload.php
  24. 1 1
      apps/files_trashbin/composer/composer/autoload_real.php
  25. 5 0
      apps/files_versions/composer/autoload.php
  26. 1 1
      apps/files_versions/composer/composer/autoload_real.php
  27. 5 0
      apps/lookup_server_connector/composer/autoload.php
  28. 1 1
      apps/lookup_server_connector/composer/composer/autoload_real.php
  29. 5 0
      apps/oauth2/composer/autoload.php
  30. 1 1
      apps/oauth2/composer/composer/autoload_real.php
  31. 5 0
      apps/provisioning_api/composer/autoload.php
  32. 1 1
      apps/provisioning_api/composer/composer/autoload_real.php
  33. 5 0
      apps/settings/composer/autoload.php
  34. 1 1
      apps/settings/composer/composer/autoload_real.php
  35. 5 0
      apps/sharebymail/composer/autoload.php
  36. 1 1
      apps/sharebymail/composer/composer/autoload_real.php
  37. 5 0
      apps/systemtags/composer/autoload.php
  38. 1 1
      apps/systemtags/composer/composer/autoload_real.php
  39. 5 0
      apps/testing/composer/autoload.php
  40. 1 1
      apps/testing/composer/composer/autoload_real.php
  41. 5 0
      apps/twofactor_backupcodes/composer/autoload.php
  42. 1 1
      apps/twofactor_backupcodes/composer/composer/autoload_real.php
  43. 5 0
      apps/updatenotification/composer/autoload.php
  44. 1 1
      apps/updatenotification/composer/composer/autoload_real.php
  45. 5 0
      apps/user_ldap/composer/autoload.php
  46. 1 1
      apps/user_ldap/composer/composer/autoload_real.php
  47. 5 0
      apps/user_status/composer/autoload.php
  48. 1 1
      apps/user_status/composer/composer/autoload_real.php
  49. 5 0
      apps/workflowengine/composer/autoload.php
  50. 1 1
      apps/workflowengine/composer/composer/autoload_real.php
  51. 5 0
      lib/composer/autoload.php
  52. 2 0
      lib/composer/composer/LICENSE
  53. 1 1
      lib/composer/composer/autoload_classmap.php
  54. 1 1
      lib/composer/composer/autoload_namespaces.php
  55. 1 1
      lib/composer/composer/autoload_psr4.php
  56. 3 22
      lib/composer/composer/autoload_real.php
  57. 6 1
      lib/private/Metadata/MetadataManager.php
  58. 8 0
      lib/private/Metadata/Provider/ExifProvider.php

+ 5 - 0
apps/accessibility/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitAccessibility::getLoader();

+ 1 - 1
apps/accessibility/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitAccessibility
         spl_autoload_unregister(array('ComposerAutoloaderInitAccessibility', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/admin_audit/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitAdminAudit::getLoader();

+ 1 - 1
apps/admin_audit/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitAdminAudit
         spl_autoload_unregister(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/cloud_federation_api/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitCloudFederationAPI::getLoader();

+ 1 - 1
apps/cloud_federation_api/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitCloudFederationAPI
         spl_autoload_unregister(array('ComposerAutoloaderInitCloudFederationAPI', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitCloudFederationAPI::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitCloudFederationAPI::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/comments/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitComments::getLoader();

+ 1 - 1
apps/comments/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitComments
         spl_autoload_unregister(array('ComposerAutoloaderInitComments', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitComments::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitComments::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/contactsinteraction/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitContactsInteraction::getLoader();

+ 1 - 1
apps/contactsinteraction/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitContactsInteraction
         spl_autoload_unregister(array('ComposerAutoloaderInitContactsInteraction', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitContactsInteraction::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitContactsInteraction::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 3 - 3
apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -444,7 +444,7 @@ class FilesPlugin extends ServerPlugin {
 			if ($this->config->getSystemValueBool('enable_file_metadata', true)) {
 				$propFind->handle(self::FILE_METADATA_SIZE, function () use ($node) {
 					if (!str_starts_with($node->getFileInfo()->getMimetype(), 'image')) {
-						return json_encode([]);
+						return json_encode((object)[]);
 					}
 
 					if ($node->hasMetadata('size')) {
@@ -457,10 +457,10 @@ class FilesPlugin extends ServerPlugin {
 						$sizeMetadata = $metadataManager->fetchMetadataFor('size', [$node->getId()])[$node->getId()];
 
 						// TODO would be nice to display this in the profiler...
-						\OC::$server->get(LoggerInterface::class)->warning('Inefficient fetching of metadata');
+						\OC::$server->get(LoggerInterface::class)->debug('Inefficient fetching of metadata');
 					}
 
-					return json_encode($sizeMetadata->getMetadata());
+					return json_encode((object)$sizeMetadata->getMetadata());
 				});
 			}
 		}

+ 10 - 10
apps/dav/lib/Files/FileSearchBackend.php

@@ -124,16 +124,16 @@ class FileSearchBackend implements ISearchBackend {
 			new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, false),
 
 			// select only properties
-			new SearchPropertyDefinition('{DAV:}resourcetype', false, true, false),
-			new SearchPropertyDefinition('{DAV:}getcontentlength', false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_BOOLEAN),
-			new SearchPropertyDefinition(FilesPlugin::FILE_METADATA_SIZE, false, true, false, SearchPropertyDefinition::DATATYPE_STRING),
-			new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+			new SearchPropertyDefinition('{DAV:}resourcetype', true, false, false),
+			new SearchPropertyDefinition('{DAV:}getcontentlength', true, false, false),
+			new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, true, false, false),
+			new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, true, false, false),
+			new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, true, false, false),
+			new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, true, false, false),
+			new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, true, false, false),
+			new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, true, false, false, SearchPropertyDefinition::DATATYPE_BOOLEAN),
+			new SearchPropertyDefinition(FilesPlugin::FILE_METADATA_SIZE, true, false, false, SearchPropertyDefinition::DATATYPE_STRING),
+			new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, true, false, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
 		];
 	}
 

+ 5 - 0
apps/encryption/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitEncryption::getLoader();

+ 1 - 1
apps/encryption/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitEncryption
         spl_autoload_unregister(array('ComposerAutoloaderInitEncryption', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitEncryption::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitEncryption::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/federatedfilesharing/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFederatedFileSharing::getLoader();

+ 1 - 1
apps/federatedfilesharing/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitFederatedFileSharing
         spl_autoload_unregister(array('ComposerAutoloaderInitFederatedFileSharing', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFederatedFileSharing::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFederatedFileSharing::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/federation/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFederation::getLoader();

+ 1 - 1
apps/federation/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitFederation
         spl_autoload_unregister(array('ComposerAutoloaderInitFederation', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFederation::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFederation::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/files/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFiles::getLoader();

+ 1 - 1
apps/files/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitFiles
         spl_autoload_unregister(array('ComposerAutoloaderInitFiles', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFiles::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFiles::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/files_sharing/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFiles_Sharing::getLoader();

+ 1 - 1
apps/files_sharing/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitFiles_Sharing
         spl_autoload_unregister(array('ComposerAutoloaderInitFiles_Sharing', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFiles_Sharing::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Sharing::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/files_trashbin/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFiles_Trashbin::getLoader();

+ 1 - 1
apps/files_trashbin/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitFiles_Trashbin
         spl_autoload_unregister(array('ComposerAutoloaderInitFiles_Trashbin', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFiles_Trashbin::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Trashbin::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/files_versions/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFiles_Versions::getLoader();

+ 1 - 1
apps/files_versions/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitFiles_Versions
         spl_autoload_unregister(array('ComposerAutoloaderInitFiles_Versions', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFiles_Versions::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Versions::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/lookup_server_connector/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitLookupServerConnector::getLoader();

+ 1 - 1
apps/lookup_server_connector/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitLookupServerConnector
         spl_autoload_unregister(array('ComposerAutoloaderInitLookupServerConnector', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitLookupServerConnector::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitLookupServerConnector::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/oauth2/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitOAuth2::getLoader();

+ 1 - 1
apps/oauth2/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitOAuth2
         spl_autoload_unregister(array('ComposerAutoloaderInitOAuth2', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitOAuth2::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitOAuth2::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/provisioning_api/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitProvisioning_API::getLoader();

+ 1 - 1
apps/provisioning_api/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitProvisioning_API
         spl_autoload_unregister(array('ComposerAutoloaderInitProvisioning_API', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitProvisioning_API::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitProvisioning_API::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/settings/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitSettings::getLoader();

+ 1 - 1
apps/settings/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitSettings
         spl_autoload_unregister(array('ComposerAutoloaderInitSettings', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitSettings::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitSettings::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/sharebymail/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitShareByMail::getLoader();

+ 1 - 1
apps/sharebymail/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitShareByMail
         spl_autoload_unregister(array('ComposerAutoloaderInitShareByMail', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitShareByMail::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitShareByMail::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/systemtags/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitSystemTags::getLoader();

+ 1 - 1
apps/systemtags/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitSystemTags
         spl_autoload_unregister(array('ComposerAutoloaderInitSystemTags', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitSystemTags::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitSystemTags::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/testing/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitTesting::getLoader();

+ 1 - 1
apps/testing/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitTesting
         spl_autoload_unregister(array('ComposerAutoloaderInitTesting', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitTesting::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitTesting::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/twofactor_backupcodes/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitTwoFactorBackupCodes::getLoader();

+ 1 - 1
apps/twofactor_backupcodes/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitTwoFactorBackupCodes
         spl_autoload_unregister(array('ComposerAutoloaderInitTwoFactorBackupCodes', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitTwoFactorBackupCodes::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitTwoFactorBackupCodes::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/updatenotification/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitUpdateNotification::getLoader();

+ 1 - 1
apps/updatenotification/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitUpdateNotification
         spl_autoload_unregister(array('ComposerAutoloaderInitUpdateNotification', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitUpdateNotification::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitUpdateNotification::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/user_ldap/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitUser_LDAP::getLoader();

+ 1 - 1
apps/user_ldap/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitUser_LDAP
         spl_autoload_unregister(array('ComposerAutoloaderInitUser_LDAP', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitUser_LDAP::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitUser_LDAP::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/user_status/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitUserStatus::getLoader();

+ 1 - 1
apps/user_status/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitUserStatus
         spl_autoload_unregister(array('ComposerAutoloaderInitUserStatus', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitUserStatus::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitUserStatus::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
apps/workflowengine/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitWorkflowEngine::getLoader();

+ 1 - 1
apps/workflowengine/composer/composer/autoload_real.php

@@ -27,7 +27,7 @@ class ComposerAutoloaderInitWorkflowEngine
         spl_autoload_unregister(array('ComposerAutoloaderInitWorkflowEngine', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitWorkflowEngine::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitWorkflowEngine::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);

+ 5 - 0
lib/composer/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c::getLoader();

+ 2 - 0
lib/composer/composer/LICENSE

@@ -1,3 +1,4 @@
+
 Copyright (c) Nils Adermann, Jordi Boggiano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -17,3 +18,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+

+ 1 - 1
lib/composer/composer/autoload_classmap.php

@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname(dirname($vendorDir));
 
 return array(

+ 1 - 1
lib/composer/composer/autoload_namespaces.php

@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname(dirname($vendorDir));
 
 return array(

+ 1 - 1
lib/composer/composer/autoload_psr4.php

@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname(dirname($vendorDir));
 
 return array(

+ 3 - 22
lib/composer/composer/autoload_real.php

@@ -23,30 +23,11 @@ class ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c
         }
 
         spl_autoload_register(array('ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c', 'loadClassLoader'));
 
-        $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';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::getInitializer($loader));
 
         $loader->register(true);
 

+ 6 - 1
lib/private/Metadata/MetadataManager.php

@@ -93,7 +93,12 @@ class MetadataManager implements IMetadataManager {
 	public function getCapabilities(): array {
 		$capabilities = [];
 		foreach ($this->providers as $supportedMimetype => $provider) {
-			$capabilities[$supportedMimetype] = $provider::groupsProvided();
+			foreach ($provider::groupsProvided() as $group) {
+				if (isset($capabilities[$group])) {
+					$capabilities[$group][] = $supportedMimetype;
+				}
+				$capabilities[$group] = [$supportedMimetype];
+			}
 		}
 		return $capabilities;
 	}

+ 8 - 0
lib/private/Metadata/Provider/ExifProvider.php

@@ -25,6 +25,14 @@ class ExifProvider implements IMetadataProvider {
 		$size->setMetadata([]);
 
 		if (!$data) {
+			$sizeResult = getimagesizefromstring($file->getContent());
+			if ($sizeResult !== false) {
+				$size->setMetadata([
+					'width' => $sizeResult[0],
+					'height' => $sizeResult[1],
+				]);
+			}
+
 			return [
 				'size' => $size,
 			];