diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-05-13 21:42:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 21:42:29 +0200 |
| commit | eec982e34b6e1c559f54e63b8c0debabeb6e087f (patch) | |
| tree | 6600ae248357d1c9742c6904641cc680c0128107 | |
| parent | 7e369ea0555b596d6a54e9617db14c794db50d3a (diff) | |
| parent | e0d2cd40e7d60ca6779fd2e1fe5a90610fe1ea4b (diff) | |
| download | nextcloud-server-eec982e34b6e1c559f54e63b8c0debabeb6e087f.tar.gz nextcloud-server-eec982e34b6e1c559f54e63b8c0debabeb6e087f.zip | |
Merge pull request #20952 from nextcloud/test/noid/fix-lint-exit-code
Respect exit code of lint run - changed from -exec to xargs as this exits properly
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | lib/private/AppFramework/Services/AppConfig.php | 2 |
2 files changed, 2 insertions, 2 deletions
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" } } 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); } } |