From 8614abaa5bce495b47ecf1ff0216d62c136401e1 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 13 May 2020 11:43:11 +0200 Subject: Respect exit code of lint run - changed from -exec to xargs as this exits properly Signed-off-by: Morris Jobke --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 937df706202..fb6cd010889 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,6 @@ "scripts": { "cs:fix": "php-cs-fixer fix", "cs:check": "php-cs-fixer fix --dry-run --diff", - "lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/.phan/*' -exec php -l \"{}\" \\;" + "lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/.phan/*' -print0 | xargs -0 -n1 php -l" } } -- cgit v1.2.3 From e0d2cd40e7d60ca6779fd2e1fe5a90610fe1ea4b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 13 May 2020 14:55:00 +0200 Subject: Fix return code of AppConfig::deleteUserValue Signed-off-by: Morris Jobke --- lib/private/AppFramework/Services/AppConfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/AppFramework/Services/AppConfig.php b/lib/private/AppFramework/Services/AppConfig.php index 4716313b342..eaca647f438 100644 --- a/lib/private/AppFramework/Services/AppConfig.php +++ b/lib/private/AppFramework/Services/AppConfig.php @@ -70,6 +70,6 @@ class AppConfig implements IAppConfig { } public function deleteUserValue(string $userId, string $key): void { - return $this->config->deleteUserValue($userId, $this->appName, $key); + $this->config->deleteUserValue($userId, $this->appName, $key); } } -- cgit v1.2.3