Skip to content

Commit eec982e

Browse files
authored
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
2 parents 7e369ea + e0d2cd4 commit eec982e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"scripts": {
2323
"cs:fix": "php-cs-fixer fix",
2424
"cs:check": "php-cs-fixer fix --dry-run --diff",
25-
"lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/.phan/*' -exec php -l \"{}\" \\;"
25+
"lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/.phan/*' -print0 | xargs -0 -n1 php -l"
2626
}
2727
}

lib/private/AppFramework/Services/AppConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ public function getUserValue(string $userId, string $key, string $default = ''):
7070
}
7171

7272
public function deleteUserValue(string $userId, string $key): void {
73-
return $this->config->deleteUserValue($userId, $this->appName, $key);
73+
$this->config->deleteUserValue($userId, $this->appName, $key);
7474
}
7575
}

0 commit comments

Comments
 (0)