Merge branch 'master' into feat/oauth2/userinfo

apps/files/src/components/NavigationQuota.vue

@@ -88,8 +88,17 @@ export default {
 	},
 
 	mounted() {
-		// Warn the user if the available storage is 0 on page load
-		if (this.storageStats?.free <= 0) {
+		// If the user has a quota set, warn if the available account storage is <=0
+		//
+		// NOTE: This doesn't catch situations where actual *server* 
+		// disk (non-quota) space is low, but those should probably
+		// be handled differently anyway since a regular user can't
+		// can't do much about them (If we did want to indicate server disk 
+		// space matters to users, we'd probably want to use a warning
+		// specific to that situation anyhow. So this covers warning covers 
+		// our primary day-to-day concern (individual account quota usage).
+		//
+		if (this.storageStats?.quota > 0 && this.storageStats?.free <= 0) {
 			this.showStorageFullWarning()
 		}
 	},
@@ -122,8 +131,9 @@ export default {
 					throw new Error('Invalid storage stats')
 				}
 
-				// Warn the user if the available storage changed from > 0 to 0
-				if (this.storageStats?.free > 0 && response.data.data?.free <= 0) {
+				// Warn the user if the available account storage changed from > 0 to 0 
+				// (unless only because quota was intentionally set to 0 by admin in the interim)
+				if (this.storageStats?.free > 0 && response.data.data?.free <= 0 && response.data.data?.quota > 0) {
 					this.showStorageFullWarning()
 				}
 

apps/files_trashbin/lib/AppInfo/Application.php

@@ -38,8 +38,8 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\ILogger;
-use OCP\IServerContainer;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'files_trashbin';
@@ -77,7 +77,7 @@ public function boot(IBootContext $context): void {
 		\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Trashbin\Trashbin', 'ensureFileScannedHook');
 	}
 
-	public function registerTrashBackends(IServerContainer $serverContainer, ILogger $logger, IAppManager $appManager, ITrashManager $trashManager) {
+	public function registerTrashBackends(ContainerInterface $serverContainer, LoggerInterface $logger, IAppManager $appManager, ITrashManager $trashManager): void {
 		foreach ($appManager->getInstalledApps() as $app) {
 			$appInfo = $appManager->getAppInfo($app);
 			if (isset($appInfo['trash'])) {
@@ -87,10 +87,10 @@ public function registerTrashBackends(IServerContainer $serverContainer, ILogger
 					$for = $backend['@attributes']['for'];
 
 					try {
-						$backendObject = $serverContainer->query($class);
+						$backendObject = $serverContainer->get($class);
 						$trashManager->registerBackend($for, $backendObject);
 					} catch (\Exception $e) {
-						$logger->logException($e);
+						$logger->error($e->getMessage(), ['exception' => $e]);
 					}
 				}
 			}