Skip to content

Commit da95aff

Browse files
authored
Merge pull request #1910 from nextcloud/backport/1781/stable32
[stable32] refactor: Switch to composer-bin
2 parents d423828 + 021b9e5 commit da95aff

File tree

14 files changed

+4702
-2220
lines changed

14 files changed

+4702
-2220
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# 3rdparty
99
node_modules/
10-
/vendor
10+
vendor/
1111

1212
# cache
1313
/.php-cs-fixer.cache

.php-cs-fixer.dist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* SPDX-License-Identifier: CC0-1.0
77
*/
88

9-
require_once './vendor/autoload.php';
9+
require_once './vendor-bin/cs-fixer/vendor/autoload.php';
1010

1111
use Nextcloud\CodingStandard\Config;
1212

LICENSES/BSD-3-Clause.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

LICENSES/MIT.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,17 @@ MIT License
22

33
Copyright (c) <year> <copyright holders>
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
6+
associated documentation files (the "Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
9+
following conditions:
610

7-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
11+
The above copyright notice and this permission notice shall be included in all copies or substantial
12+
portions of the Software.
813

9-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
15+
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
16+
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
17+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
18+
USE OR OTHER DEALINGS IN THE SOFTWARE.

composer.json

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,32 @@
33
"description": "The Nextcloud firstrunwizard",
44
"license": "AGPL",
55
"config": {
6+
"allow-plugins": {
7+
"bamarni/composer-bin-plugin": true
8+
},
69
"optimize-autoloader": true,
710
"classmap-authoritative": true,
811
"platform": {
912
"php": "8.1"
1013
}
1114
},
1215
"require-dev": {
13-
"phpunit/phpunit": "^9.5",
14-
"nextcloud/coding-standard": "^1.3.0",
15-
"psalm/phar": "~6.4.0",
16-
"nextcloud/ocp": "dev-stable32"
16+
"bamarni/composer-bin-plugin": "^1.8"
1717
},
1818
"scripts": {
1919
"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
2020
"cs:check": "php-cs-fixer fix --dry-run --diff",
2121
"cs:fix": "php-cs-fixer fix",
22-
"psalm": "psalm.phar --threads=1",
23-
"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
24-
"test:unit": "vendor/bin/phpunit --color --fail-on-warning -c tests/phpunit.xml"
22+
"psalm": "psalm --no-cache --threads=$(nproc)",
23+
"test:unit": "vendor/bin/phpunit --color --fail-on-warning -c tests/phpunit.xml",
24+
"post-install-cmd": [
25+
"@composer bin all install --ansi",
26+
"composer dump-autoload"
27+
],
28+
"post-update-cmd": [
29+
"@composer bin all update --ansi",
30+
"composer dump-autoload"
31+
]
2532
},
2633
"autoload-dev": {
2734
"psr-4": {

0 commit comments

Comments
 (0)