Skip to content

Commit c7aaf88

Browse files
Merge pull request #315 from nextcloud/chore/move-tools-to-vendor-bin
chore: Move dev tools to vendor-bin directory
2 parents 88f6549 + 1477433 commit c7aaf88

18 files changed

Lines changed: 4207 additions & 3694 deletions

File tree

.php-cs-fixer.dist.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?php
22

33
declare(strict_types=1);
4+
45
/**
56
* SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
67
* SPDX-License-Identifier: AGPL-3.0-or-later
78
*/
8-
require_once './vendor/autoload.php';
9+
10+
require_once './vendor-bin/cs-fixer/vendor/autoload.php';
911

1012
use Nextcloud\CodingStandard\Config;
1113

REUSE.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-FileCopyrightText = "2018 Nextcloud GmbH and Nextcloud contributors"
1212
SPDX-License-Identifier = "AGPL-3.0-or-later"
1313

1414
[[annotations]]
15-
path = ["composer.json", "composer.lock"]
15+
path = ["composer.json", "composer.lock", "**/composer.json", "**/composer.lock"]
1616
precedence = "aggregate"
1717
SPDX-FileCopyrightText = "2021 Nextcloud GmbH and Nextcloud contributors"
1818
SPDX-License-Identifier = "AGPL-3.0-or-later"

appinfo/routes.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
45
* SPDX-License-Identifier: AGPL-3.0-or-later

composer.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,18 @@
66
"classmap-authoritative": true,
77
"platform": {
88
"php": "8.0.2"
9+
},
10+
"allow-plugins": {
11+
"bamarni/composer-bin-plugin": true
912
}
1013
},
1114
"scripts": {
15+
"post-install-cmd": [
16+
"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all install --ansi"
17+
],
18+
"post-update-cmd": [
19+
"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all update --ansi"
20+
],
1221
"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
1322
"cs:check": "php-cs-fixer fix --dry-run --diff",
1423
"cs:fix": "php-cs-fixer fix",
@@ -19,10 +28,8 @@
1928
"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml"
2029
},
2130
"require-dev": {
22-
"phpunit/phpunit": "^9.5",
23-
"nextcloud/coding-standard": "^1.1.1",
24-
"vimeo/psalm": "^5.16.0",
25-
"nextcloud/ocp": "dev-master"
31+
"nextcloud/ocp": "dev-master",
32+
"bamarni/composer-bin-plugin": "^1.8"
2633
},
2734
"autoload-dev": {
2835
"psr-4": {

0 commit comments

Comments
 (0)